Merge branch 'master' into python-3.3-to-3.5

This commit is contained in:
rocky
2024-07-12 19:08:30 -04:00
2 changed files with 4 additions and 13 deletions

View File

@@ -120,19 +120,6 @@ class Python24Parser(Python25Parser):
token_len = len(tokens)
if 0 <= token_len < len(tokens):
return not int(tokens[first].pattr) == tokens[last].offset
elif lhs == "try_except":
if last == len(tokens):
last -= 1
if tokens[last] != "COME_FROM" and tokens[last - 1] == "COME_FROM":
last -= 1
return (
tokens[last] == "COME_FROM"
and tokens[last - 1] == "END_FINALLY"
and tokens[last - 2] == "POP_TOP"
and tokens[last - 3].kind != "JUMP_FORWARD"
)
return False
class Python24ParserSingle(Python24Parser, PythonParserSingle):

View File

@@ -609,6 +609,10 @@ class Scanner:
def get_scanner(version, is_pypy=False, show_asm=None):
"""
Import the right scanner module for ``version`` and return the Scanner class
in that module.
"""
# If version is a string, turn that into the corresponding float.
if isinstance(version, str):
if version not in canonic_python_version: