Add cPyparsing support

Author: evhub

docs/source/pyparsing.rst

@@ -13,6 +13,10 @@ While the `official pyparsing documentation`_ is a great resource, most of the m
 
 .. _`official pyparsing documentation`: https://pythonhosted.org/pyparsing/
 
+The recommended way to import `pyparsing` is via `undebt.pyparsing`. This has the advantage that if the faster `cPyparsing`_ is available, `undebt.pyparsing` will use it instead. To install `cPyparsing`_ automatically with your `undebt` installation, just `pip install undebt[cPyparsing]`.
+
+.. _`cPyparsing`: https://github.com/evhub/cpyparsing
+
 Operators
 ---------
 

setup.py

@@ -17,8 +17,8 @@
     license="Copyright Yelp, Inc. 2016",
     url="https://github.com/Yelp/undebt",
     packages=find_packages(exclude=[
-        "tests*",
-        "docs*",
+        "tests",
+        "docs",
     ]),
     install_requires=[
         'pyparsing',
@@ -30,6 +30,9 @@
             "mock",
             "coverage",
         ],
+        "cPyparsing": [
+            "cPyparsing",
+        ],
     },
     entry_points={
         'console_scripts': [

tests/pattern/util_test.py

@@ -6,8 +6,6 @@
 import sys
 
 import mock
-from pyparsing import Keyword
-from pyparsing import Literal
 
 from undebt.pattern.testing import assert_parse
 from undebt.pattern.util import debug
@@ -16,6 +14,8 @@
 from undebt.pattern.util import quoted
 from undebt.pattern.util import sequence
 from undebt.pattern.util import trailing_whitespace
+from undebt.pyparsing import Keyword
+from undebt.pyparsing import Literal
 
 
 if sys.version_info.major == 3:

undebt/examples/attribute_to_function.py

@@ -3,16 +3,15 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import Keyword
-from pyparsing import ZeroOrMore
-
 from undebt.pattern.common import BRACKETS
 from undebt.pattern.common import DOT
 from undebt.pattern.common import NAME
 from undebt.pattern.common import PARENS
 from undebt.pattern.lang.python import ATOM_BASE
 from undebt.pattern.util import condense
 from undebt.pattern.util import tokens_as_list
+from undebt.pyparsing import Keyword
+from undebt.pyparsing import ZeroOrMore
 
 
 attribute = Keyword("attribute")

undebt/examples/class_inherit_object.py

@@ -3,15 +3,14 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import Keyword
-from pyparsing import Optional
-
 from undebt.pattern.common import COLON
 from undebt.pattern.common import INDENT
 from undebt.pattern.common import LPAREN
 from undebt.pattern.common import NAME
 from undebt.pattern.common import RPAREN
 from undebt.pattern.util import tokens_as_list
+from undebt.pyparsing import Keyword
+from undebt.pyparsing import Optional
 
 
 grammar = INDENT + Keyword("class").suppress() + NAME + (Optional(LPAREN + RPAREN) + COLON).suppress()

undebt/examples/contextlib_nested.py

@@ -8,10 +8,6 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import Keyword
-from pyparsing import Optional
-from pyparsing import ZeroOrMore
-
 from undebt.pattern.common import COLON
 from undebt.pattern.common import COMMA_IND
 from undebt.pattern.common import DOT
@@ -20,6 +16,9 @@
 from undebt.pattern.common import LPAREN_IND
 from undebt.pattern.lang.python import EXPR
 from undebt.pattern.util import tokens_as_dict
+from undebt.pyparsing import Keyword
+from undebt.pyparsing import Optional
+from undebt.pyparsing import ZeroOrMore
 
 
 expr_list = (

undebt/examples/deprecated_inequality_operator.py

@@ -3,10 +3,9 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import Literal
-
 from undebt.pattern.lang.python import UNARY_OP_ATOM
 from undebt.pattern.util import tokens_as_list
+from undebt.pyparsing import Literal
 
 
 grammar = UNARY_OP_ATOM + Literal("<>").suppress() + UNARY_OP_ATOM

undebt/examples/exec_function.py

@@ -3,13 +3,12 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import Keyword
-from pyparsing import Optional
-
 from undebt.pattern.common import COMMA
 from undebt.pattern.common import INDENT
 from undebt.pattern.lang.python import ATOM
 from undebt.pattern.util import tokens_as_list
+from undebt.pyparsing import Keyword
+from undebt.pyparsing import Optional
 
 
 grammar = (

undebt/examples/hex_to_bitshift.py

@@ -3,12 +3,11 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import Combine
-from pyparsing import hexnums
-from pyparsing import Literal
-from pyparsing import Word
-
 from undebt.pattern.util import tokens_as_list
+from undebt.pyparsing import Combine
+from undebt.pyparsing import hexnums
+from undebt.pyparsing import Literal
+from undebt.pyparsing import Word
 
 grammar = Combine(Literal("0x").suppress() + Word(hexnums))
 

undebt/examples/method_to_function.py

@@ -3,9 +3,6 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import Keyword
-from pyparsing import ZeroOrMore
-
 from undebt.pattern.common import BRACKETS
 from undebt.pattern.common import DOT
 from undebt.pattern.common import LPAREN
@@ -15,6 +12,8 @@
 from undebt.pattern.lang.python import ATOM_BASE
 from undebt.pattern.util import condense
 from undebt.pattern.util import tokens_as_list
+from undebt.pyparsing import Keyword
+from undebt.pyparsing import ZeroOrMore
 
 
 method = Keyword("method")

undebt/examples/remove_needless_u_specifier.py

@@ -3,18 +3,17 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import Keyword
-from pyparsing import Literal
-from pyparsing import Optional
-from pyparsing import originalTextFor
-from pyparsing import ZeroOrMore
-
 from undebt.pattern.common import COMMA
 from undebt.pattern.common import NAME
 from undebt.pattern.common import STRING
 from undebt.pattern.util import condense
 from undebt.pattern.util import in_string
 from undebt.pattern.util import tokens_as_list
+from undebt.pyparsing import Keyword
+from undebt.pyparsing import Literal
+from undebt.pyparsing import Optional
+from undebt.pyparsing import originalTextFor
+from undebt.pyparsing import ZeroOrMore
 
 
 unicode_literals = Keyword("unicode_literals")

undebt/examples/sqla_count.py

@@ -3,16 +3,15 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import Keyword
-from pyparsing import Literal
-
 from undebt.pattern.common import DOT
 from undebt.pattern.common import LPAREN
 from undebt.pattern.common import PARENS
 from undebt.pattern.common import RPAREN
 from undebt.pattern.util import leading_whitespace
 from undebt.pattern.util import tokens_as_dict
 from undebt.pattern.util import trailing_whitespace
+from undebt.pyparsing import Keyword
+from undebt.pyparsing import Literal
 
 
 grammar = (

undebt/examples/swift.py

@@ -3,15 +3,14 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import delimitedList
-from pyparsing import Keyword
-from pyparsing import Literal
-from pyparsing import SkipTo
-
 from undebt.pattern.common import NAME
 from undebt.pattern.lang.python import EXPR
 from undebt.pattern.util import condense
 from undebt.pattern.util import tokens_as_dict
+from undebt.pyparsing import delimitedList
+from undebt.pyparsing import Keyword
+from undebt.pyparsing import Literal
+from undebt.pyparsing import SkipTo
 
 
 if_ = Keyword("if")

undebt/pattern/__init__.py

@@ -3,7 +3,7 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import ParserElement
+from undebt.pyparsing import ParserElement
 
 
 ParserElement.enablePackrat()

undebt/pattern/common.py

@@ -5,23 +5,22 @@
 
 import re
 
-from pyparsing import CharsNotIn
-from pyparsing import Literal
-from pyparsing import nestedExpr
-from pyparsing import Optional
-from pyparsing import originalTextFor
-from pyparsing import quotedString
-from pyparsing import Regex
-from pyparsing import SkipTo
-from pyparsing import StringEnd
-from pyparsing import StringStart
-from pyparsing import Word
-from pyparsing import ZeroOrMore
-
 from undebt.pattern import WHITESPACE_CHARS
 from undebt.pattern import WHITESPACE_OR_NL_CHARS
 from undebt.pattern.util import condense
 from undebt.pattern.util import fixto
+from undebt.pyparsing import CharsNotIn
+from undebt.pyparsing import Literal
+from undebt.pyparsing import nestedExpr
+from undebt.pyparsing import Optional
+from undebt.pyparsing import originalTextFor
+from undebt.pyparsing import quotedString
+from undebt.pyparsing import Regex
+from undebt.pyparsing import SkipTo
+from undebt.pyparsing import StringEnd
+from undebt.pyparsing import StringStart
+from undebt.pyparsing import Word
+from undebt.pyparsing import ZeroOrMore
 
 
 ANY_CHAR = Regex(r".", re.DOTALL | re.U)

undebt/pattern/interface.py

@@ -5,11 +5,10 @@
 
 import sys
 
-from pyparsing import _trim_arity
-
 from undebt.cmd.logger import log
 from undebt.pattern.util import attach
 from undebt.pattern.util import tokens_as_list
+from undebt.pyparsing import _trim_arity
 
 
 # required at the beginning of a string to be able to properly parse it

undebt/pattern/lang/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

undebt/pattern/lang/python.py

@@ -3,17 +3,6 @@
 from __future__ import division
 from __future__ import print_function
 
-from pyparsing import Combine
-from pyparsing import Keyword
-from pyparsing import Literal
-from pyparsing import OneOrMore
-from pyparsing import Optional
-from pyparsing import originalTextFor
-from pyparsing import pythonStyleComment
-from pyparsing import SkipTo
-from pyparsing import Word
-from pyparsing import ZeroOrMore
-
 from undebt.pattern.common import BRACES
 from undebt.pattern.common import BRACKETS
 from undebt.pattern.common import COMMA
@@ -29,6 +18,16 @@
 from undebt.pattern.common import STRING
 from undebt.pattern.util import addspace
 from undebt.pattern.util import condense
+from undebt.pyparsing import Combine
+from undebt.pyparsing import Keyword
+from undebt.pyparsing import Literal
+from undebt.pyparsing import OneOrMore
+from undebt.pyparsing import Optional
+from undebt.pyparsing import originalTextFor
+from undebt.pyparsing import pythonStyleComment
+from undebt.pyparsing import SkipTo
+from undebt.pyparsing import Word
+from undebt.pyparsing import ZeroOrMore
 
 
 ASSIGN_OP = Combine((Word("~%^&*-+|/") | ~Literal("==")) + Literal("="))

undebt/pattern/util.py

@@ -6,14 +6,13 @@
 import functools
 import operator
 
-from pyparsing import _trim_arity
-from pyparsing import col
-from pyparsing import Combine
-from pyparsing import line
-from pyparsing import originalTextFor
-from pyparsing import replaceWith
-
 from undebt.pattern import WHITESPACE_OR_NL_CHARS
+from undebt.pyparsing import _trim_arity
+from undebt.pyparsing import col
+from undebt.pyparsing import Combine
+from undebt.pyparsing import line
+from undebt.pyparsing import originalTextFor
+from undebt.pyparsing import replaceWith
 
 
 def attach(item, action):

undebt/pyparsing.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+"""
+Import from undebt.pyparsing instead of pyparsing to automatically
+get the performance benefits of cPyparsing when available and fall
+back to pyparsing when not.
+"""
+
+try:
+    from cPyparsing import *  # NOQA
+    from cPyparsing import _trim_arity  # NOQA
+except ImportError:
+    from pyparsing import *  # NOQA
+    from pyparsing import _trim_arity  # NOQA