Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2017-08-15 11:12:20 -04:00
7 changed files with 29 additions and 27 deletions

View File

@@ -9,13 +9,10 @@ Common uncompyle parser routines.
import sys
from xdis.code 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
# FIXME: put in xdis
from uncompyle6.scanner import version_str2float
class ParserError(Exception):
def __init__(self, token, offset):
self.token = token
@@ -614,7 +611,7 @@ def get_python_parser(
# If version is a string, turn that into the corresponding float.
if isinstance(version, str):
version = version_str2float(version)
version = py_str2float(version)
# FIXME: there has to be a better way...
# We could do this as a table lookup, but that would force us