From 43076a2548df7138a57906a25aefbe350bf5f17f Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Tue, 28 Nov 2017 06:57:15 -0500
Subject: [PATCH] 3.6 genexpr has changed

Fixes Issue #139
---
 test/bytecode_3.6/02_genexpr.pyc       | Bin 0 -> 385 bytes
 test/simple_source/bug36/02_genexpr.py |   5 +++++
 uncompyle6/parsers/parse3.py           |   6 ++++++
 3 files changed, 11 insertions(+)
 create mode 100644 test/bytecode_3.6/02_genexpr.pyc
 create mode 100644 test/simple_source/bug36/02_genexpr.py

diff --git a/test/bytecode_3.6/02_genexpr.pyc b/test/bytecode_3.6/02_genexpr.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..704853964308a689052769b7b75bde92054bcf2b
GIT binary patch
literal 385
zcmYjMu}T9$5S`g1Bqye^l7NNfHJ9Ll)p1x@Un5uqWJzu}F}m^2T@O^&DgpB=Hh$2x
zet~T&XD%T)@ZQcc^WNKy`~9Qu>}>oC06&C73F@v0?wCk{!ZnORi5m!8InTKGY!g}p
zcS_{p0X|`d3YA#*JY2&HSIC+yN1Ai7hy^jh4TwD4oqV9j4Lo+O@OTRd&q4voF#Cc~
z)FK+yxCpWC6fgJMTDIDryT!6JTDqdLxgJidd3-q>UC6n9(yyhB%C~Kh>@R7D!*<Vo
zA4ut{sgzM-ihN>R8XeXsB9JmS6X&F);I`9dX8DUvW{A6<-Rkb%hNq1+pbe<cXp7HA
S@sAo&FIg6<GCFNkv;}`^xlIxP

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug36/02_genexpr.py b/test/simple_source/bug36/02_genexpr.py
new file mode 100644
index 00000000..9ea0dea8
--- /dev/null
+++ b/test/simple_source/bug36/02_genexpr.py
@@ -0,0 +1,5 @@
+# Python 3.6, uses rule:
+#  genexpr ::= load_closure load_genexpr LOAD_CONST
+#              MAKE_FUNCTION_8 expr GET_ITER CALL_FUNCTION_1
+def __sub__(self, other): # SList()-other
+    return self.__class__(i for i in self if i not in other)
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
index 7280ed3e..5c3d82c3 100644
--- a/uncompyle6/parsers/parse3.py
+++ b/uncompyle6/parsers/parse3.py
@@ -886,6 +886,12 @@ class Python3Parser(PythonParser):
                                  'LOAD_CONST ' * 2,
                                  opname))
                     self.add_unique_rule(rule, opname, token.attr, customize)
+
+                    if has_get_iter_call_function1:
+                        rule_pat = ("genexpr ::= %sload_closure load_genexpr %%s%s expr "
+                                   "GET_ITER CALL_FUNCTION_1" % ('pos_arg '* args_pos, opname))
+                        self.add_make_function_rule(rule_pat, opname, token.attr, customize)
+
                     rule_pat = ('mklambda ::= %s%sLOAD_LAMBDA %%s%s' %
                                 (('pos_arg '* args_pos),
                                  ('kwarg '* args_kw),