Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2020-05-19 01:24:08 -04:00
13 changed files with 480 additions and 274 deletions

View File

@@ -1,4 +1,4 @@
# Copyright (c) 2016, 2018-2019 by Rocky Bernstein
# Copyright (c) 2016, 2018-2020 by Rocky Bernstein
# Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
# Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
# Copyright (c) 1999 John Aycock
@@ -27,9 +27,7 @@ import sys
from uncompyle6 import PYTHON3, IS_PYPY, PYTHON_VERSION
from uncompyle6.scanners.tok import Token
import xdis
from xdis.bytecode import Bytecode, instruction_size, extended_arg_val, next_offset
from xdis.magics import canonic_python_version
from xdis.util import code2num
from xdis import Bytecode, canonic_python_version, code2num, instruction_size, extended_arg_val, next_offset
if PYTHON_VERSION < 2.6:
from xdis.namedtuple24 import namedtuple