From 53beae8ee67ff4f74010e4107fef43ea7ece09af Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 16 Nov 2017 09:26:23 -0500
Subject: [PATCH] Python 2.5 "with"; Isolate 2.5-2.6 grammar better

---
 test/bytecode_2.6/05_with.pyc       | Bin 276 -> 333 bytes
 test/simple_source/stmts/05_with.py |   4 +++-
 uncompyle6/parsers/parse25.py       |  13 +++++++++++++
 uncompyle6/parsers/parse26.py       |   5 +++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/test/bytecode_2.6/05_with.pyc b/test/bytecode_2.6/05_with.pyc
index 7f3c025fbba20d6afb26a7b5b28fac468b1f9a37..3fd9ff606527d20ceae99dbadd1932f395ccac6c 100644
GIT binary patch
delta 186
zcmbQjbe5_9;wN6NTl09Mk{O_Y3rIUOFfbIy0vRbl#K@4%z>vep5XH#An99VE%FK|$
z#L&#dz>>+rz?8|#(9FOP#l}#j#gNLz5Y5IA#m<n*&fx9=B#=}vR<SUIr!X@FMnFg)
zGgyO#fnj2t9A^n5(550k4UUQR5~4schWvumyb=x|BR)PYGbc4Ze&W159uQxEQH_z6
HQHT)$BAp=Z

delta 147
zcmX@hG=(YV;wN6N?d}cX$qZ1y2BaMt7#NCefQ%F%Vr0l>V8~%)h+<@5Ol4wV$z*0=
z%4A_^W?+b7WvCKjNM&V+W@U(CV@PFVaQ6sLVPXi30209(%oA%Bl>9W<f##HO0g3qd
iw9=B&qSW~KARv#Sgc(Q_R~ApaoX5ceWC}3KG6DeB%^Lpz

diff --git a/test/simple_source/stmts/05_with.py b/test/simple_source/stmts/05_with.py
index 74706b8f..6f52fbdb 100644
--- a/test/simple_source/stmts/05_with.py
+++ b/test/simple_source/stmts/05_with.py
@@ -1,3 +1,5 @@
 from __future__ import with_statement
-with (sys) as f:
+with open(__file__, 'r') as f:
     print(f)
+    with f:
+        pass
diff --git a/uncompyle6/parsers/parse25.py b/uncompyle6/parsers/parse25.py
index 93dd342b..ef3343db 100644
--- a/uncompyle6/parsers/parse25.py
+++ b/uncompyle6/parsers/parse25.py
@@ -21,8 +21,13 @@ class Python25Parser(Python26Parser):
 
         # Python 2.6 uses ROT_TWO instead of the STORE_xxx
         # withas is allowed as a "from future" in 2.5
+        # 2.6 and 2.7 do something slightly different
         setupwithas ::= DUP_TOP LOAD_ATTR store LOAD_ATTR CALL_FUNCTION_0
                         setup_finally
+        # opcode SETUP_WITH
+        setupwith ::= DUP_TOP LOAD_ATTR STORE_NAME LOAD_ATTR CALL_FUNCTION_0 POP_TOP
+        withstmt ::= expr setupwith SETUP_FINALLY suite_stmts_opt
+                     POP_BLOCK LOAD_CONST COME_FROM with_cleanup
 
         store ::= STORE_FAST
         store ::= STORE_NAME
@@ -41,6 +46,14 @@ class Python25Parser(Python26Parser):
         """
 
     def add_custom_rules(self, tokens, customize):
+        # grammar rules inherited from Python 2.6
+        self.remove_rules("""
+        setupwith ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 POP_TOP
+        withstmt ::= expr setupwith SETUP_FINALLY suite_stmts_opt
+                     POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY
+        withasstmt ::= expr setupwithas designator suite_stmts_opt
+                       POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY
+        """)
         super(Python25Parser, self).add_custom_rules(tokens, customize)
         if self.version == 2.5:
             self.check_reduce['tryelsestmt'] = 'tokens'
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
index d071c5af..0283a6a8 100644
--- a/uncompyle6/parsers/parse26.py
+++ b/uncompyle6/parsers/parse26.py
@@ -251,6 +251,11 @@ class Python26Parser(Python2Parser):
         """
 
     def add_custom_rules(self, tokens, customize):
+        self.remove_rules("""
+        withasstmt ::= expr SETUP_WITH designator suite_stmts_opt
+                POP_BLOCK LOAD_CONST COME_FROM_WITH
+                WITH_CLEANUP END_FINALLY
+        """)
         super(Python26Parser, self).add_custom_rules(tokens, customize)
         self.check_reduce['and'] = 'AST'