From 0353b74a7a2e72a1a60f08bc2ce12bec8d874b89 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 9 Jun 2018 23:14:04 -0400
Subject: [PATCH] 3.0 list comprehensions

---
 test/bytecode_3.0/01_comprehension.pyc | Bin 0 -> 866 bytes
 uncompyle6/parsers/parse30.py          |   8 ++++++++
 uncompyle6/semantics/pysource.py       |   5 +++--
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 test/bytecode_3.0/01_comprehension.pyc

diff --git a/test/bytecode_3.0/01_comprehension.pyc b/test/bytecode_3.0/01_comprehension.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..93c43e169a7af0c0f63384f75a4c4e6423b42f47
GIT binary patch
literal 866
zcmbVKO;6iE5PfU&l|Ya{J+u-%^*{s?gmOV5LP$j%xp0G`m17Ty!H!eUE(j@{(%-;8
z>Hq7@`jAxOQdXYlk#|1d^XW#X{pW4xHpRk;#XlG0Zvq+c8@K_;AT#Pygo~MhJU212
z2-jUrNS6fk=sOboA;zBtnyhJz2VjPfYcfchMqQ;wP><%Vh+T{EiNHv{y&6n`yFL7j
z@G4IX2S_Q&m$I`M)jG^nf+B4FYQu;%b^Rx)U~SIHfL)!Wt|T|AGHWkGTfZvTLvo38
zwO<zhGAWq4I)m4-4tidFdwX;joN-c8h<i#3PhGh}0KY39=jEgz%ayNFIvn`naqqBq
zWYemg)HI?o=hgUN^5R<(+h=lmai*NH_UM?F=_(1Ke(tE`W{$vW!SlAk8zf8|O6g2I
zNz#vwqZC*>re|w)WmfWGR?KGfk0#1a&~jg#;aroib4^r$pvf1};XcB4kU@9K#TusG
z=T>7Lz2egcNo`ARzsR{^RVilOrh}`d<HD9f$t+KuUy}%H?{iVjhF`%Bj=$HmFvI_=
Rt2O&&mHC3s0-p-4)xVp#riTCk

literal 0
HcmV?d00001

diff --git a/uncompyle6/parsers/parse30.py b/uncompyle6/parsers/parse30.py
index de810223..4c73f616 100644
--- a/uncompyle6/parsers/parse30.py
+++ b/uncompyle6/parsers/parse30.py
@@ -43,8 +43,16 @@ class Python30Parser(Python31Parser):
         set_comp_func ::= set_comp_func_header
                           LOAD_FAST FOR_ITER store comp_iter
                           JUMP_BACK POP_TOP JUMP_BACK RETURN_VALUE RETURN_LAST
+
+        list_comp_header ::=  BUILD_LIST_0 DUP_TOP STORE_FAST
+        list_comp      ::= list_comp_header
+                           LOAD_FAST FOR_ITER store comp_iter
+                           JUMP_BACK
+
+
         comp_if       ::= expr jmp_false comp_iter
         comp_iter     ::= expr expr SET_ADD
+        comp_iter     ::= expr expr LIST_APPEND
 
         # In many ways 3.0 is like 2.6. The below rules in fact are the same or similar.
 
diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py
index 5b577a37..f0e03fbb 100644
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -1052,7 +1052,8 @@ class SourceWalker(GenericASTTraversal, object):
             ast = ast[0]
 
         store = None
-        if ast in ['set_comp_func', 'dict_comp_func', 'set_comp_func_header']:
+        if ast in ['set_comp_func', 'dict_comp_func',
+                   'list_comp', 'set_comp_func_header']:
             for k in ast:
                 if k == 'comp_iter':
                     n = k
@@ -1125,7 +1126,7 @@ class SourceWalker(GenericASTTraversal, object):
         self.write(' in ')
         self.preorder(node[-3])
 
-        if ast == 'list_comp':
+        if ast == 'list_comp' and self.version != 3.0:
             list_iter = ast[1]
             assert list_iter == 'list_iter'
             if list_iter == 'list_for':