diff --git a/test/bytecode_2.6/01_triple_compare.pyc b/test/bytecode_2.6/01_triple_compare.pyc deleted file mode 100644 index 788c954a..00000000 Binary files a/test/bytecode_2.6/01_triple_compare.pyc and /dev/null differ diff --git a/test/bytecode_2.6_run/01_triple_compare.pyc b/test/bytecode_2.6_run/01_triple_compare.pyc new file mode 100644 index 00000000..62768f9b Binary files /dev/null and b/test/bytecode_2.6_run/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 deleted file mode 100644 index 7bbe2d21..00000000 Binary files a/test/bytecode_2.7/01_triple_compare.pyc and /dev/null differ diff --git a/test/bytecode_2.7_run/01_triple_compare.pyc b/test/bytecode_2.7_run/01_triple_compare.pyc new file mode 100644 index 00000000..a5d61b2f Binary files /dev/null and b/test/bytecode_2.7_run/01_triple_compare.pyc differ diff --git a/test/bytecode_3.2/01_triple_compare.pyc b/test/bytecode_3.2/01_triple_compare.pyc deleted file mode 100644 index 7c7dd313..00000000 Binary files a/test/bytecode_3.2/01_triple_compare.pyc and /dev/null differ diff --git a/test/bytecode_3.2_run/01_triple_compare.pyc b/test/bytecode_3.2_run/01_triple_compare.pyc new file mode 100644 index 00000000..22372e38 Binary files /dev/null and b/test/bytecode_3.2_run/01_triple_compare.pyc differ diff --git a/test/bytecode_3.3/01_triple_compare.pyc b/test/bytecode_3.3/01_triple_compare.pyc deleted file mode 100644 index 37563b20..00000000 Binary files a/test/bytecode_3.3/01_triple_compare.pyc and /dev/null differ diff --git a/test/bytecode_3.3_run/01_triple_compare.pyc b/test/bytecode_3.3_run/01_triple_compare.pyc new file mode 100644 index 00000000..3e85ec9f Binary files /dev/null and b/test/bytecode_3.3_run/01_triple_compare.pyc differ diff --git a/test/bytecode_3.6_run/01_triple_compare.pyc b/test/bytecode_3.6_run/01_triple_compare.pyc new file mode 100644 index 00000000..45516434 Binary files /dev/null and b/test/bytecode_3.6_run/01_triple_compare.pyc differ diff --git a/test/simple_source/bug33/01_triple_compare.py b/test/simple_source/bug33/01_triple_compare.py index 3efe6bef..6878e042 100644 --- a/test/simple_source/bug33/01_triple_compare.py +++ b/test/simple_source/bug33/01_triple_compare.py @@ -1,8 +1,11 @@ # In Python 3.3+ this uses grammar rule # compare_chained2 ::= expr COMPARE_OP RETURN_VALUE +# In Python 3.6 uses this uses grammar rule +# compare_chained2 ::= expr COMPARE_OP come_froms JUMP_FORWARD # Seen in Python 3.3 ipaddress.py +# RUNNABLE! def _is_valid_netmask(netmask): return 0 <= netmask <= 10 @@ -10,4 +13,4 @@ def _is_valid_netmask(netmask): # detections # See in 2.6.9 quopri.py ishex(): -'0' <= __file__ <= '9' or 'a' <= __file__ <= 'f' or 'A' <= __file__ <= 'F' +assert not '0' <= __file__ <= '9' or 'a' <= __file__ <= 'f' or 'A' <= __file__ <= 'F' diff --git a/uncompyle6/parsers/parse36.py b/uncompyle6/parsers/parse36.py index f702f012..0117c24e 100644 --- a/uncompyle6/parsers/parse36.py +++ b/uncompyle6/parsers/parse36.py @@ -133,6 +133,8 @@ class Python36Parser(Python35Parser): stmt ::= tryfinally_return_stmt tryfinally_return_stmt ::= SETUP_FINALLY suite_stmts_opt POP_BLOCK LOAD_CONST COME_FROM_FINALLY + + compare_chained2 ::= expr COMPARE_OP come_froms JUMP_FORWARD """ def customize_grammar_rules(self, tokens, customize):