jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 01:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Show details on parsing assert failures.

Browse Source
This commit is contained in:
rocky
2015-12-30 23:17:57 -05:00
parent 21e51004ae
commit d3a32b6877
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
uncompyle6/parser.py
View File

@@ -10,6 +10,7 @@ from __future__ import print_function
import sys
from uncompyle6.code import iscode
from uncompyle6.parsers.spark import GenericASTBuilder, DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
class ParserError(Exception):
@@ -91,8 +92,7 @@ def get_python_parser(version, debug_parser):
def python_parser(version, co, out=sys.stdout, showasm=False,
parser_debug=PARSER_DEFAULT_DEBUG):
import inspect
assert hasattr(co, 'co_name')
assert iscode(co)
from uncompyle6.scanner import get_scanner
scanner = get_scanner(version)
tokens, customize = scanner.disassemble(co)
@@ -105,8 +105,8 @@ def python_parser(version, co, out=sys.stdout, showasm=False,
if __name__ == '__main__':
def parse_test(co):
sys_version = sys.version_info.major + (sys.version_info.minor / 10.0)
ast = python_parser(sys_version, co, showasm=True)
from uncompyl6e import PYTHON_VERSION
ast = python_parser(PYTHON_VERSION, co, showasm=True)
print(ast)
return
parse_test(parse_test.__code__)

4
uncompyle6/semantics/fragments.py
View File

@@ -643,7 +643,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
tokens.append(Token('LAMBDA_MARKER'))
try:
ast = parser.parse(self.p, tokens, customize)
except parser.ParserError as e:
except (parser.ParserError, AssertionError) as e:
raise ParserError(e, tokens)
if self.showast:
print(repr(ast))
@@ -667,7 +667,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
# Build AST from disassembly.
try:
ast = parser.parse(self.p, tokens, customize)
except parser.ParserError as e:
except (parser.ParserError, AssertionError) as e:
raise ParserError(e, tokens)
if self.showast:

4
uncompyle6/semantics/pysource.py
View File

@@ -1587,7 +1587,7 @@ class SourceWalker(GenericASTTraversal, object):
tokens.append(Token('LAMBDA_MARKER'))
try:
ast = python_parser.parse(self.p, tokens, customize)
except python_parser.ParserError as e:
except (python_parser.ParserError, AssertionError) as e:
raise ParserError(e, tokens)
if self.showast:
self.print_(repr(ast))
@@ -1610,7 +1610,7 @@ class SourceWalker(GenericASTTraversal, object):
# Build AST from disassembly.
try:
ast = python_parser.parse(self.p, tokens, customize)
except python_parser.ParserError as e:
except (python_parser.ParserError, AssertionError) as e:
raise ParserError(e, tokens)
if self.showast: