From 869e48877c7a49aef3511979a980b167b017e6f4 Mon Sep 17 00:00:00 2001 From: rocky Date: Thu, 16 Apr 2020 08:41:53 -0400 Subject: [PATCH] Convert to use xdis 4.3.0 or greater --- __pkginfo__.py | 2 +- uncompyle6/disas.py | 2 +- uncompyle6/linenumbers.py | 2 +- uncompyle6/main.py | 2 +- uncompyle6/parser.py | 2 +- uncompyle6/scanners/scanner2.py | 2 +- uncompyle6/scanners/scanner3.py | 2 +- uncompyle6/scanners/scanner37base.py | 2 +- uncompyle6/semantics/aligner.py | 2 +- uncompyle6/semantics/consts.py | 2 +- uncompyle6/semantics/customize3.py | 2 +- uncompyle6/semantics/customize35.py | 2 +- uncompyle6/semantics/customize36.py | 2 +- uncompyle6/semantics/fragments.py | 2 +- uncompyle6/semantics/helper.py | 2 +- uncompyle6/semantics/make_function2.py | 2 +- uncompyle6/semantics/make_function3.py | 2 +- uncompyle6/semantics/make_function36.py | 2 +- uncompyle6/semantics/pysource.py | 2 +- uncompyle6/semantics/transform.py | 2 +- uncompyle6/verify.py | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/__pkginfo__.py b/__pkginfo__.py index ccaad1b8..3457f96e 100644 --- a/__pkginfo__.py +++ b/__pkginfo__.py @@ -58,7 +58,7 @@ entry_points = { ]} ftp_url = None install_requires = ["spark-parser >= 1.8.9, < 1.9.0", - "xdis >= 4.2.4, < 4.3.0"] + "xdis >= 4.3.0, < 4.4.0"] license = "GPL3" mailing_list = "python-debugger@googlegroups.com" diff --git a/uncompyle6/disas.py b/uncompyle6/disas.py index 1c1dc026..275ad07a 100644 --- a/uncompyle6/disas.py +++ b/uncompyle6/disas.py @@ -34,7 +34,7 @@ from __future__ import print_function import sys from collections import deque -from xdis.code import iscode +from xdis import iscode from xdis.load import check_object_path, load_module from uncompyle6.scanner import get_scanner diff --git a/uncompyle6/linenumbers.py b/uncompyle6/linenumbers.py index e82329de..75973ae8 100644 --- a/uncompyle6/linenumbers.py +++ b/uncompyle6/linenumbers.py @@ -15,7 +15,7 @@ from collections import deque -from xdis.code import iscode +from xdis import iscode from xdis.load import load_file, load_module from xdis.main import get_opcode from xdis.bytecode import Bytecode, findlinestarts, offset2line diff --git a/uncompyle6/main.py b/uncompyle6/main.py index 5877438f..9ff65e3c 100644 --- a/uncompyle6/main.py +++ b/uncompyle6/main.py @@ -16,7 +16,7 @@ from __future__ import print_function import datetime, py_compile, os, subprocess, sys, tempfile from uncompyle6 import verify, IS_PYPY, PYTHON_VERSION -from xdis.code import iscode +from xdis import iscode from xdis.magics import sysinfo2float from uncompyle6.disas import check_object_path from uncompyle6.semantics import pysource diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py index cf5cce6e..209410a9 100644 --- a/uncompyle6/parser.py +++ b/uncompyle6/parser.py @@ -23,7 +23,7 @@ from __future__ import print_function import sys -from xdis.code import iscode +from xdis import iscode from xdis.magics import py_str2float from spark_parser import GenericASTBuilder, DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG from uncompyle6.show import maybe_show_asm diff --git a/uncompyle6/scanners/scanner2.py b/uncompyle6/scanners/scanner2.py index 5dc6ab6f..2fb484df 100644 --- a/uncompyle6/scanners/scanner2.py +++ b/uncompyle6/scanners/scanner2.py @@ -37,7 +37,7 @@ from __future__ import print_function from copy import copy -from xdis.code import iscode +from xdis import iscode from xdis.bytecode import ( op_has_argument, instruction_size, _get_const_info) diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py index a13aa56e..cd9cd164 100644 --- a/uncompyle6/scanners/scanner3.py +++ b/uncompyle6/scanners/scanner3.py @@ -35,7 +35,7 @@ Finally we save token information. from __future__ import print_function -from xdis.code import iscode +from xdis import iscode from xdis.bytecode import instruction_size, _get_const_info from uncompyle6.scanner import Token, parse_fn_counts diff --git a/uncompyle6/scanners/scanner37base.py b/uncompyle6/scanners/scanner37base.py index 62da868f..4485d621 100644 --- a/uncompyle6/scanners/scanner37base.py +++ b/uncompyle6/scanners/scanner37base.py @@ -29,7 +29,7 @@ For example: Finally we save token information. """ -from xdis.code import iscode +from xdis import iscode from xdis.bytecode import instruction_size, _get_const_info, Instruction from uncompyle6.scanner import Token diff --git a/uncompyle6/semantics/aligner.py b/uncompyle6/semantics/aligner.py index 05a01e33..7d57dbed 100644 --- a/uncompyle6/semantics/aligner.py +++ b/uncompyle6/semantics/aligner.py @@ -93,7 +93,7 @@ class AligningWalker(SourceWalker, object): self.engine(table[key.type], node) self.prune() -from xdis.code import iscode +from xdis import iscode from uncompyle6.scanner import get_scanner from uncompyle6.show import ( maybe_show_asm, diff --git a/uncompyle6/semantics/consts.py b/uncompyle6/semantics/consts.py index 2529aec7..cf9b6308 100644 --- a/uncompyle6/semantics/consts.py +++ b/uncompyle6/semantics/consts.py @@ -285,7 +285,7 @@ TABLE_DIRECT = { "and": ("%c and %c", 0, 2), "ret_and": ("%c and %c", 0, 2), "and2": ("%c", 3), - "or": ("%c or %c", 0, 2), + "or": ("%p or %p", (0, PRECEDENCE["or"]), (1, PRECEDENCE["or"])), "ret_or": ("%c or %c", 0, 2), "if_exp": ("%p if %c else %c", (2, "expr", 27), 0, 4), "if_exp_lambda": ("%p if %c else %c", (2, "expr", 27), (0, "expr"), 4), diff --git a/uncompyle6/semantics/customize3.py b/uncompyle6/semantics/customize3.py index f695c0d5..9c29e838 100644 --- a/uncompyle6/semantics/customize3.py +++ b/uncompyle6/semantics/customize3.py @@ -19,7 +19,7 @@ from uncompyle6.semantics.consts import TABLE_DIRECT from xdis.util import co_flags_is_async -from xdis.code import iscode +from xdis import iscode from uncompyle6.scanner import Code from uncompyle6.semantics.helper import ( find_code_node, diff --git a/uncompyle6/semantics/customize35.py b/uncompyle6/semantics/customize35.py index 62be6b18..0205527b 100644 --- a/uncompyle6/semantics/customize35.py +++ b/uncompyle6/semantics/customize35.py @@ -15,7 +15,7 @@ """Isolate Python 3.5 version-specific semantic actions here. """ -from xdis.code import iscode +from xdis import iscode from xdis.util import co_flags_is_async from uncompyle6.semantics.consts import ( INDENT_PER_LEVEL, diff --git a/uncompyle6/semantics/customize36.py b/uncompyle6/semantics/customize36.py index 944b28e3..e8741144 100644 --- a/uncompyle6/semantics/customize36.py +++ b/uncompyle6/semantics/customize36.py @@ -15,7 +15,7 @@ """Isolate Python 3.6 version-specific semantic actions here. """ -from xdis.code import iscode +from xdis import iscode from spark_parser.ast import GenericASTTraversalPruningException from uncompyle6.scanners.tok import Token from uncompyle6.semantics.helper import flatten_list, escape_string, strip_quotes diff --git a/uncompyle6/semantics/fragments.py b/uncompyle6/semantics/fragments.py index 71cf57df..01491e30 100644 --- a/uncompyle6/semantics/fragments.py +++ b/uncompyle6/semantics/fragments.py @@ -67,7 +67,7 @@ from __future__ import print_function import re -from xdis.code import iscode +from xdis import iscode from xdis.magics import sysinfo2float from uncompyle6.semantics import pysource from uncompyle6 import parser diff --git a/uncompyle6/semantics/helper.py b/uncompyle6/semantics/helper.py index 279e234e..d0500aba 100644 --- a/uncompyle6/semantics/helper.py +++ b/uncompyle6/semantics/helper.py @@ -1,6 +1,6 @@ import sys -from xdis.code import iscode +from xdis import iscode from uncompyle6.parsers.treenode import SyntaxTree from uncompyle6 import PYTHON3 diff --git a/uncompyle6/semantics/make_function2.py b/uncompyle6/semantics/make_function2.py index d1ab3791..6507b648 100644 --- a/uncompyle6/semantics/make_function2.py +++ b/uncompyle6/semantics/make_function2.py @@ -17,7 +17,7 @@ All the crazy things we have to do to handle Python functions in Python before 3.0. The saga of changes continues in 3.0 and above and in other files. """ -from xdis.code import iscode, code_has_star_arg, code_has_star_star_arg +from xdis import iscode, code_has_star_arg, code_has_star_star_arg from xdis.util import CO_GENERATOR from uncompyle6.scanner import Code from uncompyle6.parsers.treenode import SyntaxTree diff --git a/uncompyle6/semantics/make_function3.py b/uncompyle6/semantics/make_function3.py index 85c25b00..f73e9e07 100644 --- a/uncompyle6/semantics/make_function3.py +++ b/uncompyle6/semantics/make_function3.py @@ -16,7 +16,7 @@ All the crazy things we have to do to handle Python functions in 3.0-3.5 or so. The saga of changes before and after is in other files. """ -from xdis.code import iscode, code_has_star_arg, code_has_star_star_arg +from xdis import iscode, code_has_star_arg, code_has_star_star_arg from xdis.util import CO_GENERATOR from uncompyle6.scanner import Code from uncompyle6.parsers.treenode import SyntaxTree diff --git a/uncompyle6/semantics/make_function36.py b/uncompyle6/semantics/make_function36.py index 5c4da14d..003cc567 100644 --- a/uncompyle6/semantics/make_function36.py +++ b/uncompyle6/semantics/make_function36.py @@ -16,7 +16,7 @@ All the crazy things we have to do to handle Python functions in 3.6 and above. The saga of changes before 3.6 is in other files. """ -from xdis.code import iscode, code_has_star_arg, code_has_star_star_arg +from xdis import iscode, code_has_star_arg, code_has_star_star_arg from xdis.util import CO_GENERATOR, CO_ASYNC_GENERATOR from uncompyle6.scanner import Code from uncompyle6.parsers.treenode import SyntaxTree diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py index 84f643f3..6f21dcbc 100644 --- a/uncompyle6/semantics/pysource.py +++ b/uncompyle6/semantics/pysource.py @@ -129,7 +129,7 @@ import sys IS_PYPY = "__pypy__" in sys.builtin_module_names PYTHON3 = sys.version_info >= (3, 0) -from xdis.code import iscode +from xdis import iscode from xdis.util import COMPILER_FLAG_BIT from uncompyle6.parser import get_python_parser diff --git a/uncompyle6/semantics/transform.py b/uncompyle6/semantics/transform.py index ba2dd5de..1a419462 100644 --- a/uncompyle6/semantics/transform.py +++ b/uncompyle6/semantics/transform.py @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from xdis.code import iscode +from xdis import iscode from uncompyle6.show import maybe_show_tree from copy import copy from spark_parser import GenericASTTraversal, GenericASTTraversalPruningException diff --git a/uncompyle6/verify.py b/uncompyle6/verify.py index 575daaac..1dad60fe 100755 --- a/uncompyle6/verify.py +++ b/uncompyle6/verify.py @@ -27,7 +27,7 @@ from subprocess import call import uncompyle6 from uncompyle6.scanner import (Token as ScannerToken, get_scanner) from uncompyle6 import PYTHON3 -from xdis.code import iscode +from xdis import iscode from xdis.magics import PYTHON_MAGIC_INT from xdis.load import load_file, load_module from xdis.util import pretty_flags