From 8495d208fbe99e93f2ddf402b4b577fc76588b11 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 8 Feb 2020 19:48:09 -0500
Subject: [PATCH] 3.7+ "async with" handling from decompyle3

---
 test/.gitignore                      |   1 +
 test/bytecode_3.7/04_async.pyc       | Bin 425 -> 901 bytes
 test/bytecode_3.8/04_async.pyc       | Bin 0 -> 937 bytes
 test/simple_source/bug37/04_async.py |  11 ++++
 test/stdlib/2.4-exclude.sh           |  55 ++++++++++++++++++++
 test/stdlib/3.5-exclude.sh           |   6 +++
 uncompyle6/parsers/parse37.py        |  42 +++++++++-------
 uncompyle6/parsers/parse37base.py    |  72 +++++++++++++++++----------
 uncompyle6/semantics/customize37.py  |   6 +--
 9 files changed, 146 insertions(+), 47 deletions(-)
 create mode 100644 test/bytecode_3.8/04_async.pyc
 create mode 100644 test/stdlib/2.4-exclude.sh

diff --git a/test/.gitignore b/test/.gitignore
index cf825a74..3b34597f 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,2 +1,3 @@
 /.coverage
+/.python-version
 /nohup.out
diff --git a/test/bytecode_3.7/04_async.pyc b/test/bytecode_3.7/04_async.pyc
index 0b2e13b77e6b14589414332cd2d7e5a961698a46..67f813ed09e04b45d06b5130e2779f04df45a70f 100644
GIT binary patch
delta 539
zcmZ8d!AiqG5S`skZEVw6QBW^EsSqdyK~SWq*n@g#K<hzra0%HI3u%L!6tN&Vw4yyq
zPx=QQ{hj=Qf8lIetGF=3o85Wu&Flwz%9|&pQUUNBG>>lH=&QNDS;5K&0fLNRNE~ts
zf(kYQ!G_eKLTiDQ`>gMf#8bSVLlGQfM5~y5aEJhGCW4N@VS*t^OG}MVhW)tH^RN6U
z_6T;Wqo`~a8C{SuJVP7F=&L`Xl%m^Ts`=M6!Agxj!HBAuVi>|Moa5+c@NN=#!4>vk
zjCBhxX7`tHoz)h#rSi9kLmN%Gn8B1a?5hk*C7iN$7_K0Q7BB%V6P*mU=Q|{7iCT<_
z-*@6$zF(^cq2~tCVGVgxNh)*5luIg2J*25{CSUx+UB=r;!vsVlgN?b#e-9hKQRlqp
zcKr(HX@T=@DEfhq*x>xG?*{6Lb6K7wWUVR<R4glP^~pNPYTIH?k-O1D&*N$YS;RMK
LAYm(?^%=%DH-2vI

delta 78
zcmZo=U&+kp#LLUY00dUXzhdhdC-O;%2>^Mi3@HpLj4ce!j8Tj!Ou-DA%p1K78HM~b
dnWDJk6N@YJlH*HKi%W{QCr2`?vVH~`004Zf5rzN&

diff --git a/test/bytecode_3.8/04_async.pyc b/test/bytecode_3.8/04_async.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2e6857c1e37aaab794ec29a30a1330b8389f6daa
GIT binary patch
literal 937
zcmZ`%&ref95T4ohfM-i<jl{$Y-b{KaCPFZzK}=(m120i9l6P?P>^`9JwTrv2ff9PL
zO_Z}IJwZJ2clckttEc`8o}AgDw*J^;zU=Jm%r`sVz9^LnKx=L5;j2#q;2S%W%Ohul
z%q|inpg`de1{mQJP(pb_P~Jd9LiyWJooOOn`ni1C6v@7l*_7ZE&LP8daRHlD=PB(k
z1QIS^`JdPNn0W*E<(K<HA(`lVFJT3qUEO;QyOec`ZvwlU`S0-0m;&m>3rF0{h~7kv
zML}$BVzNye&9&oByq}o7AZ46%vcyOk%^qoepmkn;<gT@J=dm%`RQ=qyNxGNMH8tHl
z&T>4?v3CjP8kPNi$F|ysX(Fxenr5=}y1RdWb?M%+jBT&etR439LYCM}Iuf3SohJZs
zOO&yKJ}#i)`84@(a&gNWWOjidfe01QfKiDdM4s~KaeiKEXrsGXtCQ>y#njw6omFFV
zB@~{)d)T7_q*u_Va$F)DQT%Um{tX{Fvrdq~gc^$oA4vUGID_ele<3xur_^x_A~dW(
z6(iBuas#`>$ZLc<Zf}?<_x7~D$!xO(ASxK($=#`^)!Yb=TG@eoP^+i98K-u=Mrp1}
zRhSt{G}jqe6H{hzwTly(H|W%|1VD2?x&2>;kVYFw*@@eUl>9^5T6IZbna@l4wi~D8
wh^a7(<NFOvYFJ?oT2>)I=Z94<Dvm#e<er@BF7mGuc~BpduDdV8Ah1yU0W5XE)&Kwi

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug37/04_async.py b/test/simple_source/bug37/04_async.py
index eb46010b..d7947b19 100644
--- a/test/simple_source/bug37/04_async.py
+++ b/test/simple_source/bug37/04_async.py
@@ -10,3 +10,14 @@ async def test_enter(self):
             x = 1
             y = 2
         assert manager is context
+
+# From 3.7.6 test_coroutines.py
+# Bug was different form of code for "async with" below
+class CoroutineTest():
+    def test_with_8(self):
+        CNT = 0
+        async def foo():
+            nonlocal CNT
+            async with CM():
+                CNT += 1
+                return
diff --git a/test/stdlib/2.4-exclude.sh b/test/stdlib/2.4-exclude.sh
new file mode 100644
index 00000000..77134222
--- /dev/null
+++ b/test/stdlib/2.4-exclude.sh
@@ -0,0 +1,55 @@
+SKIP_TESTS=(
+    [test_aepack.py]=1 # it fails on its own
+    [test_al.py]=1 # it fails on its own
+    [test_applesingle.py]=1 # it fails on its own
+    [test_bsddb185.py]=1 # it fails on its own
+    [test_bsddb3.py]=1 # it fails on its own
+    [test_bsddb.py]=1 # it fails on its own
+    [test_cd.py]=1 # it fails on its own
+    [test_cl.py]=1 # it fails on its own
+    [test_codecmaps_cn.py]=1 # it fails on its own
+    [test_codecmaps_hk.py]=1 # it fails on its own
+    [test_codecmaps_jp.py]=1 # it fails on its own
+    [test_codecmaps_kr.py]=1 # it fails on its own
+    [test_codecmaps_tw.py]=1 # it fails on its own
+    [test_curses.py]=1 # it fails on its own
+    [test_dbm.py]=1 # it fails on its own
+    [test_dl.py]=1 # it fails on its own
+    [test_gdbm.py]=1 # it fails on its own
+    [test_gl.py]=1 # it fails on its own
+    [test_imageop.py]=1 # it fails on its own
+    [test_imgfile.py]=1 # it fails on its own
+    [test_linuxaudiodev.py]=1 # it fails on its own
+    [test_macfs.py]=1 # it fails on its own
+    [test_macostools.py]=1 # it fails on its own
+    [test_nis.py]=1 # it fails on its own
+    [test_normalization.py]=1 # it fails on its own
+    [test_ossaudiodev.py]=1 # it fails on its own
+    [test_pep277.py]=1 # it fails on its own
+    [test_plistlib.py]=1 # it fails on its own
+    [test_rgbimg.py]=1 # it fails on its own
+    [test_scriptpackages.py]=1 # it fails on its own
+    [test_socket_ssl.py]=1 # it fails on its own
+    [test_sunaudiodev.py]=1 # it fails on its own
+    [test_support.py]=1 # it fails on its own
+    [test_tcl.py]=1 # it fails on its own
+    [test_urllib2net.py]=1 # it fails on its own
+    [test_urllibnet.py]=1 # it fails on its own
+    [test_winreg.py]=1 # it fails on its own
+    [test_winsound.py]=1 # it fails on its own
+    [test_zlib.py]=1 # it fails on its own
+
+    [test_decimal.py]=1  #
+    [test_dis.py]=1   # We change line numbers - duh!
+    [test_generators.py]=1  # Investigate
+    [test_grammar.py]=1    # Too many stmts. Handle large stmts
+    [test_grp.py]=1      # Long test - might work Control flow?
+    [test_pep247.py]=1 # Long test - might work? Control flow?
+    [test_pwd.py]=1 # Long test - might work? Control flow?
+    [test_socketserver.py]=1 # -- test takes too long to run: 40 seconds
+    [test_threading.py]=1 # test takes too long to run: 11 seconds
+    [test_thread.py]=1 # test takes too long to run: 36 seconds
+    [test_trace.py]=1 # Long test - works
+    [test_zipfile64.py]=1  # Runs ok but takes 204 seconds
+)
+ # About 243 files, 0 in 19 minutes
diff --git a/test/stdlib/3.5-exclude.sh b/test/stdlib/3.5-exclude.sh
index 178b8978..2c15ae3d 100644
--- a/test/stdlib/3.5-exclude.sh
+++ b/test/stdlib/3.5-exclude.sh
@@ -1,4 +1,8 @@
 SKIP_TESTS=(
+    [test_platform.py]=1 # FIXME: Works on c90ff51
+    [test_pyclbr.py]=1 # FIXME: Works on c90ff51
+    [test_tempfile.py]=1 # FIXME: Works on c90ff51
+    [test_uu.py]=1 # FIXME: Works on c90ff51
     [test_ftplib.py]=1 # FIXME: Works on c90ff51
 
     [test___all__.py]=1 # it fails on its own
@@ -133,6 +137,8 @@ if (( batch )) ; then
     SKIP_TESTS[test_distutils.py]=1
 
     SKIP_TESTS[test_exception_variations.py]=1
+    SKIP_TESTS[test_poplib.py]=1 # May be a result of POWER installation
+
     SKIP_TESTS[test_quopri.py]=1
     SKIP_TESTS[test_ioctl.py]=1 # it fails on its own
     SKIP_TESTS[test_tarfile.py]=1 # too long to run on POWER 15 secs
diff --git a/uncompyle6/parsers/parse37.py b/uncompyle6/parsers/parse37.py
index b29dd513..0d8a33ae 100644
--- a/uncompyle6/parsers/parse37.py
+++ b/uncompyle6/parsers/parse37.py
@@ -1209,25 +1209,31 @@ class Python37Parser(Python37BaseParser):
 
             elif opname == "BEFORE_ASYNC_WITH":
                 rules_str = """
-                  stmt ::= async_with_stmt
+                  stmt               ::= async_with_stmt SETUP_ASYNC_WITH
+                  async_with_pre     ::= BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM SETUP_ASYNC_WITH
+                  async_with_post    ::= COME_FROM_ASYNC_WITH
+                                         WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
+                                         WITH_CLEANUP_FINISH END_FINALLY
+
+                  stmt               ::= async_with_as_stmt
                   async_with_as_stmt ::= expr
-                               BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               SETUP_ASYNC_WITH store
-                               suite_stmts_opt
-                               POP_BLOCK LOAD_CONST
-                               COME_FROM_ASYNC_WITH
-                               WITH_CLEANUP_START
-                               GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               WITH_CLEANUP_FINISH END_FINALLY
-                 stmt ::= async_with_as_stmt
-                 async_with_stmt ::= expr
-                               BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               SETUP_ASYNC_WITH POP_TOP suite_stmts_opt
-                               POP_BLOCK LOAD_CONST
-                               COME_FROM_ASYNC_WITH
-                               WITH_CLEANUP_START
-                               GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               WITH_CLEANUP_FINISH END_FINALLY
+                                         async_with_pre
+                                         store
+                                         suite_stmts_opt
+                                         POP_BLOCK LOAD_CONST
+                                         async_with_post
+
+                 async_with_stmt     ::= expr
+                                         async_with_pre
+                                         POP_TOP
+                                         suite_stmts_opt
+                                         POP_BLOCK LOAD_CONST
+                                         async_with_post
+                 async_with_stmt     ::= expr
+                                         async_with_pre
+                                         POP_TOP
+                                         suite_stmts_opt
+                                         async_with_post
                 """
                 self.addRule(rules_str, nop_func)
 
diff --git a/uncompyle6/parsers/parse37base.py b/uncompyle6/parsers/parse37base.py
index 53e256c0..11893f4d 100644
--- a/uncompyle6/parsers/parse37base.py
+++ b/uncompyle6/parsers/parse37base.py
@@ -210,37 +210,57 @@ class Python37BaseParser(PythonParser):
 
                 if self.version < 3.8:
                     rules_str += """
-                       async_with_stmt    ::= expr
-                                              BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              SETUP_ASYNC_WITH POP_TOP suite_stmts_opt
-                                              POP_BLOCK LOAD_CONST COME_FROM_ASYNC_WITH
-                                              WITH_CLEANUP_START
-                                              GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              WITH_CLEANUP_FINISH END_FINALLY
-                       async_with_as_stmt ::= expr
-                                              BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              SETUP_ASYNC_WITH store suite_stmts_opt
-                                              POP_BLOCK LOAD_CONST COME_FROM_ASYNC_WITH
-                                              WITH_CLEANUP_START
-                                              GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              WITH_CLEANUP_FINISH END_FINALLY
+                      stmt                ::= async_with_stmt SETUP_ASYNC_WITH
+                      async_with_stmt     ::= expr
+                                              async_with_pre
+                                              POP_TOP
+                                              suite_stmts_opt
+                                              POP_BLOCK LOAD_CONST
+                                              async_with_post
+                      async_with_stmt     ::= expr
+                                              async_with_pre
+                                              POP_TOP
+                                              suite_stmts_opt
+                                              async_with_post
+                      async_with_as_stmt  ::= expr
+                                              async_with_pre
+                                              store
+                                              suite_stmts_opt
+                                              POP_BLOCK LOAD_CONST
+                                              async_with_post
                     """
                 else:
                     rules_str += """
-                       async_with_stmt    ::= expr
-                                              BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              SETUP_ASYNC_WITH POP_TOP suite_stmts
-                                              POP_TOP POP_BLOCK BEGIN_FINALLY COME_FROM_ASYNC_WITH
-                                              WITH_CLEANUP_START
-                                              GET_AWAITABLE LOAD_CONST YIELD_FROM
+                      async_with_pre      ::= BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM SETUP_ASYNC_WITH
+                      async_with_post     ::= BEGIN_FINALLY COME_FROM_ASYNC_WITH
+                                              WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
                                               WITH_CLEANUP_FINISH END_FINALLY
-                       async_with_as_stmt ::= expr
-                                              BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              SETUP_ASYNC_WITH store suite_stmts
-                                              POP_TOP POP_BLOCK BEGIN_FINALLY COME_FROM_ASYNC_WITH
-                                              WITH_CLEANUP_START
-                                              GET_AWAITABLE LOAD_CONST YIELD_FROM
+                      async_with_stmt     ::= expr
+                                              async_with_pre
+                                              POP_TOP
+                                              suite_stmts
+                                              POP_TOP POP_BLOCK
+                                              async_with_post
+                      async_with_stmt     ::= expr
+                                              async_with_pre
+                                              POP_TOP
+                                              suite_stmts
+                                              POP_BLOCK
+                                              BEGIN_FINALLY
+                                              WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
+                                              WITH_CLEANUP_FINISH POP_FINALLY LOAD_CONST RETURN_VALUE
+                                              COME_FROM_ASYNC_WITH
+                                              WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
                                               WITH_CLEANUP_FINISH END_FINALLY
+                      async_with_as_stmt  ::= expr
+                                              async_with_pre
+                                              store suite_stmts
+                                              POP_TOP POP_BLOCK
+                                              async_with_post
+                      async_with_as_stmt  ::= expr
+                                              async_with_pre
+                                              store suite_stmts
+                                              POP_BLOCK async_with_post
                     """
                 self.addRule(rules_str, nop_func)
 
diff --git a/uncompyle6/semantics/customize37.py b/uncompyle6/semantics/customize37.py
index f9892058..9fad7357 100644
--- a/uncompyle6/semantics/customize37.py
+++ b/uncompyle6/semantics/customize37.py
@@ -61,12 +61,12 @@ def customize_for_version37(self, version):
                 (1, "expr"),
                 (16, "for_block"),
             ),
-            "async_with_stmt": ("%|async with %c:\n%+%c%-", (0, "expr"), 7),
+            "async_with_stmt": ("%|async with %c:\n%+%c%-", (0, "expr"), 3),
             "async_with_as_stmt": (
                 "%|async with %c as %c:\n%+%c%-",
                 (0, "expr"),
-                (6, "store"),
-                7,
+                (2, "store"),
+                3,
             ),
             "async_forelse_stmt": (
                 "%|async for %c in %c:\n%+%c%-%|else:\n%+%c%-\n\n",