modernize import a tad

Author: rocky

Makefile

@@ -53,6 +53,7 @@ test-integration-short:
 
 #: Clean up temporary files
 clean:
+	find . | grep -E "\.pyc\|\.pyo" | xargs rm -rvf;
 	$(PYTHON) ./setup.py $@
 
 #: Create source (tarball) and binary (egg) distribution

trepan/lib/core.py

@@ -40,6 +40,7 @@
 
 # Our local modules
 from trepan.lib import breakpoint, default, stack as Mstack
+from trepan.lib.stack import count_frames
 from trepan.misc import option_set
 from trepan.processor import cmdproc as Mcmdproc, trace as Mtrace
 
@@ -362,7 +363,7 @@ def is_stop_here(self, frame, event):
         if self.stop_level is not None:
             if frame and frame != self.last_frame:
                 # Recompute stack_depth
-                self.last_level = Mstack.count_frames(frame)
+                self.last_level = count_frames(frame)
                 self.last_frame = frame
                 pass
             if self.last_level > self.stop_level:
@@ -397,7 +398,7 @@ def _is_step_next_stop(self, event):
     def set_next(self, frame, step_ignore=0, step_events=None):
         "Sets to stop on the next event that happens in frame 'frame'."
         self.step_events = None  # Consider all events
-        self.stop_level = Mstack.count_frames(frame)
+        self.stop_level = count_frames(frame)
         self.last_level = self.stop_level
         self.last_frame = frame
         self.stop_on_finish = False