Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit df12d4e

Browse files
astropy-buildbotastropy-buildbot
committed
Get mathtext working on Python 2.x. Must ship two versions of pyparsing.
1 parent ac0cf85 commit df12d4e

4 files changed

Lines changed: 3810 additions & 9 deletions

File tree

‎lib/matplotlib/fontconfig_pattern.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@
1919
# dependency problems, or an undesired dependency on traits even
2020
# when the traits-based config framework is not used.
2121

22-
import re
23-
from matplotlib.pyparsing import Literal, ZeroOrMore, \
24-
Optional, Regex, StringEnd, ParseException, Suppress
22+
import re, sys
23+
if sys.version_info[0] >= 3:
24+
from matplotlib.pyparsing_py3 import Literal, ZeroOrMore, \
25+
Optional, Regex, StringEnd, ParseException, Suppress
26+
else:
27+
from matplotlib.pyparsing_py2 import Literal, ZeroOrMore, \
28+
Optional, Regex, StringEnd, ParseException, Suppress
2529

2630
family_punc = r'\\\-:,'
2731
family_unescape = re.compile(r'\\([%s])' % family_punc).sub

‎lib/matplotlib/mathtext.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,17 @@
3030

3131
from numpy import inf, isinf
3232
import numpy as np
33-
from matplotlib.pyparsing import Combine, Group, Optional, Forward, \
34-
Literal, OneOrMore, ZeroOrMore, ParseException, Empty, \
35-
ParseResults, Suppress, oneOf, StringEnd, ParseFatalException, \
36-
FollowedBy, Regex, ParserElement
33+
if sys.version_info[0] >= 3:
34+
from matplotlib.pyparsing_py3 import Combine, Group, Optional, Forward, \
35+
Literal, OneOrMore, ZeroOrMore, ParseException, Empty, \
36+
ParseResults, Suppress, oneOf, StringEnd, ParseFatalException, \
37+
FollowedBy, Regex, ParserElement
38+
else:
39+
from matplotlib.pyparsing_py2 import Combine, Group, Optional, Forward, \
40+
Literal, OneOrMore, ZeroOrMore, ParseException, Empty, \
41+
ParseResults, Suppress, oneOf, StringEnd, ParseFatalException, \
42+
FollowedBy, Regex, ParserElement
43+
3744
# Enable packrat parsing
3845
ParserElement.enablePackrat()
3946

0 commit comments

Comments
 (0)