From d6330dc6a6ab5a2eacc61791818e20954fda1b9f Mon Sep 17 00:00:00 2001 From: Jonathan Reichelt Gjertsen Date: Sun, 8 Sep 2019 17:33:30 +0200 Subject: [PATCH] Update regexes in tests to work with Python 2.7 --- tests/test_pysnooper.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/test_pysnooper.py b/tests/test_pysnooper.py index 892ae0d..ade570c 100644 --- a/tests/test_pysnooper.py +++ b/tests/test_pysnooper.py @@ -1259,12 +1259,12 @@ def test_class(): output, ( SourcePathEntry(), - VariableEntry('self', value_regex="u?.+.MyClass object at"), + VariableEntry('self', value_regex="u?.+MyClass object at"), CallEntry('def __init__(self):'), LineEntry('self.x = 7'), ReturnEntry('self.x = 7'), ReturnValueEntry('None'), - VariableEntry('self', value_regex="u?.+.MyClass object at"), + VariableEntry('self', value_regex="u?.+MyClass object at"), VariableEntry('foo', value_regex="u?'baba'"), CallEntry('def my_method(self, foo):'), LineEntry('y = 8'), @@ -1302,14 +1302,14 @@ def test_class_with_decorated_method(): output, ( SourcePathEntry(), - VariableEntry('self', value_regex="u?.+.MyClass object at"), + VariableEntry('self', value_regex="u?.+MyClass object at"), CallEntry('def __init__(self):'), LineEntry('self.x = 7'), ReturnEntry('self.x = 7'), ReturnValueEntry('None'), VariableEntry('args', value_regex=r"\(<.+>, 'baba'\)"), VariableEntry('kwargs', value_regex=r"\{\}"), - VariableEntry('function', value_regex="u?.+.MyClass.my_method at"), + VariableEntry('function', value_regex="u?.+my_method at"), CallEntry('def wrapper(*args, **kwargs):'), LineEntry('result = function(*args, **kwargs)'), VariableEntry('result', '15'), @@ -1348,18 +1348,18 @@ def test_class_with_decorated_method_and_snoop_applied_to_method(): output, ( SourcePathEntry(), - VariableEntry('self', value_regex="u?.*.MyClass object at"), + VariableEntry('self', value_regex="u?.*MyClass object at"), CallEntry('def __init__(self):'), LineEntry('self.x = 7'), ReturnEntry('self.x = 7'), ReturnValueEntry('None'), VariableEntry('args', value_regex=r"u?\(<.+>, 'baba'\)"), VariableEntry('kwargs', value_regex=r"u?\{\}"), - VariableEntry('function', value_regex="u?.*.MyClass.my_method at"), + VariableEntry('function', value_regex="u?.*my_method at"), CallEntry('def wrapper(*args, **kwargs):'), LineEntry('result = function(*args, **kwargs)'), SourcePathEntry(), - VariableEntry('self', value_regex="u?.*.MyClass object at"), + VariableEntry('self', value_regex="u?.*MyClass object at"), VariableEntry('foo', value_regex="u?'baba'"), CallEntry('def my_method(self, foo):'), LineEntry('y = 8'), @@ -1420,28 +1420,28 @@ def test_class_with_property(): output, ( SourcePathEntry(), - VariableEntry('self', value_regex="u?.*.MyClass object at"), + VariableEntry('self', value_regex="u?.*MyClass object at"), CallEntry('def __init__(self):'), LineEntry('self._x = 0'), ReturnEntry('self._x = 0'), ReturnValueEntry('None'), # Called from getter - VariableEntry('self', value_regex="u?.*.MyClass object at"), + VariableEntry('self', value_regex="u?.*MyClass object at"), CallEntry('def plain_method(self):'), LineEntry('pass'), ReturnEntry('pass'), ReturnValueEntry('None'), # Called from setter - VariableEntry('self', value_regex="u?.*.MyClass object at"), + VariableEntry('self', value_regex="u?.*MyClass object at"), CallEntry('def plain_method(self):'), LineEntry('pass'), ReturnEntry('pass'), ReturnValueEntry('None'), # Called from deleter - VariableEntry('self', value_regex="u?.*.MyClass object at"), + VariableEntry('self', value_regex="u?.*MyClass object at"), CallEntry('def plain_method(self):'), LineEntry('pass'), ReturnEntry('pass'), @@ -1476,7 +1476,7 @@ def test_snooping_on_class_does_not_cause_base_class_to_be_snooped(): output, ( SourcePathEntry(), - VariableEntry('self', value_regex="u?.*.MyClass object at"), + VariableEntry('self', value_regex="u?.*MyClass object at"), CallEntry('def method_on_child_class(self):'), LineEntry('self.method_on_base_class()'), ReturnEntry('self.method_on_base_class()'),