Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 07e2275

Browse filesBrowse 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
Copy full SHA for 07e2275

File tree

Expand file treeCollapse file tree

224 files changed

+322
-1142
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

224 files changed

+322
-1142
lines changed

‎lib/matplotlib/__init__.py

Copy file name to clipboardExpand all lines: lib/matplotlib/__init__.py
+3-3Lines 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

Copy file name to clipboardExpand all lines: lib/matplotlib/_mathtext_data.py
+1-1Lines 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

Copy file name to clipboardExpand all lines: lib/matplotlib/_pylab_helpers.py
+1-1Lines 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

Copy file name to clipboardExpand all lines: lib/matplotlib/afm.py
+2-2Lines 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

Copy file name to clipboardExpand all lines: lib/matplotlib/animation.py
+2-2Lines 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

Copy file name to clipboardExpand all lines: lib/matplotlib/artist.py
+1-1Lines 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

Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_axes.py
+2-2Lines 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

Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_base.py
+2-2Lines 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

Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_subplots.py
+2-2Lines 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

Copy file name to clipboardExpand all lines: lib/matplotlib/axis.py
+1-1Lines 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

‎lib/matplotlib/backend_bases.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backend_bases.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
unicode_literals)
3737
from contextlib import contextmanager
3838

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

4242
import os
4343
import sys

‎lib/matplotlib/backend_managers.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backend_managers.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from __future__ import (absolute_import, division, print_function,
88
unicode_literals)
9-
from matplotlib.externals import six
9+
import six
1010
import warnings
1111

1212
import matplotlib.cbook as cbook

‎lib/matplotlib/backend_tools.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backend_tools.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import matplotlib.cbook as cbook
1818
from weakref import WeakKeyDictionary
1919
import numpy as np
20-
from matplotlib.externals import six
20+
import six
2121
import warnings
2222

2323

‎lib/matplotlib/backends/__init__.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/__init__.py
+1-1Lines 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

66
import matplotlib
77
import inspect

‎lib/matplotlib/backends/backend_agg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_agg.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from __future__ import (absolute_import, division, print_function,
2323
unicode_literals)
2424

25-
from matplotlib.externals import six
25+
import six
2626

2727
import threading
2828
import numpy as np

‎lib/matplotlib/backends/backend_cairo.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_cairo.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from __future__ import (absolute_import, division, print_function,
2222
unicode_literals)
2323

24-
from matplotlib.externals import six
24+
import six
2525

2626
import os, sys, warnings, gzip
2727

‎lib/matplotlib/backends/backend_cocoaagg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_cocoaagg.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
from __future__ import (absolute_import, division, print_function,
1616
unicode_literals)
1717

18-
from matplotlib.externals import six
19-
from matplotlib.externals.six.moves import xrange
18+
import six
19+
from six.moves import xrange
2020

2121
import os, sys
2222

‎lib/matplotlib/backends/backend_gdk.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gdk.py
+1-1Lines 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

66
import math
77
import os

‎lib/matplotlib/backends/backend_gtk.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gtk.py
+1-1Lines 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

66
import os, sys, warnings
77
def fn_name(): return sys._getframe(1).f_code.co_name

‎lib/matplotlib/backends/backend_gtk3.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gtk3.py
+1-1Lines 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

66
import os, sys
77
def fn_name(): return sys._getframe(1).f_code.co_name

‎lib/matplotlib/backends/backend_gtk3agg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gtk3agg.py
+1-1Lines 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

66
import numpy as np
77
import sys

‎lib/matplotlib/backends/backend_gtk3cairo.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gtk3cairo.py
+1-1Lines 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

66
from . import backend_gtk3
77
from . import backend_cairo

‎lib/matplotlib/backends/backend_gtkagg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gtkagg.py
+1-1Lines 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
import os
1010

‎lib/matplotlib/backends/backend_gtkcairo.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gtkcairo.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from __future__ import (absolute_import, division, print_function,
66
unicode_literals)
77

8-
from matplotlib.externals import six
8+
import six
99

1010
import gtk
1111
if gtk.pygtk_version < (2,7,0):

‎lib/matplotlib/backends/backend_macosx.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_macosx.py
+1-1Lines 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

66
import os
77

‎lib/matplotlib/backends/backend_mixed.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_mixed.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import numpy as np
55

6-
from matplotlib.externals import six
6+
import six
77

88
from matplotlib.backends.backend_agg import RendererAgg
99
from matplotlib.tight_bbox import process_figure_for_rasterizing

‎lib/matplotlib/backends/backend_nbagg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_nbagg.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import json
99
import io
1010
import os
11-
from matplotlib.externals import six
11+
import six
1212
from uuid import uuid4 as uuid
1313

1414
import tornado.ioloop

‎lib/matplotlib/backends/backend_pdf.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_pdf.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from __future__ import (absolute_import, division, print_function,
88
unicode_literals)
99

10-
from matplotlib.externals import six
10+
import six
1111

1212
import codecs
1313
import os
@@ -20,7 +20,7 @@
2020
from io import BytesIO
2121

2222
import numpy as np
23-
from matplotlib.externals.six import unichr
23+
from six import unichr
2424

2525

2626
from datetime import datetime

‎lib/matplotlib/backends/backend_pgf.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_pgf.py
+1-1Lines 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

66
import math
77
import os

‎lib/matplotlib/backends/backend_ps.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_ps.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from __future__ import (absolute_import, division, print_function,
66
unicode_literals)
77

8-
from matplotlib.externals import six
9-
from matplotlib.externals.six.moves import StringIO
8+
import six
9+
from six.moves import StringIO
1010

1111
import glob, math, os, shutil, sys, time
1212
def _fn_name(): return sys._getframe(1).f_code.co_name

‎lib/matplotlib/backends/backend_qt4.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_qt4.py
+2-2Lines 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 import unichr
4+
import six
5+
from six import unichr
66
import os
77
import re
88
import signal

‎lib/matplotlib/backends/backend_qt4agg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_qt4agg.py
+1-1Lines 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
import os # not used
1010
import sys

‎lib/matplotlib/backends/backend_qt5.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_qt5.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
3-
from matplotlib.externals import six
3+
import six
44

55
import os
66
import re
77
import signal
88
import sys
9-
from matplotlib.externals.six import unichr
9+
from six import unichr
1010

1111
import matplotlib
1212

‎lib/matplotlib/backends/backend_qt5agg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_qt5agg.py
+1-1Lines 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
import sys
1010
import ctypes

‎lib/matplotlib/backends/backend_svg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_svg.py
+2-2Lines 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 ix.moves import xrange
88
from matplotlib.externals.six import unichr
99

1010
import os, base64, tempfile, gzip, io, sys, codecs, re

‎lib/matplotlib/backends/backend_template.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_template.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
from __future__ import (absolute_import, division, print_function,
6666
unicode_literals)
6767

68-
from matplotlib.externals import six
68+
import six
6969

7070
import matplotlib
7171
from matplotlib._pylab_helpers import Gcf

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.