From 5b2198a4a6eae0c6e9098e2cf85d1e470dd9cd98 Mon Sep 17 00:00:00 2001
From: rocky <rocky@gnu.org>
Date: Wed, 29 Jun 2016 21:24:19 -0400
Subject: [PATCH] A 2.6 comprehension bug

---
 test/bytecode_2.6/06_setif_comprehension.pyc      | Bin 0 -> 460 bytes
 .../simple_source/bug26/06_setif_comprehension.py |   9 +++++++++
 .../06_setif_comprehension.py                     |   0
 uncompyle6/parsers/parse26.py                     |   1 +
 4 files changed, 10 insertions(+)
 create mode 100644 test/bytecode_2.6/06_setif_comprehension.pyc
 create mode 100644 test/simple_source/bug26/06_setif_comprehension.py
 rename test/simple_source/{comprehension => bug27+}/06_setif_comprehension.py (100%)

diff --git a/test/bytecode_2.6/06_setif_comprehension.pyc b/test/bytecode_2.6/06_setif_comprehension.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..11c0222e09d49541b9e1b52ecaa3e84296a9580a
GIT binary patch
literal 460
zcmbVHxlRK?41KfVS|mC?fN~p>h$2;lC=g{DBqAZuXtHaPmG)xoML|lc@Pl-G2Va1l
zaP*AE$Bg~_p5H%Djz3tYDZWon<CPkpsUsi*-ZXK@BW!@{jf39%9x{j9B+{nTsWaHV
zJ=A!lZaKgTcuepRVePPvAiyfJd7>kFsAIU5!<~CRfZ6nSpqwh+`<%m!r46Z+B#S!p
zezN70LoLrqf=DaIc@qkz#1x3>=?`U3LlqQe<(E)&lxTvj<8#e8FPnlq*Ik>^VAjnq
zMuXwVGfDpB)4FV0T2RG#UG<w+jukPUQ$@?By)<?<g4o4wl2|6jtyr-}<K-r#JMvtp
c<n8~@GW;jypL*m-X~t!pbp`F@*xIrC0=Xz-xc~qF

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug26/06_setif_comprehension.py b/test/simple_source/bug26/06_setif_comprehension.py
new file mode 100644
index 00000000..dce585ae
--- /dev/null
+++ b/test/simple_source/bug26/06_setif_comprehension.py
@@ -0,0 +1,9 @@
+# From 2.6.9 abc.py
+
+# For 2.6:
+# genexpr_func ::= setup_loop_lf FOR_ITER designator comp_iter JUMP_BACK come_from_pop JUMP_BACK POP_BLOCK COME_FROM
+
+# This has been a bug in other Pythons after 2.6 were set comprehension {} is used instead of set().
+abstracts = set(name
+             for name, value in namespace.items()
+             if getattr(value, "__isabstractmethod__", False))
diff --git a/test/simple_source/comprehension/06_setif_comprehension.py b/test/simple_source/bug27+/06_setif_comprehension.py
similarity index 100%
rename from test/simple_source/comprehension/06_setif_comprehension.py
rename to test/simple_source/bug27+/06_setif_comprehension.py
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
index 2177e931..d4bc8c62 100644
--- a/uncompyle6/parsers/parse26.py
+++ b/uncompyle6/parsers/parse26.py
@@ -130,6 +130,7 @@ class Python26Parser(Python2Parser):
         # Make sure we keep indices the same as 2.7
         setup_loop_lf ::= SETUP_LOOP LOAD_FAST
         genexpr_func ::= setup_loop_lf FOR_ITER designator comp_iter JUMP_BACK POP_BLOCK COME_FROM
+        genexpr_func ::= setup_loop_lf FOR_ITER designator comp_iter JUMP_BACK come_from_pop JUMP_BACK POP_BLOCK COME_FROM
         '''
 
     def p_ret26(self, args):