jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 01:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct bugs in Python 3.2 source generation

Browse Source
This commit is contained in:
rocky
2016-05-16 15:50:45 -04:00
parent 73d784510a
commit 09a01dc783
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
uncompyle6/semantics/fragments.py
View File

@@ -492,11 +492,17 @@ class FragmentsWalker(pysource.SourceWalker, object):
p = self.prec p = self.prec
self.prec = 27 self.prec = 27
if hasattr(node[code_index], 'attr'): if hasattr(node[code_index], 'attr'):
# Python 2.5+ (and earlier?) does this
code = node[code_index].attr code = node[code_index].attr
elif hasattr(node[1][1], 'attr'):
code = node[1][1].attr
else: else:
assert False if len(node[1]) > 1 and hasattr(node[1][1], 'attr'):
# Python 3.3+ does this
code = node[1][1].attr
elif hasattr(node[1][0], 'attr'):
# Python 3.2 does this
code = node[1][0].attr
else:
assert False, "Can't find code for comprehension"
assert iscode(code) assert iscode(code)
code = Code(code, self.scanner, self.currentclass) code = Code(code, self.scanner, self.currentclass)
@@ -1020,6 +1026,10 @@ class FragmentsWalker(pysource.SourceWalker, object):
# Python 3.0..3.4 style key/value list in mapexpr # Python 3.0..3.4 style key/value list in mapexpr
kv_node = node[1] kv_node = node[1]
l = list(kv_node) l = list(kv_node)
if len(l) > 0 and l[0].type == 'kv3':
# Python 3.2 does this
kv_node = node[1][0]
l = list(kv_node)
i = 0 i = 0
while i < len(l): while i < len(l):
l[1].parent = kv_node l[1].parent = kv_node

27
uncompyle6/semantics/pysource.py
View File

@@ -993,11 +993,17 @@ class SourceWalker(GenericASTTraversal, object):
p = self.prec p = self.prec
self.prec = 27 self.prec = 27
if hasattr(node[code_index], 'attr'): if hasattr(node[code_index], 'attr'):
# Python 2.5+ (and earlier?) does this
code = node[code_index].attr code = node[code_index].attr
elif hasattr(node[1][1], 'attr'):
code = node[1][1].attr
else: else:
assert False if len(node[1]) > 1 and hasattr(node[1][1], 'attr'):
# Python 3.3+ does this
code = node[1][1].attr
elif hasattr(node[1][0], 'attr'):
# Python 3.2 does this
code = node[1][0].attr
else:
assert False, "Can't find code for comprehension"
assert iscode(code) assert iscode(code)
code = Code(code, self.scanner, self.currentclass) code = Code(code, self.scanner, self.currentclass)
@@ -1241,7 +1247,8 @@ class SourceWalker(GenericASTTraversal, object):
if self.version > 3.0: if self.version > 3.0:
if node[0].type.startswith('kvlist'): if node[0].type.startswith('kvlist'):
# Python 3.5+ style key/value list in mapexpr # Python 3.5+ style key/value list in mapexpr
l = list(node[0]) kv_node = node[0]
l = list(kv_node)
i = 0 i = 0
while i < len(l): while i < len(l):
name = self.traverse(l[i], indent='') name = self.traverse(l[i], indent='')
@@ -1253,10 +1260,18 @@ class SourceWalker(GenericASTTraversal, object):
pass pass
elif node[1].type.startswith('kvlist'): elif node[1].type.startswith('kvlist'):
# Python 3.0..3.4 style key/value list in mapexpr # Python 3.0..3.4 style key/value list in mapexpr
l = list(node[1]) kv_node = node[1]
l = list(kv_node)
if len(l) > 0 and l[0].type == 'kv3':
# Python 3.2 does this
kv_node = node[1][0]
l = list(kv_node)
i = 0 i = 0
while i < len(l): while i < len(l):
name = self.traverse(l[i+1], indent='') try:
name = self.traverse(l[i+1], indent='')
except:
from trepan.api import debug; debug()
value = self.traverse(l[i], indent=self.indent+(len(name)+2)*' ') value = self.traverse(l[i], indent=self.indent+(len(name)+2)*' ')
self.write(sep, name, ': ', value) self.write(sep, name, ': ', value)
sep = line_seperator sep = line_seperator