8000 ENH: ship six 1.9.0 · Solertis/matplotlib@8fe495a · GitHub
[go: up one dir, main page]
Skip to content

Commit 8fe495a

Browse files
matthew-brettdopplershift
matthew-brett
authored and
dopplershift
committed
ENH: ship six 1.9.0
Six seems to be the external dependency that is most likely to cause problems, and it is a small standalone .py file that is designed for projects to ship in their source tree. Shipping has the following advantages: * Reduces pip dependencies by one; * Makes mpl less vulnerable to upstream changes in six. At present, it is possible for six to change upstream in pypi and break matplotlib installs, requiring a new mpl release; It does mean that we don't get the lastest six, but I believe this is an advantage for the reason above. Now we are so far into the Python 3 era, six should be rather stable.
1 parent 16bea07 commit 8fe495a

File tree

226 files changed

+1149
-329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+1149
-329
lines changed

‎lib/matplotlib/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
from __future__ import (absolute_import, division, print_function,
103103
unicode_literals)
104104

105-
import six
105+
from matplotlib.externals import six
106106
import sys
107107
import distutils.version
108108
from itertools import chain
@@ -124,8 +124,8 @@
124124
validate_backend)
125125

126126
import numpy
127-
from six.moves.urllib.request import urlopen
128-
from six.moves import reload_module as reload
127+
from matplotlib.externals.six.moves.urllib.request import urlopen
128+
from matplotlib.externals.six.moves import reload_module as reload
129129

130130
__version__ = str('1.5.dev1')
131131
__version__numpy__ = str('1.6') # minimum required numpy version

‎lib/matplotlib/_mathtext_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from __future__ import (absolute_import, division, print_function,
77
unicode_literals)
88

9-
import six
9+
from matplotlib.externals import six
1010

1111
"""
1212
from matplotlib.ft2font import FT2Font

‎lib/matplotlib/_pylab_helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from __future__ import (absolute_import, division, print_function,
55
unicode_literals)
66

7-
import six
7+
from matplotlib.externals import six
88
import sys
99
import gc
1010
import atexit

‎lib/matplotlib/afm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
from __future__ import (absolute_import, division, print_function,
3737
unicode_literals)
3838

39-
import six
40-
from six.moves import map
39+
from matplotlib.externals import six
40+
from matplotlib.externals.six.moves import map
4141

4242
import sys
4343
import os

‎lib/matplotlib/animation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
from __future__ import (absolute_import, division, print_function,
2121
unicode_literals)
2222

23-
import six
24-
from six.moves import xrange, zip
23+
from matplotlib.externals import six
24+
from matplotlib.externals.six.moves import xrange, zip
2525

2626
import platform
2727
import sys

‎lib/matplotlib/artist.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
33

4-
import six
4+
from matplotlib.externals import six
55

66
import re
77
import warnings

‎lib/matplotlib/axes/_axes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
33

4-
import six
5-
from six.moves import reduce, xrange, zip, zip_longest
4+
from matplotlib.externals import six
5+
from matplotlib.externals.six.moves import reduce, xrange, zip, zip_longest
66

77
import math
88
import warnings

‎lib/matplotlib/axes/_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
33

4-
import six
5-
from six.moves import xrange
4+
from matplotlib.externals import six
5+
from matplotlib.externals.six.moves import xrange
66

77
import itertools
88
import warnings

‎lib/matplotlib/axes/_subplots.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
33

4-
import six
5-
from six.moves import map
4+
from matplotlib.externals import six
5+
from matplotlib.externals.six.moves import map
66

77
from matplotlib.gridspec import GridSpec, SubplotSpec
88
from matplotlib import docstring

‎lib/matplotlib/axis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from __future__ import (absolute_import, division, print_function,
55
unicode_literals)
66

7-
import six
7+
from matplotlib.externals import six
88

99
from matplotlib import rcParams
1010
import matplotlib.artist as artist

0 commit comments

Comments
 (0)
0