Rooba
/
PySnooper
mirror of https://github.com/cool-RR/PySnooper.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Store depth globally to indent correctly in all cases

This commit is contained in:
Alex Hall 2019-05-10 21:09:16 +02:00 committed by Ram Rachum
parent 8f91784821
commit 6553cd50f0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pysnooper/tracer.py
View File

@ -121,6 +121,9 @@ def get_write_and_truncate_functions(output):
return write, truncate return write, truncate
thread_global = threading.local()
class Tracer: class Tracer:
def __init__( def __init__(
self, self,
@ -246,7 +249,6 @@ class Tracer:
# or the user asked to go a few levels deeper and we're within that # or the user asked to go a few levels deeper and we're within that
# number of levels deeper. # number of levels deeper.
depth = 0
if not (frame.f_code in self.target_codes or frame in self.target_frames): if not (frame.f_code in self.target_codes or frame in self.target_frames):
if self.depth == 1: if self.depth == 1:
# We did the most common and quickest check above, because the # We did the most common and quickest check above, because the
@ -257,7 +259,7 @@ class Tracer:
return None return None
else: else:
_frame_candidate = frame _frame_candidate = frame
for depth in range(1, self.depth): for i in range(1, self.depth):
_frame_candidate = _frame_candidate.f_back _frame_candidate = _frame_candidate.f_back
if _frame_candidate is None: if _frame_candidate is None:
return None return None
@ -266,9 +268,10 @@ class Tracer:
else: else:
return None return None
stack = self.thread_local.original_trace_functions thread_global.__dict__.setdefault('depth', -1)
depth += len(stack) - 1 if event == 'call':
indent = ' ' * 4 * depth thread_global.depth += 1
indent = ' ' * 4 * thread_global.depth
# # # #
### Finished checking whether we should trace this line. ############## ### Finished checking whether we should trace this line. ##############
@ -339,5 +342,6 @@ class Tracer:
self.write('{indent}Return value:.. {return_value_repr}'. self.write('{indent}Return value:.. {return_value_repr}'.
format(**locals())) format(**locals()))
del self.frame_to_local_reprs[frame] del self.frame_to_local_reprs[frame]
thread_global.depth -= 1
return self.trace return self.trace