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

Fixed elapsed_time

This commit is contained in:
iory 2020-04-18 15:19:38 +09:00 committed by Ram Rachum
parent 828ffb1d3c
commit 0c018d868e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pysnooper/tracer.py
View File

@ -217,7 +217,7 @@ class Tracer:
for v in utils.ensure_tuple(watch_explode) for v in utils.ensure_tuple(watch_explode)
] ]
self.frame_to_local_reprs = {} self.frame_to_local_reprs = {}
self.start_times = {} self.start_times = []
self.depth = depth self.depth = depth
self.prefix = prefix self.prefix = prefix
self.thread_info = thread_info self.thread_info = thread_info
@ -303,7 +303,7 @@ class Tracer:
'original_trace_functions', [] 'original_trace_functions', []
) )
stack.append(sys.gettrace()) stack.append(sys.gettrace())
self.start_times[id(calling_frame)] = datetime_module.datetime.now() self.start_times.append(datetime_module.datetime.now())
sys.settrace(self.trace) sys.settrace(self.trace)
def __exit__(self, exc_type, exc_value, exc_traceback): def __exit__(self, exc_type, exc_value, exc_traceback):
@ -315,7 +315,7 @@ class Tracer:
self.target_frames.discard(calling_frame) self.target_frames.discard(calling_frame)
self.frame_to_local_reprs.pop(calling_frame, None) self.frame_to_local_reprs.pop(calling_frame, None)
start_time = self.start_times.pop(id(calling_frame)) start_time = self.start_times.pop(-1)
duration = datetime_module.datetime.now() - start_time duration = datetime_module.datetime.now() - start_time
now_string = pycompat.timedelta_isoformat(duration, timespec='microseconds') now_string = pycompat.timedelta_isoformat(duration, timespec='microseconds')
indent = ' ' * 4 * (thread_global.depth + 1) indent = ' ' * 4 * (thread_global.depth + 1)
@ -332,7 +332,6 @@ class Tracer:
return thread_info.ljust(self.thread_info_padding) return thread_info.ljust(self.thread_info_padding)
def trace(self, frame, event, arg): def trace(self, frame, event, arg):
### Checking whether we should trace this line: ####################### ### Checking whether we should trace this line: #######################
# # # #
# We should trace this line either if it's in the decorated function, # We should trace this line either if it's in the decorated function,
@ -367,9 +366,7 @@ class Tracer:
### Finished checking whether we should trace this line. ############## ### Finished checking whether we should trace this line. ##############
if self.elapsed_time: if self.elapsed_time:
calling_frame = frame.f_back duration = datetime_module.datetime.now() - self.start_times[-1]
duration = datetime_module.datetime.now() - self.start_times[
id(calling_frame)]
now_string = pycompat.timedelta_isoformat( now_string = pycompat.timedelta_isoformat(
duration, timespec='microseconds') if not self.normalize else ' ' * 15 duration, timespec='microseconds') if not self.normalize else ' ' * 15
else: else: