diff --git a/.circleci/config.yml b/.circleci/config.yml index 84edb951..b7649f12 100644 --- 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 index 843c0fc7..cb475827 100644 --- a/uncompyle6/semantics/customize.py +++ b/uncompyle6/semantics/customize.py @@ -29,7 +29,6 @@ from uncompyle6.semantics.helper import flatten_list def customize_for_version(self, is_pypy, version): - self.TABLE_DIRECT = TABLE_DIRECT.copy() if is_pypy: ######################## # PyPy changes @@ -264,7 +263,6 @@ def customize_for_version(self, is_pypy, version): # < 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 index d3df25d2..d635e9f1 100644 --- 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 index 4f835239..d70e43f2 100644 --- a/uncompyle6/semantics/customize26_27.py +++ b/uncompyle6/semantics/customize26_27.py @@ -19,7 +19,6 @@ from uncompyle6.semantics.consts import TABLE_DIRECT def customize_for_version26_27(self, version: tuple): - self.TABLE_DIRECT = TABLE_DIRECT.copy() ######################################## # Python 2.6+ # except as diff --git a/uncompyle6/semantics/customize3.py b/uncompyle6/semantics/customize3.py index 194b8d49..45564d25 100644 --- a/uncompyle6/semantics/customize3.py +++ b/uncompyle6/semantics/customize3.py @@ -30,7 +30,6 @@ from uncompyle6.util import get_code_name 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 index 13bd5f10..df371415 100644 --- a/uncompyle6/semantics/customize35.py +++ b/uncompyle6/semantics/customize35.py @@ -26,7 +26,6 @@ from uncompyle6.semantics.helper import flatten_list, gen_function_parens_adjust ####################### 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 index 99c4905d..bb5efd84 100644 --- 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 index 91b4de8d..41e375ab 100644 --- 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 index c3e4cf78..5b3684bb 100644 --- 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 index 330b97bf..537ca7f5 100644 --- a/uncompyle6/semantics/fragments.py +++ b/uncompyle6/semantics/fragments.py @@ -656,8 +656,6 @@ class FragmentsWalker(pysource.SourceWalker, object): 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)