From 1a2aa41f7da51fb2a81fef4828439b7000477f2a Mon Sep 17 00:00:00 2001
From: rocky <rocky@gnu.org>
Date: Fri, 8 Jul 2016 10:26:14 -0400
Subject: [PATCH] Python 2.5 with statement

---
 test/bytecode_2.5/05_with.pyc | Bin 0 -> 295 bytes
 uncompyle6/parsers/parse25.py |  15 +++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 test/bytecode_2.5/05_with.pyc

diff --git a/test/bytecode_2.5/05_with.pyc b/test/bytecode_2.5/05_with.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e87be6dadb39c2b8650c1c158d80b603914f6b12
GIT binary patch
literal 295
zcmYLD!Ab)`41Lp%TP-N!57^^^&{e^khzCJW1?{1-O9|3Vad5XSn=D!{3gQ>}Xa0a@
zP&9;>_cD{be0*;A58huUGyFzk_52l(3nQha!vjz`<PMHI@S%&`BW&Oe$P+y8ffE!7
z@*cQ{%d1J*0eci4*SAK;Y1bBoFN@R}(;b7yp!Xztr(E+wN9ksK=o=8tTWuRAx-kWf
zv$7VAABgxVD3SUoileD+{d5<~&0qU?s?lbi8sHyfU~-sAs8<z}EZb(rnP{z&9iC9U
XXSiBRv^lMpWn1xC+#=Cx*X_G+JhDFm

literal 0
HcmV?d00001

diff --git a/uncompyle6/parsers/parse25.py b/uncompyle6/parsers/parse25.py
index 1f95ed2f..863f6805 100644
--- a/uncompyle6/parsers/parse25.py
+++ b/uncompyle6/parsers/parse25.py
@@ -20,17 +20,20 @@ class Python25Parser(Python26Parser):
 
         return_if_stmt ::= ret_expr  RETURN_END_IF JUMP_BACK
 
-        # Pyython 2.6 uses ROT_TWO instead of the STORE_FAST
-        setupwithas ::= DUP_TOP LOAD_ATTR STORE_FAST LOAD_ATTR CALL_FUNCTION_0 STORE_FAST
-                        SETUP_FINALLY LOAD_FAST DELETE_FAST
+        # Pyython 2.6 uses ROT_TWO instead of the STORE_xxx
+        setupwithas ::= DUP_TOP LOAD_ATTR store LOAD_ATTR CALL_FUNCTION_0
+                        setup_finally
+
+        store ::= STORE_FAST
+        store ::= STORE_NAME
 
         # Python 2.6 omits ths LOAD_FAST DELETE_FAST below
         withasstmt ::= expr setupwithas designator suite_stmts_opt
                        POP_BLOCK LOAD_CONST COME_FROM
-                       LOAD_FAST DELETE_FAST
-                       WITH_CLEANUP END_FINALLY
-
+                       with_cleanup
 
+        with_cleanup ::= LOAD_FAST DELETE_FAST WITH_CLEANUP END_FINALLY
+        with_cleanup ::= LOAD_NAME DELETE_NAME WITH_CLEANUP END_FINALLY
         '''
 
 class Python25ParserSingle(Python26Parser, PythonParserSingle):