Merge pull request rocky#504 from rocky/TABLE_DIRECT-pollution

rocky · web-flow · commit 2786cbcb892e · 2024-11-12T16:38:40.000-05:00
Don't update global tables, copy them instead.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -64,7 +64,7 @@ jobs:
       # Test
       #   This would typically be a build job when using workflows, possibly combined with build
       # This is based on your 1.0 configuration file or project settings
-      - run: sudo python ./setup.py develop && make check-3.6
+      - run: sudo pip install -e . && make check-3.6
       - run: cd ./test/stdlib && bash ./runtests.sh 'test_[p-z]*.py'
       # Teardown
       #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
diff --git a/uncompyle6/semantics/customize.py b/uncompyle6/semantics/customize.py
@@ -29,7 +29,6 @@
 
 
 def customize_for_version(self, is_pypy, version):
-    self.TABLE_DIRECT = TABLE_DIRECT.copy()
     if is_pypy:
         ########################
         # PyPy changes
@@ -264,7 +263,6 @@ def n_call(node):
 
         # < 3.0 continues
 
-        self.TABLE_R = TABLE_R.copy()
         self.TABLE_R.update(
             {
                 "STORE_SLICE+0": ("%c[:]", 0),
diff --git a/uncompyle6/semantics/customize25.py b/uncompyle6/semantics/customize25.py
@@ -25,7 +25,7 @@ def customize_for_version25(self, version):
     ########################
     # Import style for 2.5+
     ########################
-    TABLE_DIRECT.update(
+    self.TABLE_DIRECT.update(
         {
             "importmultiple": ("%|import %c%c\n", 2, 3),
             "import_cont": (", %c", 2),
diff --git a/uncompyle6/semantics/customize26_27.py b/uncompyle6/semantics/customize26_27.py
@@ -19,7 +19,6 @@
 
 
 def customize_for_version26_27(self, version: tuple):
-    self.TABLE_DIRECT = TABLE_DIRECT.copy()
     ########################################
     # Python 2.6+
     #    except <condition> as <var>
diff --git a/uncompyle6/semantics/customize3.py b/uncompyle6/semantics/customize3.py
@@ -30,7 +30,6 @@
 
 
 def customize_for_version3(self, version: tuple):
-    self.TABLE_DIRECT = TABLE_DIRECT.copy()
     self.TABLE_DIRECT.update(
         {
             "comp_for": (" for %c in %c", (2, "store"), (0, "expr")),
diff --git a/uncompyle6/semantics/customize35.py b/uncompyle6/semantics/customize35.py
@@ -26,7 +26,6 @@
 #######################
 def customize_for_version35(self, version: tuple):
     # fmt: off
-    self.TABLE_DIRECT = TABLE_DIRECT.copy()
     self.TABLE_DIRECT.update(
         {
             # nested await expressions like:
diff --git a/uncompyle6/semantics/customize36.py b/uncompyle6/semantics/customize36.py
@@ -96,7 +96,6 @@ def customize_for_version36(self, version: tuple):
         }
     )
 
-    self.TABLE_R = TABLE_R.copy()
     self.TABLE_R.update(
         {
             "CALL_FUNCTION_EX":    ("%c(*%P)", 0, (1, 2, ", ", 100)),
diff --git a/uncompyle6/semantics/customize37.py b/uncompyle6/semantics/customize37.py
@@ -30,8 +30,6 @@ def customize_for_version37(self, version: tuple):
     # Python 3.7+ changes
     #######################
 
-    self.TABLE_DIRECT = TABLE_DIRECT.copy()
-
     # fmt: off
     PRECEDENCE["attribute37"]      =   2
     PRECEDENCE["call_ex"]          =   1
diff --git a/uncompyle6/semantics/customize38.py b/uncompyle6/semantics/customize38.py
@@ -29,8 +29,6 @@ def customize_for_version38(self, version: tuple):
     # for lhs in 'for forelsestmt forelselaststmt '
     #             'forelselaststmtc tryfinally38'.split():
     #     del TABLE_DIRECT[lhs]
-
-    self.TABLE_DIRECT = TABLE_DIRECT.copy()
     self.TABLE_DIRECT.update(
         {
             "async_for_stmt38": (
diff --git a/uncompyle6/semantics/fragments.py b/uncompyle6/semantics/fragments.py
@@ -656,8 +656,6 @@ def comprehension_walk(self, node, iter_index, code_index=-5):
         code = Code(cn.attr, self.scanner, self.currentclass)
         ast = self.build_ast(code._tokens, code._customize, code)
 
-        self.TABLE_DIRECT = TABLE_DIRECT.copy()
-        self.TABLE_R = TABLE_R.copy()
         self.MAP_DIRECT = (self.TABLE_DIRECT,)
         self.MAP_R = (self.TABLE_R, -1)
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ def customize_for_version25(self, version):`
`25`	`25`	`########################`
`26`	`26`	`# Import style for 2.5+`
`27`	`27`	`########################`
`28`		`- TABLE_DIRECT.update(`
	`28`	`+ self.TABLE_DIRECT.update(`
`29`	`29`	`{`
`30`	`30`	`"importmultiple": ("%\|import %c%c\n", 2, 3),`
`31`	`31`	`"import_cont": (", %c", 2),`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@`
`30`	`30`
`31`	`31`
`32`	`32`	`def customize_for_version3(self, version: tuple):`
`33`		`- self.TABLE_DIRECT = TABLE_DIRECT.copy()`
`34`	`33`	`self.TABLE_DIRECT.update(`
`35`	`34`	`{`
`36`	`35`	`"comp_for": (" for %c in %c", (2, "store"), (0, "expr")),`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`	`#######################`
`27`	`27`	`def customize_for_version35(self, version: tuple):`
`28`	`28`	`# fmt: off`
`29`		`- self.TABLE_DIRECT = TABLE_DIRECT.copy()`
`30`	`29`	`self.TABLE_DIRECT.update(`
`31`	`30`	`{`
`32`	`31`	`# nested await expressions like:`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ def customize_for_version36(self, version: tuple):`
`96`	`96`	`}`
`97`	`97`	`)`
`98`	`98`
`99`		`- self.TABLE_R = TABLE_R.copy()`
`100`	`99`	`self.TABLE_R.update(`
`101`	`100`	`{`
`102`	`101`	`"CALL_FUNCTION_EX": ("%c(*%P)", 0, (1, 2, ", ", 100)),`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ def customize_for_version38(self, version: tuple):`
`29`	`29`	`# for lhs in 'for forelsestmt forelselaststmt '`
`30`	`30`	`# 'forelselaststmtc tryfinally38'.split():`
`31`	`31`	`# del TABLE_DIRECT[lhs]`
`32`		`-`
`33`		`- self.TABLE_DIRECT = TABLE_DIRECT.copy()`
`34`	`32`	`self.TABLE_DIRECT.update(`
`35`	`33`	`{`
`36`	`34`	`"async_for_stmt38": (`