Commit 3000d975 authored by Jason R. Coombs's avatar Jason R. Coombs

Re-introduce _iter_code functionality as a Bytecode backport. Fixes failing tests. Ref #866.

parent a01cf3c2
import sys import sys
import imp import imp
import marshal import marshal
import dis
from distutils.version import StrictVersion from distutils.version import StrictVersion
from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
from .py33compat import Bytecode
__all__ = [ __all__ = [
'Require', 'find_module', 'get_module_constant', 'extract_constant' 'Require', 'find_module', 'get_module_constant', 'extract_constant'
...@@ -155,7 +156,7 @@ def extract_constant(code, symbol, default=-1): ...@@ -155,7 +156,7 @@ def extract_constant(code, symbol, default=-1):
const = default const = default
for byte_code in dis.Bytecode(code): for byte_code in Bytecode(code):
op = byte_code.opcode op = byte_code.opcode
arg = byte_code.arg arg = byte_code.arg
......
import dis
import code
import array
import collections
from setuptools.extern import six
OpArg = collections.namedtuple('OpArg', 'opcode arg')
class Bytecode_compat(object):
def __init__(self, code):
self.code = code
def __iter__(self):
"""Yield '(op,arg)' pair for each operation in code object 'code'"""
bytes = array.array('b', self.code.co_code)
eof = len(self.code.co_code)
ptr = 0
extended_arg = 0
while ptr < eof:
op = bytes[ptr]
if op >= dis.HAVE_ARGUMENT:
arg = bytes[ptr + 1] + bytes[ptr + 2] * 256 + extended_arg
ptr += 3
if op == dis.EXTENDED_ARG:
long_type = six.integer_types[-1]
extended_arg = arg * long_type(65536)
continue
else:
arg = None
ptr += 1
yield OpArg(op, arg)
Bytecode = getattr(dis, 'Bytecode', Bytecode_compat)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment