Merge branch 'master' into pypy

Conflicts:
	uncompyle6/scanners/scanner2.py
This commit is contained in:
rocky
2016-07-23 10:43:59 -04:00
5 changed files with 27 additions and 6 deletions

View File

@@ -14,7 +14,6 @@ from uncompyle6 import PYTHON3
if PYTHON3:
intern = sys.intern
from xdis.bytecode import findlinestarts
import uncompyle6.scanners.scanner2 as scan
# bytecode verification, verify(), uses JUMP_OPs from here
@@ -103,7 +102,7 @@ class Scanner26(scan.Scanner2):
self.build_prev_op(n)
# linestarts contains block code adresses (addr,block)
self.linestarts = list(findlinestarts(co))
self.linestarts = list(self.opc.findlinestarts(co))
# class and names
if classname: