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

Fix bug in 3x list comprehensions with ifnot

Browse Source
This commit is contained in:
rocky
2016-05-28 12:12:38 -04:00
parent eebe8249a8
commit a984ae4f6a
4 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.5/10-list-ifnot.pyc
View File

Binary file not shown.

5
test/simple_source/comprehension/06_list_ifnot.py Normal file
View File

@@ -0,0 +1,5 @@
# Test semantic handling of
# [x for x in names2 if not y]
# Bug seen in Python 3
names2 = []
names = [x for x in names2 if not len(x)]

17
test/simple_source/comprehension/10-list-ifnot.py
View File

@@ -1,17 +0,0 @@
# Test semantic handling of
# [x for x in names if not y]
import os
def bug(dirname, pattern):
if not dirname:
if isinstance(pattern, bytes):
dirname = bytes(os.curdir, 'ASCII')
else:
dirname = os.curdir
try:
names = os.listdir(dirname)
except os.error:
return []
if not _ishidden(pattern):
names = [x for x in names if not _ishidden(x)]
return fnmatch.filter(names, pattern)

23
uncompyle6/semantics/pysource.py
View File

@@ -975,7 +975,7 @@ class SourceWalker(GenericASTTraversal, object):
self.prec = 27 self.prec = 27
n = node[-1] n = node[-1]
assert n == 'list_iter' assert n == 'list_iter'
# find innerst node # find innermost node
while n == 'list_iter': while n == 'list_iter':
n = n[0] # recurse one step n = n[0] # recurse one step
if n == 'list_for': n = n[3] if n == 'list_for': n = n[3]
@@ -1059,31 +1059,38 @@ class SourceWalker(GenericASTTraversal, object):
self.customize(code._customize) self.customize(code._customize)
ast = ast[0][0][0][0][0] ast = ast[0][0][0][0][0]
try: n = ast[iter_index]
n = ast[iter_index]
except:
from trepan.api import debug; debug()
assert n == 'list_iter' assert n == 'list_iter'
## FIXME: I'm not totally sure this is right.
# find innermost node # find innermost node
designator = None
list_if_node = None
while n == 'list_iter': while n == 'list_iter':
n = n[0] # recurse one step n = n[0] # recurse one step
if n == 'list_for': if n == 'list_for':
designator = n[2] if n[2] == 'designator':
designator = n[2]
n = n[3] n = n[3]
elif n in ['list_if', 'list_if_not']: elif n in ['list_if', 'list_if_not']:
# FIXME: just a guess list_if_node = n[0]
designator = n[1] if n[1] == 'designator':
designator = n[1]
n = n[2] n = n[2]
pass pass
pass pass
assert n == 'lc_body', ast assert n == 'lc_body', ast
assert designator, "Couldn't find designator in list comprehension"
self.preorder(n[0]) self.preorder(n[0])
self.write(' for ') self.write(' for ')
self.preorder(designator) self.preorder(designator)
self.write(' in ') self.write(' in ')
self.preorder(node[-3]) self.preorder(node[-3])
if list_if_node:
self.write(' if ')
self.preorder(list_if_node)
self.prec = p self.prec = p
def listcomprehension_walk2(self, node): def listcomprehension_walk2(self, node):