Skip to content

Devel index expressions #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aiandit wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Devel index expressions #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
934b325
Add some tests for index expressions, maybe showing bug reharding par…
rainac Jul 13, 2023
1fa9b73
This fixes the bug regarding parentheses for a Tuple as a slice in Su…
rainac Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/astunparse/unparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ def leave(self):
"Decrease the indentation level."
self._indent -= 1

def dispatch(self, tree):
def dispatch(self, tree, **kw):
"Dispatcher function, dispatching tree type T to method _T."
if isinstance(tree, list):
for t in tree:
self.dispatch(t)
return
meth = getattr(self, "_"+tree.__class__.__name__)
meth(tree)
meth(tree, **(kw if meth.__name__ in ["_Tuple"] else {}))


############### Unparsing methods ######################
Expand Down Expand Up @@ -648,15 +648,15 @@ def write_item(item):
interleave(lambda: self.write(", "), write_item, zip(t.keys, t.values))
self.write("}")

def _Tuple(self, t):
self.write("(")
def _Tuple(self, t, noparen=False, **kw):
if not noparen: self.write("(")
if len(t.elts) == 1:
elt = t.elts[0]
self.dispatch(elt)
self.write(",")
else:
interleave(lambda: self.write(", "), self.dispatch, t.elts)
self.write(")")
if not noparen: self.write(")")

unop = {"Invert":"~", "Not": "not", "UAdd":"+", "USub":"-"}
def _UnaryOp(self, t):
Expand Down Expand Up @@ -741,7 +741,7 @@ def _Call(self, t):
def _Subscript(self, t):
self.dispatch(t.value)
self.write("[")
self.dispatch(t.slice)
self.dispatch(t.slice, noparen=True)
self.write("]")

def _Starred(self, t):
Expand Down
12 changes: 12 additions & 0 deletions tests/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,18 @@ def test_raise_from(self):
def test_bytes(self):
self.check_roundtrip("b'123'")

def test_index(self):
self.check_roundtrip("r[0]")
self.check_roundtrip("r[0:5]")
self.check_roundtrip("r[0:5:2]")
self.check_roundtrip("r[1::2]")

def test_index2(self):
self.check_roundtrip("r[0,i]")
self.check_roundtrip("r[:,0:5]")
self.check_roundtrip("r[i:1:-1, 2]")
self.check_roundtrip("r[i:1:-1, :]")

@unittest.skipIf(sys.version_info < (3, 6), "Not supported < 3.6")
def test_formatted_value(self):
self.check_roundtrip('f"{value}"')
Expand Down