From e4cd9974b24c699b24ce86113f0aa9061ccb3897 Mon Sep 17 00:00:00 2001 From: Alexander Bersenev Date: Sat, 11 May 2019 12:19:36 +0500 Subject: [PATCH] Simplify the new and modified values reporting. --- pysnooper/tracer.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pysnooper/tracer.py b/pysnooper/tracer.py index 64e60aa..57c67ee 100644 --- a/pysnooper/tracer.py +++ b/pysnooper/tracer.py @@ -290,23 +290,19 @@ class Tracer: self.frame_to_local_reprs[frame] = local_reprs = \ get_local_reprs(frame, watch=self.watch) - modified_local_reprs = collections.OrderedDict() - newish_local_reprs = collections.OrderedDict() - - for key, value in local_reprs.items(): - if key not in old_local_reprs: - newish_local_reprs[key] = value - elif old_local_reprs[key] != value: - modified_local_reprs[key] = value - newish_string = ('Starting var:.. ' if event == 'call' else 'New var:....... ') - for name, value_repr in newish_local_reprs.items(): - self.write('{indent}{newish_string}{name} = {value_repr}'.format( - **locals())) - for name, value_repr in modified_local_reprs.items(): - self.write('{indent}Modified var:.. {name} = {value_repr}'.format( + + for name, value_repr in local_reprs.items(): + if name not in old_local_reprs: + self.write('{indent}{newish_string}{name} = {value_repr}'.format( + **locals())) + + for name, value_repr in local_reprs.items(): + if name in old_local_reprs and old_local_reprs[name] != value_repr: + self.write('{indent}Modified var:.. {name} = {value_repr}'.format( **locals())) + # # ### Finished newish and modified variables. ###########################