Fix a few bugs in the build.

Author: mdboom

lib/matplotlib/fontconfig_pattern.py

@@ -21,12 +21,8 @@
 
 from __future__ import print_function
 import re, sys
-if sys.version_info[0] >= 3:
-    from matplotlib.pyparsing_py3 import Literal, ZeroOrMore, \
-         Optional, Regex, StringEnd, ParseException, Suppress
-else:
-    from matplotlib.pyparsing_py2 import Literal, ZeroOrMore, \
-         Optional, Regex, StringEnd, ParseException, Suppress
+from pyparsing import Literal, ZeroOrMore, \
+     Optional, Regex, StringEnd, ParseException, Suppress
 
 family_punc = r'\\\-:,'
 family_unescape = re.compile(r'\\([%s])' % family_punc).sub

lib/matplotlib/mathtext.py

@@ -34,16 +34,10 @@
 from numpy import inf, isinf
 import numpy as np
 
-if sys.version_info[0] >= 3:
-    from matplotlib.pyparsing_py3 import Combine, Group, Optional, Forward, \
-         Literal, OneOrMore, ZeroOrMore, ParseException, Empty, \
-         ParseResults, Suppress, oneOf, StringEnd, ParseFatalException, \
-         FollowedBy, Regex, ParserElement, QuotedString, ParseBaseException
-else:
-    from matplotlib.pyparsing_py2 import Combine, Group, Optional, Forward, \
-         Literal, OneOrMore, ZeroOrMore, ParseException, Empty, \
-         ParseResults, Suppress, oneOf, StringEnd, ParseFatalException, \
-         FollowedBy, Regex, ParserElement, QuotedString, ParseBaseException
+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()