From 3e49aa56bb9bd9848418b3467ec3e723ff84acb6 Mon Sep 17 00:00:00 2001 From: rocky Date: Thu, 28 Apr 2016 19:03:51 -0400 Subject: [PATCH] spark -> spark_parser --- requirements.txt | 2 +- uncompyle6/parser.py | 2 +- uncompyle6/parsers/parse2.py | 2 +- uncompyle6/parsers/parse3.py | 2 +- uncompyle6/semantics/fragments.py | 2 +- uncompyle6/semantics/pysource.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index af5fcddf..8d05f0d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -spark_parser >= 1.0.2 +spark_parser >= 1.1.0 diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py index a62e7977..b2e142b1 100644 --- a/uncompyle6/parser.py +++ b/uncompyle6/parser.py @@ -11,7 +11,7 @@ from __future__ import print_function import sys from uncompyle6.code import iscode -from spark import GenericASTBuilder, DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG +from spark_parser import GenericASTBuilder, DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG class ParserError(Exception): def __init__(self, token, offset): diff --git a/uncompyle6/parsers/parse2.py b/uncompyle6/parsers/parse2.py index c05edd61..ed8a679c 100644 --- a/uncompyle6/parsers/parse2.py +++ b/uncompyle6/parsers/parse2.py @@ -19,7 +19,7 @@ from __future__ import print_function from uncompyle6.parser import PythonParser, nop_func from uncompyle6.parsers.astnode import AST -from spark import GenericASTBuilder, DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG +from spark_parser import GenericASTBuilder, DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG from uncompyle6 import PYTHON3 class Python2Parser(PythonParser): diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py index db940cb3..bb9e66b9 100644 --- a/uncompyle6/parsers/parse3.py +++ b/uncompyle6/parsers/parse3.py @@ -19,7 +19,7 @@ from __future__ import print_function from uncompyle6.parser import PythonParser, nop_func from uncompyle6.parsers.astnode import AST -from spark import GenericASTBuilder, DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG +from spark_parser import GenericASTBuilder, DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG from uncompyle6 import PYTHON3 class Python3Parser(PythonParser): diff --git a/uncompyle6/semantics/fragments.py b/uncompyle6/semantics/fragments.py index 2956f0ac..13e2eda1 100644 --- a/uncompyle6/semantics/fragments.py +++ b/uncompyle6/semantics/fragments.py @@ -46,7 +46,7 @@ else: from StringIO import StringIO -from spark import GenericASTTraversal, GenericASTTraversalPruningException, \ +from spark_parser import GenericASTTraversal, GenericASTTraversalPruningException, \ DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG from types import CodeType diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py index 493ae5c0..0bf18476 100644 --- a/uncompyle6/semantics/pysource.py +++ b/uncompyle6/semantics/pysource.py @@ -70,7 +70,7 @@ from uncompyle6 import PYTHON3 from uncompyle6.code import iscode from uncompyle6.parser import get_python_parser from uncompyle6.parsers.astnode import AST -from spark import GenericASTTraversal, DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG +from spark_parser import GenericASTTraversal, DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG from uncompyle6.scanner import Code, get_scanner from uncompyle6.scanners.tok import Token, NoneToken import uncompyle6.parser as python_parser