From 8542df46392f668c583b4e637640c3cdbfdaa958 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 7 Mar 2024 18:08:07 -0500
Subject: [PATCH] Add context manager test...

handle degenerate 3.8 withas
---
 .../08_test_contextmanager.pyc                | Bin 0 -> 722 bytes
 .../08_test_contextmanager.pyc                | Bin 0 -> 732 bytes
 .../stmts/08_test_contextmanager.py           |  21 ++++++++++
 uncompyle6/parsers/parse38.py                 |   9 ++++
 uncompyle6/semantics/consts.py                |   9 ++--
 uncompyle6/semantics/customize38.py           |  39 +++++++++++++-----
 6 files changed, 64 insertions(+), 14 deletions(-)
 create mode 100644 test/bytecode_3.6_run/08_test_contextmanager.pyc
 create mode 100644 test/bytecode_3.8_run/08_test_contextmanager.pyc
 create mode 100644 test/simple_source/stmts/08_test_contextmanager.py

diff --git a/test/bytecode_3.6_run/08_test_contextmanager.pyc b/test/bytecode_3.6_run/08_test_contextmanager.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..999815b0dd5ae8d814e6d52ae6798b42ad766cad
GIT binary patch
literal 722
zcmZutJ5L)y5T1SbILxDn5Cx&7xFUc=lOl?cD5zqIfJAi7=(t@+mVEZHdyWipXWGb3
z{zU%LwyDTZNR^pA;X_JBn#aw|e&2U<wzJd!arxVR7XZKDl^s!iPVQ?8mteq%C-SAt
z!3ryvVwL3T7L2@t&+z4?caW>~RCm*^vap2JK5gk$BB1Mcm66wwsghXNCaF3n_lFcL
z<ibEMjWF^Fa%Gg!l(p&6yCl51vA(&OP8vIJJ{6PVt92#)TQts$bwTbm1*7PV9z65l
znJ1ZaoSdTY6EYFBx8tGX-5CD7^P{RBTlCYJEA5GIs>Yw3zQ=}Gv21CpmiD-Q2%CtO
zq&UPLL3qXn@p$;J#^d#3$z*Jt*`wNRDi*L13%O83O{&Ep3d*!&<dE8ViOoZ8!zNeX
zit)^bBsT9l`7VjO#5Er^h$(%&XnOm9O>u9K^+Jj`DJqK?`iRxk%;*Rhwh`}V#kifg
z4Z?F<9M%VGE2edPWbVhyry^CcL)b9~J+1A8X@;W+Es7vsOOKGP{tqqx$B4$4+1==i
LzT6Xga##EXALX8j

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.8_run/08_test_contextmanager.pyc b/test/bytecode_3.8_run/08_test_contextmanager.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f610c7e9cec3aa6480f2c5b0d3b2b9d77e9b1841
GIT binary patch
literal 732
zcmZuvy>1gh5T4mvUoKXX0!0*%7r26i28jZpNGVcbDf|d@&FHvYBTGK}*gYdBa_6+j
zO<sam+LkJLgjCF|WuFm@G`sV+-}l|<J{=zRf$i?{!Tv;m-;(T_bkEs+!^b5UFnG(p
zR0UYHYKg0~NIt_WxPtfaWm9`rB-^g;x?N;p39F|(rB^9JSMMUDK0uyS%=(up&d%BW
z2_F^;G*BpmM%_Y@n8awlwdwKOG(7oeeS0yTw07RUD<|bQ>ni@ntw}6?!R|F52Kk*D
z<mz6^_rmoHatzwr@zBXcJRV>8QQeF!`RUA6_RP0+>(5@krk44rS`*f5!qetD>=RiQ
z;fQ(+;RP1(=Hy>>r`y3w$TlXic+`2o!2%YzP>W=!SuYNvs9ZZi51E};)Lu6>>`U~c
z9M5c##^TrR6I>c+nQuO7i89VMx}N`ESDYK<y^s-2%GwfzK2be2GhPIR1ETM<a=h-i
zJ;rnL>+CSb^$D$$<w_QJo?({63S-AR=xJjoLNgpiXe<NnO5Xy7?9H10ZA6pJ9PRb7
Kua5Cp9pN8-j+`t2

literal 0
HcmV?d00001

diff --git a/test/simple_source/stmts/08_test_contextmanager.py b/test/simple_source/stmts/08_test_contextmanager.py
new file mode 100644
index 00000000..9a6ea5f9
--- /dev/null
+++ b/test/simple_source/stmts/08_test_contextmanager.py
@@ -0,0 +1,21 @@
+"""
+This program is self checking!
+"""
+
+
+class TestContextManager:
+    def __enter__(self):
+        return 1, 2
+
+    def __exit__(self, exc_type, exc_value, exc_tb):
+        return self, exc_type, exc_value, exc_tb
+
+
+with open(__file__) as a:
+    assert a
+
+with open(__file__) as a, open(__file__) as b:
+    assert a.read() == b.read()
+
+with TestContextManager() as a, b:
+    assert (a, b) == (1, 2)
diff --git a/uncompyle6/parsers/parse38.py b/uncompyle6/parsers/parse38.py
index 10367419..7ce4e93c 100644
--- a/uncompyle6/parsers/parse38.py
+++ b/uncompyle6/parsers/parse38.py
@@ -586,6 +586,15 @@ class Python38Parser(Python37Parser):
                                     GET_ITER CALL_FUNCTION_1
                        """
                     self.addRule(rule, nop_func)
+            elif opname == "SETUP_WITH":
+                rules_str = """
+                  stmt        ::= with_as_pass
+                  with_as_pass ::= expr
+                                   SETUP_WITH store pass
+                                   POP_BLOCK BEGIN_FINALLY COME_FROM_WITH
+                                   with_suffix
+                 """
+                self.addRule(rules_str, nop_func)
 
     def reduce_is_invalid(self, rule, ast, tokens, first, last):
         invalid = super(Python38Parser, self).reduce_is_invalid(
diff --git a/uncompyle6/semantics/consts.py b/uncompyle6/semantics/consts.py
index bc62b205..07bebb52 100644
--- a/uncompyle6/semantics/consts.py
+++ b/uncompyle6/semantics/consts.py
@@ -272,8 +272,6 @@ TABLE_DIRECT = {
         (2, NO_PARENTHESIS_EVER)
         ),
 
-    "IMPORT_FROM": ("%{pattr}",),
-    "IMPORT_NAME_ATTR": ("%{pattr}",),
     "attribute": ("%c.%[1]{pattr}", (0, "expr")),
     "delete_subscript": (
         "%|del %p[%c]\n",
@@ -431,7 +429,12 @@ TABLE_DIRECT = {
 
     # If there are situations where we need "with ... as ()"
     # We may need to customize this in n_withasstmt
-    "withasstmt": ("%|with %c as %c:\n%+%c%-", 0, 2, 3),
+    "withasstmt": (
+        "%|with %c as %c:\n%+%c%-",
+        (0, "expr"),
+        (2, "store"),
+        (3, ("suite_stmts_opt", "suite_stmts")),
+    ),
 
     "expr_stmt": (
         "%|%p\n",
diff --git a/uncompyle6/semantics/customize38.py b/uncompyle6/semantics/customize38.py
index 10a83b80..67023299 100644
--- a/uncompyle6/semantics/customize38.py
+++ b/uncompyle6/semantics/customize38.py
@@ -23,8 +23,8 @@ from uncompyle6.semantics.consts import PRECEDENCE, TABLE_DIRECT
 from uncompyle6.semantics.customize37 import FSTRING_CONVERSION_MAP
 from uncompyle6.semantics.helper import escape_string, strip_quotes
 
-def customize_for_version38(self, version):
 
+def customize_for_version38(self, version):
     # FIXME: pytest doesn't add proper keys in testing. Reinstate after we have fixed pytest.
     # for lhs in 'for forelsestmt forelselaststmt '
     #             'forelselaststmtc tryfinally38'.split():
@@ -40,10 +40,10 @@ def customize_for_version38(self, version):
             ),
             "async_forelse_stmt38": (
                 "%|async for %c in %c:\n%+%c%-%|else:\n%+%c%-\n\n",
-                (7, 'store'),
-                (0, 'expr'),
-                (8, 'for_block'),
-                (-1, 'else_suite')
+                (7, "store"),
+                (0, "expr"),
+                (8, "for_block"),
+                (-1, "else_suite"),
             ),
             "async_with_stmt38": (
                 "%|async with %c:\n%+%c%-\n",
@@ -70,8 +70,15 @@ def customize_for_version38(self, version):
             ),
             # Python 3.8 reverses the order of keys and items
             # from all prior versions of Python.
-            "dict_comp_body": ("%c: %c", (0, "expr"), (1, "expr"),),
-            "except_cond1a": ("%|except %c:\n", (1, "expr"),),
+            "dict_comp_body": (
+                "%c: %c",
+                (0, "expr"),
+                (1, "expr"),
+            ),
+            "except_cond1a": (
+                "%|except %c:\n",
+                (1, "expr"),
+            ),
             "except_cond_as": (
                 "%|except %c as %c:\n",
                 (1, "expr"),
@@ -121,10 +128,19 @@ def customize_for_version38(self, version):
                 -2,
             ),
             "ifpoplaststmtc": ("%|if %c:\n%+%c%-", (0, "testexpr"), (2, "l_stmts")),
+            "named_expr": (  # AKA "walrus operator"
+                "%c := %p",
+                (2, "store"),
+                (0, "expr", PRECEDENCE["named_expr"] - 1),
+            ),
             "pop_return": ("%|return %c\n", (1, "return_expr")),
             "popb_return": ("%|return %c\n", (0, "return_expr")),
             "pop_ex_return": ("%|return %c\n", (0, "return_expr")),
-            "set_for": (" for %c in %c", (2, "store"), (0, "expr_or_arg"),),
+            "set_for": (
+                " for %c in %c",
+                (2, "store"),
+                (0, "expr_or_arg"),
+            ),
             "whilestmt38": (
                 "%|while %c:\n%+%c%-\n\n",
                 (1, ("bool_op", "testexpr", "testexprc")),
@@ -211,10 +227,11 @@ def customize_for_version38(self, version):
                 (2, "suite_stmts_opt"),
                 (8, "suite_stmts_opt"),
             ),
-            "named_expr": (  # AKA "walrus operator"
-                "%c := %p",
+            "with_as_pass": (
+                "%|with %c as %c:\n%+%c%-",
+                (0, "expr"),
                 (2, "store"),
-                (0, "expr", PRECEDENCE["named_expr"] - 1),
+                (3, "pass"),
             ),
         }
     )