Simplify withas + Administrivia

rocky · Mar 6, 2024 · 59a1be5 · 59a1be5
1 parent e40b0ff
commit 59a1be5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/admin-tools/check-versions.sh b/admin-tools/check-versions.sh
@@ -27,3 +27,4 @@ for version in $PYVERSIONS; do
     fi
     echo === $version ===
 done
+finish
diff --git a/admin-tools/make-dist.sh b/admin-tools/make-dist.sh
@@ -29,3 +29,4 @@ for pyversion in $PYVERSIONS; do
 done
 
 python ./setup.py bdist_wheel sdist
+finish
diff --git a/decompyle3/semantics/consts.py b/decompyle3/semantics/consts.py
@@ -577,6 +577,11 @@
     "importlist": ("%C", (0, maxint, ", ")),
     "import_from": ("%|from %[2]{pattr} import %c\n", (3, "importlist")),
     "import_from_star": ("%|from %[2]{pattr} import *\n",),
+
+    # 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),
+
 }
 # fmt: on
 

diff --git a/decompyle3/semantics/customize3.py b/decompyle3/semantics/customize3.py
@@ -46,7 +46,6 @@ def customize_for_version3(self, version):
             "tf_tryelsestmtc3": ("%c%-%c%|else:\n%+%c", 1, 3, 5),
             "store_locals": ("%|# inspect.currentframe().f_locals = __locals__\n",),
             "with": ("%|with %c:\n%+%c%-", 0, 3),
-            "withasstmt": ("%|with %c as %c:\n%+%c%-", 0, 2, 3),
         }
     )
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,3 +27,4 @@ for version in $PYVERSIONS; do @@
         fi
         echo === $version ===
     done
+    finish
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,3 +29,4 @@ for pyversion in $PYVERSIONS; do
		done

		python ./setup.py bdist_wheel sdist
		finish