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

Skip to content

Commit 07e2275

Browse files
matthew-brettmatthew-brett
committed
Revert "ENH: ship six 1.9.0"
This reverts commit 8fe495a. Go back to using external six, to fix bug at #6537. Also - update six required version to 1.10 Conflicts: lib/matplotlib/artist.py lib/matplotlib/axes/_base.py lib/matplotlib/backend_tools.py lib/matplotlib/backends/backend_mixed.py lib/matplotlib/backends/backend_pdf.py lib/matplotlib/backends/backend_svg.py lib/matplotlib/colors.py lib/matplotlib/dates.py lib/matplotlib/font_manager.py lib/matplotlib/legend_handler.py lib/matplotlib/tests/test_artist.py lib/matplotlib/tests/test_axes.py lib/matplotlib/tests/test_backend_qt5.py lib/matplotlib/tests/test_dviread.py lib/matplotlib/tests/test_image.py lib/matplotlib/tests/test_lines.py lib/matplotlib/tests/test_spines.py lib/matplotlib/textpath.py lib/mpl_toolkits/axes_grid/colorbar.py lib/mpl_toolkits/axes_grid1/anchored_artists.py lib/mpl_toolkits/axes_grid1/inset_locator.py
1 parent 8356fc2 commit 07e2275

224 files changed

Lines changed: 322 additions & 1142 deletions

File tree

Some content is hidden

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

‎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-
from matplotlib.externals import six
105+
import six
106106
import sys
107107
import distutils.version
108108
from itertools import chain
@@ -126,8 +126,8 @@
126126
cycler)
127127

128128
import numpy
129-
from matplotlib.externals.six.moves.urllib.request import urlopen
130-
from matplotlib.externals.six.moves import reload_module as reload
129+
from six.moves.urllib.request import urlopen
130+
from six.moves import reload_module as reload
131131

132132
# Get the version from the _version.py versioneer file. For a git checkout,
133133
# this is computed based on the number of commits since the last tag.

‎lib/matplotlib/_mathtext_data.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-
from matplotlib.externals import six
7+
import six
88

99
latex_to_bakoma = {
1010
'\\__sqrt__' : ('cmex10', 0x70),

‎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-
from matplotlib.externals import six
7+
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-
from matplotlib.externals import six
40-
from matplotlib.externals.six.moves import map
39+
import six
40+
from 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-
from matplotlib.externals import six
24-
from matplotlib.externals.six.moves import xrange, zip
23+
import six
24+
from six.moves import xrange, zip
2525

2626
import os
2727
import platform

‎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-
from matplotlib.externals import six
4+
import six
55
from collections import OrderedDict
66

77
import re

‎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-
from matplotlib.externals import six
5-
from matplotlib.externals.six.moves import reduce, xrange, zip, zip_longest
4+
import six
5+
from six.moves import reduce, xrange, zip, zip_longest
66

77
import itertools
88
import math

‎lib/matplotlib/axes/_base.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
from collections import OrderedDict
55

6-
from matplotlib.externals import six
7-
from matplotlib.externals.six.moves import xrange
6+
import six
7+
from six.moves import xrange
88

99
import itertools
1010
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-
from matplotlib.externals import six
5-
from matplotlib.externals.six.moves import map
4+
import six
5+
from 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-
from matplotlib.externals import six
7+
import six
88

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

0 commit comments

Comments
 (0)