Bump minimal pyparsing to 2.0.1.

anntzer · anntzer · commit 93462dec6310 · 2017-06-16T12:36:04.000-07:00
pyparsing is a pure python package so anyone who can install matplotlib
2.1 can realistically also install a recent-ish pyparsing (in fact pip
will just pick it up).  This avoids having to carry around workarounds
for a bunch of old broken versions.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -183,29 +183,9 @@ def compare_versions(a, b):
 except ImportError:
     raise ImportError("matplotlib requires pyparsing")
 else:
-    if not compare_versions(pyparsing.__version__, '1.5.6'):
+    if not compare_versions(pyparsing.__version__, '2.0.1'):
         raise ImportError(
-            "matplotlib requires pyparsing >= 1.5.6")
-
-    # pyparsing 2.0.0 bug, but it may be patched in distributions
-    try:
-        f = pyparsing.Forward()
-        f <<= pyparsing.Literal('a')
-        bad_pyparsing = f is None
-    except TypeError:
-        bad_pyparsing = True
-
-    # pyparsing 1.5.6 does not have <<= on the Forward class, but
-    # pyparsing 2.0.0 and later will spew deprecation warnings if
-    # using << instead.  Additionally, the <<= in pyparsing 1.5.7 is
-    # broken, since it doesn't return self.  In order to support
-    # pyparsing 1.5.6 and above with a common code base, this small
-    # monkey patch is applied.
-    if bad_pyparsing:
-        def _forward_ilshift(self, other):
-            self.__lshift__(other)
-            return self
-        pyparsing.Forward.__ilshift__ = _forward_ilshift
+            "matplotlib requires pyparsing >= 2.0.1")
 
 
 if not hasattr(sys, 'argv'):  # for modpython
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -34,14 +34,7 @@
      ParseResults, Suppress, oneOf, StringEnd, ParseFatalException,
      FollowedBy, Regex, ParserElement, QuotedString, ParseBaseException)
 
-# Enable packrat parsing
-if (six.PY3 and
-    [int(x) for x in pyparsing.__version__.split('.')] < [2, 0, 0]):
-    warn("Due to a bug in pyparsing <= 2.0.0 on Python 3.x, packrat parsing "
-         "has been disabled.  Mathtext rendering will be much slower as a "
-         "result.  Install pyparsing 2.0.0 or later to improve performance.")
-else:
-    ParserElement.enablePackrat()
+ParserElement.enablePackrat()
 
 from matplotlib.afm import AFM
 from matplotlib.cbook import Bunch, get_realpath_and_stat, maxdict
diff --git a/setupext.py b/setupext.py
@@ -1593,17 +1593,6 @@ def check(self):
 
 class Pyparsing(SetupPackage):
     name = "pyparsing"
-    # pyparsing 2.0.4 has broken python 3 support.
-    # pyparsing 2.1.2 is broken in python3.4/3.3.
-    def is_ok(self):
-        # pyparsing 2.0.0 bug, but it may be patched in distributions
-        try:
-            import pyparsing
-            f = pyparsing.Forward()
-            f <<= pyparsing.Literal('a')
-            return f is not None
-        except (ImportError, TypeError):
-            return False
 
     def check(self):
         try:
@@ -1614,26 +1603,10 @@ def check(self):
                 "support. pip/easy_install may attempt to install it "
                 "after matplotlib.")
 
-        required = [1, 5, 6]
-        if [int(x) for x in pyparsing.__version__.split('.')] < required:
-            return (
-                "matplotlib requires pyparsing >= {0}".format(
-                    '.'.join(str(x) for x in required)))
-
-        if not self.is_ok():
-            return (
-                "Your pyparsing contains a bug that will be monkey-patched by "
-                "matplotlib.  For best results, upgrade to pyparsing 2.0.1 or "
-                "later.")
-
         return "using pyparsing version %s" % pyparsing.__version__
 
     def get_install_requires(self):
-        versionstring = 'pyparsing>=1.5.6,!=2.0.4,!=2.1.2,!=2.1.6'
-        if self.is_ok():
-            return [versionstring]
-        else:
-            return [versionstring + ',!=2.0.0']
+        return ['pyparsing>=2.0.1,!=2.0.4,!=2.1.2,!=2.1.6']
 
 
 class BackendAgg(OptionalBackendPackage):
