Merge pull request #354 from TTsangSC/logging-fixes

FIX: debug-mode and logging bugs in #337

Author: Erotemic

kernprof.py

@@ -832,7 +832,7 @@ def _gather_preimport_targets(options, exclude):
                        '' if len(invalid_targets) == 1 else 's',
                        invalid_targets))
         warnings.warn(msg)
-        diagnostics.log.warn(msg)
+        diagnostics.log.warning(msg)
 
     return filtered_targets, recurse_targets
 
@@ -930,13 +930,19 @@ def _dump_filtered_stats(tmpdir, prof, filename):
 
 
 def _format_call_message(func, *args, **kwargs):
+    if isinstance(func, functools.partial):
+        return _format_call_message(
+            func.func, *func.args, *args, **{**func.keywords, **kwargs})
     if isinstance(func, MethodType):
         obj = func.__self__
         func_repr = (
             '{0.__module__}.{0.__qualname__}(...).{1.__name__}'
             .format(type(obj), func.__func__))
     else:
-        func_repr = '{0.__module__}.{0.__qualname__}'.format(func)
+        try:
+            func_repr = '{0.__module__}.{0.__qualname__}'.format(func)
+        except Exception:  # Fallback
+            func_repr = repr(func)
     args_repr = dedent(' ' + pformat(args)[len('['):-len(']')])
     lprefix = len('namespace(')
     kwargs_repr = dedent(

tests/test_kernprof.py

@@ -338,6 +338,52 @@ def test_kernprof_bad_temp_script(stdin):
     assert not os.path.exists(os.path.dirname(tmp_script))
 
 
+@pytest.mark.parametrize('debug', [True, False])
+def test_bad_prof_mod_target(debug):
+    """
+    Test the handling of bad paths in `--prof-mod` targets.
+    """
+    with contextlib.ExitStack() as stack:
+        enter = stack.enter_context
+        enter(ub.ChDir(enter(tempfile.TemporaryDirectory())))
+        proc = ub.cmd(['kernprof', '-l', '-p', './nonexistent.py',
+                       '-c', 'print("Output: foo")'],
+                      env={**os.environ, 'LINE_PROFILER_DEBUG': str(debug)})
+        print(proc.stdout)
+        print(proc.stderr, file=sys.stderr)
+        proc.check_returncode()
+        assert os.listdir()  # Profile results
+    assert 'Output: foo' in proc.stdout
+    assert re.search(r"1 .* target .*: \['\./nonexistent\.py'\]", proc.stderr)
+
+
+@pytest.mark.parametrize('builtin', [True, False])
+@pytest.mark.parametrize('module', [True, False])
+def test_call_with_diagnostics(module, builtin):
+    """
+    Test the output of call signatures in debug messages.
+    """
+    to_run = ['-m', 'calendar'] if module else ['-c', 'print("Output: foo")']
+    with contextlib.ExitStack() as stack:
+        enter = stack.enter_context
+        enter(ub.ChDir(enter(tempfile.TemporaryDirectory())))
+        cmd = ['kernprof']
+        if builtin:
+            cmd += ['-b']
+        proc = ub.cmd(cmd + to_run,
+                      env={**os.environ, 'LINE_PROFILER_DEBUG': 'true'})
+        print(proc.stdout)
+        print(proc.stderr, file=sys.stderr)
+        proc.check_returncode()
+        assert os.listdir()  # Profile results
+    has_runctx_call = re.search(
+        r'Calling: .+\.runctx\(.+\)', proc.stdout, flags=re.DOTALL)
+    has_execfile_call = re.search(
+        r'execfile\(.+\)', proc.stdout, flags=re.DOTALL)
+    assert bool(has_runctx_call) == (not builtin)
+    assert bool(has_execfile_call) == (not module)
+
+
 class TestKernprof(unittest.TestCase):
 
     def test_enable_disable(self):