Have a workaround if a Python 3 user has pyparsing <= 2.0.0

mdboom · mdboom · commit 7a3f86cbe71a · 2013-04-19T13:44:58.000-04:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -114,15 +114,11 @@
 except ImportError:
     raise ImportError("matplotlib requires pyparsing")
 else:
-    if sys.version_info[0] >= 3:
-        _required = [2, 0, 0]
-    else:
-        _required = [1, 5, 6]
+    _required = [1, 5, 6]
     if [int(x) for x in pyparsing.__version__.split('.')] < _required:
         raise ImportError(
-            "matplotlib requires pyparsing >= {0} on Python {1}".format(
-                '.'.join(str(x) for x in _required),
-                sys.version_info[0]))
+            "matplotlib requires pyparsing >= {0}".format(
+                '.'.join(str(x) for x in _required)))
 
 import os, re, shutil, warnings
 import distutils.sysconfig
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -34,13 +34,20 @@
 from numpy import inf, isinf
 import numpy as np
 
+import pyparsing
 from pyparsing import Combine, Group, Optional, Forward, \
      Literal, OneOrMore, ZeroOrMore, ParseException, Empty, \
      ParseResults, Suppress, oneOf, StringEnd, ParseFatalException, \
      FollowedBy, Regex, ParserElement, QuotedString, ParseBaseException
 
 # Enable packrat parsing
-ParserElement.enablePackrat()
+if (sys.version_info[0] >= 3 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()
 
 from matplotlib.afm import AFM
 from matplotlib.cbook import Bunch, get_realpath_and_stat, \
diff --git a/setupext.py b/setupext.py
@@ -940,7 +940,7 @@ def check(self):
 
     def get_install_requires(self):
         if sys.version_info[0] >= 3:
-            return ['pyparsing>=2.0.0']
+            return ['pyparsing>=1.5.6']
         else:
             # pyparsing >= 2.0.0 is not compatible with Python 2
             return ['pyparsing>=1.5.6,<2.0.0']
