8000 ENH: ship six 1.9.0 · matplotlib/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
  • test_colors.py
  • test_compare_images.py
  • test_contour.py
  • test_dates.py
  • test_delaunay.py
  • test_dviread.py
  • test_figure.py
  • test_font_manager.py
  • test_image.py
  • test_legend.py
  • test_lines.py
  • test_mathtext.py
  • test_mlab.py
  • test_patches.py
  • test_path.py
  • test_patheffects.py
  • test_pickle.py
  • test_png.py
  • test_rcparams.py
  • test_sankey.py
  • test_simplification.py
  • test_skew.py
  • test_spines.py
  • test_streamplot.py
  • test_style.py
  • test_subplots.py
  • test_table.py
  • test_text.py
  • test_ticker.py
  • test_tightlayout.py
  • test_transforms.py
  • test_triangulation.py
  • test_ttconv.py
  • texmanager.py
  • text.py
  • textpath.py
  • ticker.py
  • tight_bbox.py
  • transforms.py
  • tri
  • type1font.py
  • units.py
  • widgets.py
  • mpl_toolkits
  • setup.py
  • setupext.py

    • 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

    ‎lib/matplotlib/backend_bases.py

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

    38-
    import six
    39-
    from six.moves import xrange
    38+
    from matplotlib.externals import six
    39+
    from matplotlib.externals.six.moves import xrange
    4040

    4141
    import os
    4242
    import sys

    ‎lib/matplotlib/backend_managers.py

    Lines 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-
    import six
    9+
    from matplotlib.externals import six
    1010
    import warnings
    1111

    1212
    import matplotlib.cbook as cbook

    ‎lib/matplotlib/backend_tools.py

    Lines 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-
    import six
    20+
    from matplotlib.externals import six
    2121

    2222

    2323
    class Cursors(object):

    ‎lib/matplotlib/backends/__init__.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 matplotlib
    77
    import inspect

    ‎lib/matplotlib/backends/backend_agg.py

    Lines 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-
    import six
    25+
    from matplotlib.externals import six
    2626

    2727
    import threading
    2828
    import numpy as np

    ‎lib/matplotlib/backends/backend_cairo.py

    Lines 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-
    import six
    24+
    from matplotlib.externals import six
    2525

    2626
    import os, sys, warnings, gzip
    2727

    ‎lib/matplotlib/backends/backend_cocoaagg.py

    Lines 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-
    import six
    19-
    from six.moves import xrange
    18+
    from matplotlib.externals import six
    19+
    from matplotlib.externals.six.moves import xrange
    2020

    2121
    import os, sys
    2222

    ‎lib/matplotlib/backends/backend_gdk.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 math
    77
    import os

    ‎lib/matplotlib/backends/backend_gtk.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 os, sys, warnings
    77
    def fn_name(): return sys._getframe(1).f_code.co_name

    ‎lib/matplotlib/backends/backend_gtk3.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 os, sys
    77
    def fn_name(): return sys._getframe(1).f_code.co_name

    ‎lib/matplotlib/backends/backend_gtk3agg.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 numpy as np
    77
    import sys

    ‎lib/matplotlib/backends/backend_gtk3cairo.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
    from . import backend_gtk3
    77
    from . import backend_cairo

    ‎lib/matplotlib/backends/backend_gtkagg.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
    import os
    1010

    ‎lib/matplotlib/backends/backend_gtkcairo.py

    Lines 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-
    import six
    8+
    from matplotlib.externals import six
    99

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

    ‎lib/matplotlib/backends/backend_macosx.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 os
    77
    import numpy

    ‎lib/matplotlib/backends/backend_mixed.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
    from matplotlib._image import frombuffer
    77
    from matplotlib.backends.backend_agg import RendererAgg

    ‎lib/matplotlib/backends/backend_nbagg.py

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@
    77
    import json
    88
    import io
    99
    import os
    10-
    import six
    10+
    from matplotlib.externals import six
    1111
    from uuid import uuid4 as uuid
    1212

    1313
    import tornado.ioloop

    ‎lib/matplotlib/backends/backend_pdf.py

    Lines changed: 3 additions & 3 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-
    import six
    10+
    from matplotlib.externals import six
    1111

    1212
    import codecs
    1313
    import os
    @@ -18,8 +18,8 @@
    1818
    import zlib
    1919

    2020
    import numpy as np
    21-
    from six import unichr
    22-
    from io import BytesIO
    21+
    from matplotlib.externals.six import unichr
    22+
    from matplotlib.externals.six import BytesIO
    2323

    2424
    from datetime import datetime
    2525
    from math import ceil, cos, floor, pi, sin

    ‎lib/matplotlib/backends/backend_pgf.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 math
    77
    import os

    ‎lib/matplotlib/backends/backend_ps.py

    Lines 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-
    import six
    9-
    from six.moves import StringIO
    8+
    from matplotlib.externals import six
    9+
    from matplotlib.externals.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

    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 import unichr
    4+
    from matplotlib.externals import six
    5+
    from matplotlib.externals.six import unichr
    66
    import os
    77
    import re
    88
    import signal

    ‎lib/matplotlib/backends/backend_qt4agg.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
    import os # not used
    1010
    import sys

    ‎lib/matplotlib/backends/backend_qt5.py

    Lines 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-
    import six
    3+
    from matplotlib.externals import six
    44

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

    1111
    import matplotlib
    1212

    ‎lib/matplotlib/backends/backend_qt5agg.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
    import sys
    1010
    import ctypes

    ‎lib/matplotlib/backends/backend_svg.py

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

    4-
    import six
    5-
    from six.moves import xrange
    6-
    from six import unichr
    4+
    from matplotlib.externals import six
    5+
    from matplotlib.externals.six.moves import xrange
    6+
    from matplotlib.externals.six import unichr
    77

    88
    import os, base64, tempfile, gzip, io, sys, codecs, re
    99

    ‎lib/matplotlib/backends/backend_template.py

    Lines 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-
    import six
    68+
    from matplotlib.externals import six
    6969

    7070
    import matplotlib
    7171
    from matplotlib._pylab_helpers import Gcf

    0 commit comments

    Comments
     (0)
    0