Convert to use xdis 4.3.0 or greater

__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"

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
 

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

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

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

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)

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

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

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,

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),

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,

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,

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

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

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

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

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

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

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

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 <http://www.gnu.org/licenses/>.
 
-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

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