diff --git a/test/bytecode_2.6/01_triple_compare.pyc b/test/bytecode_2.6/01_triple_compare.pyc new file mode 100644 index 00000000..c88ae69e Binary files /dev/null and b/test/bytecode_2.6/01_triple_compare.pyc differ diff --git a/test/bytecode_2.7/01_triple_compare.pyc b/test/bytecode_2.7/01_triple_compare.pyc index d3bd01c3..cf61c9d9 100644 Binary files a/test/bytecode_2.7/01_triple_compare.pyc and b/test/bytecode_2.7/01_triple_compare.pyc differ diff --git a/test/stdlib/runtests.sh b/test/stdlib/runtests.sh index cb0d4687..63f3afd0 100755 --- a/test/stdlib/runtests.sh +++ b/test/stdlib/runtests.sh @@ -66,6 +66,17 @@ case $PYVERSION in [test_grp.py]=1 # Long test - might work Control flow? [test_pwd.py]=1 # Long test - might work? Control flow? [test_queue.py]=1 # Control flow? + # .pyenv/versions/2.6.9/lib/python2.6/lib2to3/refactor.pyc + # .pyenv/versions/2.6.9/lib/python2.6/mailbox.pyc + # .pyenv/versions/2.6.9/lib/python2.6/markupbase.pyc + # .pyenv/versions/2.6.9/lib/python2.6/pstats.pyc + # .pyenv/versions/2.6.9/lib/python2.6/pyclbr.pyc + # .pyenv/versions/2.6.9/lib/python2.6/quopri.pyc -- look at ishex, is short + # .pyenv/versions/2.6.9/lib/python2.6/random.pyc + # .pyenv/versions/2.6.9/lib/python2.6/smtpd.pyc + # .pyenv/versions/2.6.9/lib/python2.6/sre_parse.pyc + # .pyenv/versions/2.6.9/lib/python2.6/tabnanny.pyc + # .pyenv/versions/2.6.9/lib/python2.6/tarfile.pyc ) ;; 2.7) @@ -74,6 +85,11 @@ case $PYVERSION in [test_grammar.py]=1 # Too many stmts. Handle large stmts [test_ioctl.py]=1 # Test takes too long to run [test_itertools.py]=1 # Syntax error - look at! + # Syntax errors: + # .pyenv/versions/2.7.14/lib/python2.7/mimify.pyc + # .pyenv/versions/2.7.14/lib/python2.7/netrc.pyc + # .pyenv/versions/2.7.14/lib/python2.7/pyclbr.pyc + # .pyenv/versions/2.7.14/lib/python2.7/sre_compile.pyc ) ;; *) diff --git a/test/test_pyenvlib.py b/test/test_pyenvlib.py index 5cd45b32..26658d06 100755 --- a/test/test_pyenvlib.py +++ b/test/test_pyenvlib.py @@ -103,6 +103,9 @@ def do_tests(src_dir, patterns, target_dir, start_with=None, do_verify=False): files = [file for file in files if not 'site-packages' in file] files = [file for file in files if not 'test' in file] if len(files) > 200: + # print("Numer of files %d - truncating to last 200" % len(files)) + # files = files[-200:] + print("Numer of files %d - truncating to first 200" % len(files)) files = files[:200] print(time.ctime()) diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py index 1c8a52d7..2e8caa5a 100644 --- a/uncompyle6/parsers/parse26.py +++ b/uncompyle6/parsers/parse26.py @@ -267,8 +267,11 @@ class Python26Parser(Python2Parser): jmp_false compare_chained1 _come_froms compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP jmp_false compare_chained2 _come_froms + compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP + jmp_false_then compare_chained2 _come_froms return_lambda ::= RETURN_VALUE + return_lambda ::= RETURN_END_IF return_lambda ::= RETURN_END_IF_LAMBDA return_lambda ::= RETURN_VALUE_LAMBDA