Exclude use of pyparsing 2.0.0 everywhere

mdboom · mdboom · commit 0f19fec31636 · 2013-08-07T14:14:34.000-04:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -120,6 +120,11 @@
             "matplotlib requires pyparsing >= {0}".format(
                 '.'.join(str(x) for x in _required)))
 
+    if pyparsing.__version__ == '2.0.0':
+        raise ImportError(
+            "pyparsing 2.0.0 has bugs that prevent its use with "
+            "matplotlib")
+
     # 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.  In order to support pyparsing 1.5.6 and above
diff --git a/setupext.py b/setupext.py
@@ -977,19 +977,19 @@ def check(self):
                 "matplotlib requires pyparsing >= {0}".format(
                     '.'.join(str(x) for x in required)))
 
-        if sys.version_info[0] == 2:
-            if pyparsing.__version__ == "2.0.0":
+        if pyparsing.__version__ == "2.0.0":
+            if sys.version_info[0] == 2:
                 return (
                     "pyparsing 2.0.0 is not compatible with Python 2.x")
+            else:
+                return (
+                    "pyparsing 2.0.0 has bugs that prevent its use with "
+                    "matplotlib")
 
         return "using pyparsing version %s" % pyparsing.__version__
 
     def get_install_requires(self):
-        if sys.version_info[0] >= 3:
-            return ['pyparsing>=1.5.6']
-        else:
-            # pyparsing >= 2.0.0 is not compatible with Python 2
-            return ['pyparsing>=1.5.6,!=2.0.0']
+        return ['pyparsing>=1.5.6,!=2.0.0']
 
 
 class BackendAgg(OptionalBackendPackage):
