From b640d42113877554fe93dbb73d18448274480c6d Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 8 Jul 2016 10:38:56 -0400 Subject: [PATCH] 2.5/2.6 fn name clash fixes list conprehension problem --- test/bytecode_2.5/05_list_comprehension.pyc | Bin 0 -> 283 bytes uncompyle6/parsers/parse25.py | 2 +- uncompyle6/parsers/parse26.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 test/bytecode_2.5/05_list_comprehension.pyc diff --git a/test/bytecode_2.5/05_list_comprehension.pyc b/test/bytecode_2.5/05_list_comprehension.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c1c8c39c7c4bf6334c1572ac5b7268ee5eb98990 GIT binary patch literal 283 zcmZ9GziI+O5XQef&p!x)q_VcU$}^zY1WA!PjYU9_LGK3LaJzeP?~1%sn!HG!B~OqU z5P~jzzn$5c{bs&@N5h}5_N~D6bme{)#g%}85_nG#rZ6WU-5QjAyzEEVCSU_j@bEFg z&cLTIWmnY0CL74#MnU8b))QHYVT~eDbQC)3HA^)V-Ip`%xtjQcW1>b|Y4^Bq)aaNA z@Q=8VG+I|zOfj^Vg7YG{`od@S(FUK-msHu<(9P?t{*1cllM7{A@p`N#x?*nr04PE= AE&u=k literal 0 HcmV?d00001 diff --git a/uncompyle6/parsers/parse25.py b/uncompyle6/parsers/parse25.py index 863f6805..67e16bc9 100644 --- a/uncompyle6/parsers/parse25.py +++ b/uncompyle6/parsers/parse25.py @@ -12,7 +12,7 @@ class Python25Parser(Python26Parser): super(Python25Parser, self).__init__(debug_parser) self.customized = {} - def p_misc(self, args): + def p_misc25(self, args): ''' # If "return_if_stmt" is in a loop, a JUMP_BACK can be emitted. In 2.6 the diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py index 2488d8d6..651f5872 100644 --- a/uncompyle6/parsers/parse26.py +++ b/uncompyle6/parsers/parse26.py @@ -208,7 +208,7 @@ class Python26Parser(Python2Parser): except_suite ::= c_stmts_opt jmp_abs come_from_pop ''' - def p_misc(self, args): + def p_misc26(self, args): ''' conditional ::= expr jmp_false expr jf_cf_pop expr come_from_opt and ::= expr JUMP_IF_FALSE POP_TOP expr JUMP_IF_FALSE POP_TOP