Move stuff to common module

Author: pablogsal

Lib/profiling/sampling/__init__.py

@@ -4,8 +4,8 @@
 call stack rather than tracing every function call.
 """
 
-from profiling.collector import Collector
-from profiling.pstats_collector import PstatsCollector
-from profiling.stack_collector import CollapsedStackCollector
+from profiling.sampling.collector import Collector
+from profiling.sampling.pstats_collector import PstatsCollector
+from profiling.sampling.stack_collector import CollapsedStackCollector
 
 __all__ = ("Collector", "PstatsCollector", "CollapsedStackCollector")

Lib/profiling/tracing/__init__.py

@@ -10,20 +10,32 @@
 import importlib.machinery
 import importlib.util
 import io
-import profile as _pyprofile
+from profiling.tracing._utils import _Utils
 
 # ____________________________________________________________
 # Simple interface
 
 def run(statement, filename=None, sort=-1):
-    return _pyprofile._Utils(Profile).run(statement, filename, sort)
+    """Run statement under profiler optionally saving results in filename
+
+    This function takes a single argument that can be passed to the
+    "exec" statement, and an optional file name.  In all cases this
+    routine attempts to "exec" its first argument and gather profiling
+    statistics from the execution. If no file name is present, then this
+    function automatically prints a simple profiling report, sorted by the
+    standard name string (file/line/function-name) that is presented in
+    each line.
+    """
+    return _Utils(Profile).run(statement, filename, sort)
 
 def runctx(statement, globals, locals, filename=None, sort=-1):
-    return _pyprofile._Utils(Profile).runctx(statement, globals, locals,
-                                             filename, sort)
+    """Run statement under profiler, supplying your own globals and locals,
+    optionally saving results in filename.
 
-run.__doc__ = _pyprofile.run.__doc__
-runctx.__doc__ = _pyprofile.runctx.__doc__
+    statement and filename have the same semantics as profile.run
+    """
+    return _Utils(Profile).runctx(statement, globals, locals,
+                                             filename, sort)
 
 # ____________________________________________________________
 

Lib/profiling/tracing/_utils.py

@@ -0,0 +1,32 @@
+class _Utils:
+    """Support class for utility functions which are shared by
+    profile.py and cProfile.py modules.
+    Not supposed to be used directly.
+    """
+
+    def __init__(self, profiler):
+        self.profiler = profiler
+
+    def run(self, statement, filename, sort):
+        prof = self.profiler()
+        try:
+            prof.run(statement)
+        except SystemExit:
+            pass
+        finally:
+            self._show(prof, filename, sort)
+
+    def runctx(self, statement, globals, locals, filename, sort):
+        prof = self.profiler()
+        try:
+            prof.runctx(statement, globals, locals)
+        except SystemExit:
+            pass
+        finally:
+            self._show(prof, filename, sort)
+
+    def _show(self, prof, filename, sort):
+        if filename is not None:
+            prof.dump_stats(filename)
+        else:
+            prof.print_stats(sort)