Mirrors/PySnooper
1
0
Fork 0
mirror of https://github.com/cool-RR/PySnooper.git synced 2026-01-23 02:14:04 +00:00
Code Issues Projects Releases Wiki Activity

Only add parentheses to exploded expressions if needed

Browse source
This commit is contained in:
Alex Hall 2019-05-03 21:32:21 +02:00 • committed by Ram Rachum
parent 53b3ea13b8
commit 7a1b457013
2 changed files with 48 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pysnooper/variables.py
View file

@ -7,11 +7,22 @@ from . import utils
from . import pycompat
def needs_parens(source):
def code(s):
return compile(s, '<variable>', 'eval').co_code
return code('{}.x'.format(source)) != code('({}).x'.format(source))
class BaseVariable(pycompat.ABC):
def __init__(self, source, exclude=()):
self.source = source
self.exclude = utils.ensure_tuple(exclude)
self.code = compile(source, '<variable>', 'eval')
if needs_parens(source):
self.unambiguous_source = '({})'.format(source)
else:
self.unambiguous_source = source
def items(self, frame):
try:
@ -36,7 +47,7 @@ class CommonVariable(BaseVariable):
except Exception:
continue
result.append((
'({}){}'.format(self.source, self._format_key(key)),
'{}{}'.format(self.unambiguous_source, self._format_key(key)),
utils.get_shortish_repr(value)
))
return result

53
tests/test_pysnooper.py
View file

@ -9,6 +9,7 @@ from python_toolbox import sys_tools, temp_file_tools
import pytest
import pysnooper
from pysnooper.variables import needs_parens
from .utils import (assert_output, VariableEntry, CallEntry, LineEntry,
ReturnEntry, OpcodeEntry, ReturnValueEntry, ExceptionEntry)
@ -132,7 +133,7 @@ def test_watch_explode():
self.y = y
@pysnooper.snoop(watch_explode=('_d', '_point', 'lst'))
@pysnooper.snoop(watch_explode=('_d', '_point', 'lst + []'))
def my_function():
_d = {'a': 1, 'b': 2, 'c': 'ignore'}
_point = Foo(x=3, y=4)
@ -150,22 +151,24 @@ def test_watch_explode():
VariableEntry('Foo'),
CallEntry('def my_function():'),
LineEntry(),
VariableEntry("(_d)['a']", '1'),
VariableEntry("(_d)['b']", '2'),
VariableEntry("(_d)['c']", "'ignore'"),
VariableEntry('_d'),
VariableEntry("_d['a']", '1'),
VariableEntry("_d['b']", '2'),
VariableEntry("_d['c']", "'ignore'"),
LineEntry(),
VariableEntry('(_point).x', '3'),
VariableEntry('(_point).y', '4'),
VariableEntry('_point'),
VariableEntry('_point.x', '3'),
VariableEntry('_point.y', '4'),
LineEntry(),
VariableEntry('(lst)[0]', '7'),
VariableEntry('(lst)[1]', '8'),
VariableEntry('(lst)[2]', '9'),
VariableEntry('(lst + [])[0]', '7'),
VariableEntry('(lst + [])[1]', '8'),
VariableEntry('(lst + [])[2]', '9'),
VariableEntry('lst'),
VariableEntry('lst + []'),
LineEntry(),
VariableEntry('(lst)[3]', '10'),
VariableEntry('(lst + [])[3]', '10'),
VariableEntry('lst'),
VariableEntry('lst + []'),
ReturnEntry(),
ReturnValueEntry('None')
)
@ -202,18 +205,18 @@ def test_variables_classes():
VariableEntry('WithSlots'),
CallEntry('def my_function():'),
LineEntry(),
VariableEntry("(_d)['a']", '1'),
VariableEntry("(_d)['b']", '2'),
VariableEntry('_d'),
VariableEntry("_d['a']", '1'),
VariableEntry("_d['b']", '2'),
LineEntry(),
VariableEntry('(_s).x', '3'),
VariableEntry('(_s).y', '4'),
VariableEntry('_s'),
VariableEntry('_s.x', '3'),
VariableEntry('_s.y', '4'),
LineEntry(),
VariableEntry('(_lst)[997]', '997'),
VariableEntry('(_lst)[998]', '998'),
VariableEntry('(_lst)[999]', '999'),
VariableEntry('_lst'),
VariableEntry('_lst[997]', '997'),
VariableEntry('_lst[998]', '998'),
VariableEntry('_lst[999]', '999'),
ReturnEntry(),
ReturnValueEntry('None')
)
@ -613,3 +616,19 @@ def test_error_in_overwrite_argument():
y = 8
return y + x
def test_needs_parens():
assert not needs_parens('x')
assert not needs_parens('x.y')
assert not needs_parens('x.y.z')
assert not needs_parens('x.y.z[0]')
assert not needs_parens('x.y.z[0]()')
assert not needs_parens('x.y.z[0]()(3, 4 * 5)')
assert not needs_parens('foo(x)')
assert not needs_parens('foo(x+y)')
assert not needs_parens('(x+y)')
assert not needs_parens('[x+1 for x in ()]')
assert needs_parens('x + y')
assert needs_parens('x * y')
assert needs_parens('x and y')
assert needs_parens('x if z else y')