move pyparsing back into mpl namespace

ddale · ddale · commit e2b07a3df8d2 · 2007-11-09T13:08:48.000Z
svn path=/trunk/matplotlib/; revision=4177
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+2007-11-09 Moved pyparsing back into matplotlib namespace. Don't use 
+           system pyparsing, API is too variable from one release
+           to the next - DSD
+
 2007-11-08 Made pylab use straight numpy instead of oldnumeric
            by default - EF
 
diff --git a/lib/matplotlib/fontconfig_pattern.py b/lib/matplotlib/fontconfig_pattern.py
@@ -18,7 +18,7 @@
 License   : matplotlib license (PSF compatible)
 """
 import re
-from pyparsing import Literal, OneOrMore, ZeroOrMore, Optional, Regex, \
+from matplotlib.pyparsing import Literal, OneOrMore, ZeroOrMore, Optional, Regex, \
     StringEnd, ParseException, Suppress
 
 family_punc = r'\\\-:,'
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -134,7 +134,7 @@
 from numpy import inf, isinf
 
 from matplotlib import verbose
-from pyparsing import Literal, Word, OneOrMore, ZeroOrMore, Combine, Group, \
+from matplotlib.pyparsing import Literal, Word, OneOrMore, ZeroOrMore, Combine, Group, \
      Optional, Forward, NotAny, alphas, nums, alphanums, StringStart, \
      StringEnd, ParseFatalException, FollowedBy, Regex, operatorPrecedence, \
      opAssoc, ParseResults, Or, Suppress, oneOf, ParseException, MatchFirst, \
diff --git a/lib/matplotlib/pyparsing.py b/lib/matplotlib/pyparsing.py
diff --git a/setup.py b/setup.py
@@ -83,7 +83,7 @@
      print_raw, check_for_freetype, check_for_libpng, check_for_gtk, \
      check_for_tk, check_for_wx, check_for_numpy, check_for_qt, check_for_qt4, \
      check_for_cairo, check_for_traits, check_for_pytz, check_for_dateutil, \
-     check_for_pyparsing, check_for_configobj
+     check_for_configobj
 #import distutils.sysconfig
 
 # jdh
@@ -184,8 +184,6 @@
     build_contour(ext_modules, packages)
     build_nxutils(ext_modules, packages)
 
-if not check_for_pyparsing(): py_modules.append('pyparsing')
-
 print_raw("")
 print_raw("OPTIONAL DEPENDENCIES")
     
diff --git a/setupext.py b/setupext.py
@@ -325,16 +325,6 @@ def check_for_cairo():
         print_status("Cairo", cairo.version)
         return True
 
-def check_for_pyparsing():
-    try:
-        import pyparsing
-    except ImportError:
-        print_status("pyparsing", "mpl-provided")
-        return False
-    else:
-        print_status("pyparsing", pyparsing.__version__)
-        return True
-
 def check_for_pytz():
     try:
         import pytz
