diff --git a/boilerplate.py b/boilerplate.py index e2545d9e89a0..601cf1bb3eca 100644 --- a/boilerplate.py +++ b/boilerplate.py @@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os import inspect diff --git a/doc/users/plotting/examples/pgf_preamble.py b/doc/users/plotting/examples/pgf_preamble.py index d0efc620561a..f233afbd1db7 100644 --- a/doc/users/plotting/examples/pgf_preamble.py +++ b/doc/users/plotting/examples/pgf_preamble.py @@ -2,7 +2,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib as mpl mpl.use("pgf") diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index fed7dd4cdbea..6b6763266a76 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -102,7 +102,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import sys import distutils.version from itertools import chain @@ -126,8 +126,8 @@ cycler) import numpy -from matplotlib.externals.six.moves.urllib.request import urlopen -from matplotlib.externals.six.moves import reload_module as reload +from six.moves.urllib.request import urlopen +from six.moves import reload_module as reload # Get the version from the _version.py versioneer file. For a git checkout, # this is computed based on the number of commits since the last tag. diff --git a/lib/matplotlib/_color_data.py b/lib/matplotlib/_color_data.py index 5d6aae709971..11a538f34722 100644 --- a/lib/matplotlib/_color_data.py +++ b/lib/matplotlib/_color_data.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six BASE_COLORS = { diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py index 81e1f579f3aa..1587344282dc 100644 --- a/lib/matplotlib/_mathtext_data.py +++ b/lib/matplotlib/_mathtext_data.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six latex_to_bakoma = { '\\__sqrt__' : ('cmex10', 0x70), diff --git a/lib/matplotlib/_pylab_helpers.py b/lib/matplotlib/_pylab_helpers.py index 48d04ff2d091..c5ea8cc6bb60 100644 --- a/lib/matplotlib/_pylab_helpers.py +++ b/lib/matplotlib/_pylab_helpers.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import sys import gc import atexit diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py index 71df90ab73ee..0dbab08e55dd 100644 --- a/lib/matplotlib/afm.py +++ b/lib/matplotlib/afm.py @@ -36,8 +36,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import map +import six +from six.moves import map import sys import os diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py index 7997e856d48e..d7d503a5d143 100644 --- a/lib/matplotlib/animation.py +++ b/lib/matplotlib/animation.py @@ -20,8 +20,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange, zip +import six +from six.moves import xrange, zip import os import platform @@ -569,7 +569,7 @@ def output_args(self): def _init_from_registry(cls): if sys.platform != 'win32' or rcParams[cls.exec_key] != 'convert': return - from matplotlib.externals.six.moves import winreg + from six.moves import winreg for flag in (0, winreg.KEY_WOW64_32KEY, winreg.KEY_WOW64_64KEY): try: hkey = winreg.OpenKeyEx(winreg.HKEY_LOCAL_MACHINE, diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py index e8ec00cd51ff..1e03c1f9a451 100644 --- a/lib/matplotlib/artist.py +++ b/lib/matplotlib/artist.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from collections import OrderedDict import re diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index 43aaf1140560..37ba57df9902 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import reduce, xrange, zip, zip_longest +import six +from six.moves import reduce, xrange, zip, zip_longest import itertools import math diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py index a1419d1255e7..1e50188d14f0 100644 --- a/lib/matplotlib/axes/_base.py +++ b/lib/matplotlib/axes/_base.py @@ -3,8 +3,8 @@ from collections import OrderedDict -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import itertools import warnings diff --git a/lib/matplotlib/axes/_subplots.py b/lib/matplotlib/axes/_subplots.py index 118a557b5bf6..6e67666a74ec 100644 --- a/lib/matplotlib/axes/_subplots.py +++ b/lib/matplotlib/axes/_subplots.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import map +import six +from six.moves import map from matplotlib.gridspec import GridSpec, SubplotSpec from matplotlib import docstring diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py index 1188aa62803a..b8461d607486 100644 --- a/lib/matplotlib/axis.py +++ b/lib/matplotlib/axis.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib import rcParams import matplotlib.artist as artist diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index 23dd58e1cbc7..6059d0ba3c53 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -36,8 +36,8 @@ unicode_literals) from contextlib import contextmanager -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import os import sys diff --git a/lib/matplotlib/backend_managers.py b/lib/matplotlib/backend_managers.py index e21e12f982e3..efd289ff7572 100644 --- a/lib/matplotlib/backend_managers.py +++ b/lib/matplotlib/backend_managers.py @@ -6,7 +6,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import warnings import matplotlib.cbook as cbook diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py index f9db6f5e529e..6e537a5b864b 100644 --- a/lib/matplotlib/backend_tools.py +++ b/lib/matplotlib/backend_tools.py @@ -17,7 +17,7 @@ import matplotlib.cbook as cbook from weakref import WeakKeyDictionary import numpy as np -from matplotlib.externals import six +import six import warnings diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py index 86999e9ebe34..cf80dc0f9ff5 100644 --- a/lib/matplotlib/backends/__init__.py +++ b/lib/matplotlib/backends/__init__.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib import inspect diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py index cbc339060a0a..dbe6d8ac0861 100644 --- a/lib/matplotlib/backends/backend_agg.py +++ b/lib/matplotlib/backends/backend_agg.py @@ -22,7 +22,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import threading import numpy as np diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py index e356561de126..f903b3b549c6 100644 --- a/lib/matplotlib/backends/backend_cairo.py +++ b/lib/matplotlib/backends/backend_cairo.py @@ -21,7 +21,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os, sys, warnings, gzip diff --git a/lib/matplotlib/backends/backend_cocoaagg.py b/lib/matplotlib/backends/backend_cocoaagg.py index ba04850277ff..3b924fef060b 100644 --- a/lib/matplotlib/backends/backend_cocoaagg.py +++ b/lib/matplotlib/backends/backend_cocoaagg.py @@ -15,8 +15,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import os, sys diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py index 3a22f6b331c5..e4ace8707869 100644 --- a/lib/matplotlib/backends/backend_gdk.py +++ b/lib/matplotlib/backends/backend_gdk.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import math import os diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py index de5fcce665bf..64fb27d26c6e 100644 --- a/lib/matplotlib/backends/backend_gtk.py +++ b/lib/matplotlib/backends/backend_gtk.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os, sys, warnings def fn_name(): return sys._getframe(1).f_code.co_name diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py index 4f2ef04c5873..06f28569e9b9 100644 --- a/lib/matplotlib/backends/backend_gtk3.py +++ b/lib/matplotlib/backends/backend_gtk3.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os, sys def fn_name(): return sys._getframe(1).f_code.co_name diff --git a/lib/matplotlib/backends/backend_gtk3agg.py b/lib/matplotlib/backends/backend_gtk3agg.py index 82f70e51df4a..c3eb1da68be3 100644 --- a/lib/matplotlib/backends/backend_gtk3agg.py +++ b/lib/matplotlib/backends/backend_gtk3agg.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np import sys diff --git a/lib/matplotlib/backends/backend_gtk3cairo.py b/lib/matplotlib/backends/backend_gtk3cairo.py index 98b0704cc2a9..da8f099be7f6 100644 --- a/lib/matplotlib/backends/backend_gtk3cairo.py +++ b/lib/matplotlib/backends/backend_gtk3cairo.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from . import backend_gtk3 from . import backend_cairo diff --git a/lib/matplotlib/backends/backend_gtkagg.py b/lib/matplotlib/backends/backend_gtkagg.py index 5cade025d41e..31eb10c7c626 100644 --- a/lib/matplotlib/backends/backend_gtkagg.py +++ b/lib/matplotlib/backends/backend_gtkagg.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os diff --git a/lib/matplotlib/backends/backend_gtkcairo.py b/lib/matplotlib/backends/backend_gtkcairo.py index b0d733589ef4..93bb69857a1f 100644 --- a/lib/matplotlib/backends/backend_gtkcairo.py +++ b/lib/matplotlib/backends/backend_gtkcairo.py @@ -5,7 +5,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import gtk if gtk.pygtk_version < (2,7,0): diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py index 43566c309ae1..edc126efbd98 100755 --- a/lib/matplotlib/backends/backend_macosx.py +++ b/lib/matplotlib/backends/backend_macosx.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os diff --git a/lib/matplotlib/backends/backend_mixed.py b/lib/matplotlib/backends/backend_mixed.py index 0dd210c2be7c..e0102223f0ec 100644 --- a/lib/matplotlib/backends/backend_mixed.py +++ b/lib/matplotlib/backends/backend_mixed.py @@ -3,7 +3,7 @@ import numpy as np -from matplotlib.externals import six +import six from matplotlib.backends.backend_agg import RendererAgg from matplotlib.tight_bbox import process_figure_for_rasterizing diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py index 3fcca314124d..68121c521d7d 100644 --- a/lib/matplotlib/backends/backend_nbagg.py +++ b/lib/matplotlib/backends/backend_nbagg.py @@ -8,7 +8,7 @@ import json import io import os -from matplotlib.externals import six +import six from uuid import uuid4 as uuid import tornado.ioloop diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index 6e4144075c4d..0588c5d70273 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -7,7 +7,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import codecs import os @@ -20,7 +20,7 @@ from io import BytesIO import numpy as np -from matplotlib.externals.six import unichr +from six import unichr from datetime import datetime diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py index a6d9e8734582..76d8be186a24 100644 --- a/lib/matplotlib/backends/backend_pgf.py +++ b/lib/matplotlib/backends/backend_pgf.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import math import os diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py index a3237f1ff08e..7a0b983acaa6 100644 --- a/lib/matplotlib/backends/backend_ps.py +++ b/lib/matplotlib/backends/backend_ps.py @@ -5,8 +5,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import StringIO +import six +from six.moves import StringIO import glob, math, os, shutil, sys, time def _fn_name(): return sys._getframe(1).f_code.co_name diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py index 538c26a49475..d0facc419b56 100644 --- a/lib/matplotlib/backends/backend_qt4.py +++ b/lib/matplotlib/backends/backend_qt4.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six import unichr +import six +from six import unichr import os import re import signal diff --git a/lib/matplotlib/backends/backend_qt4agg.py b/lib/matplotlib/backends/backend_qt4agg.py index e9953e299a6b..7a72d4a19e22 100644 --- a/lib/matplotlib/backends/backend_qt4agg.py +++ b/lib/matplotlib/backends/backend_qt4agg.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os # not used import sys diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py index fcf898956005..89e39a1dbd3e 100644 --- a/lib/matplotlib/backends/backend_qt5.py +++ b/lib/matplotlib/backends/backend_qt5.py @@ -1,12 +1,12 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os import re import signal import sys -from matplotlib.externals.six import unichr +from six import unichr import matplotlib diff --git a/lib/matplotlib/backends/backend_qt5agg.py b/lib/matplotlib/backends/backend_qt5agg.py index 81addae00d27..ccf024514dd3 100644 --- a/lib/matplotlib/backends/backend_qt5agg.py +++ b/lib/matplotlib/backends/backend_qt5agg.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import sys import ctypes diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py index f8af96043211..5bcec443efc8 100644 --- a/lib/matplotlib/backends/backend_svg.py +++ b/lib/matplotlib/backends/backend_svg.py @@ -3,9 +3,9 @@ from collections import OrderedDict -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange -from matplotlib.externals.six import unichr +import six +from six import unichr +from six.moves import xrange import os, base64, tempfile, gzip, io, sys, codecs, re diff --git a/lib/matplotlib/backends/backend_template.py b/lib/matplotlib/backends/backend_template.py index 064bada10e79..f3e483d2f73b 100644 --- a/lib/matplotlib/backends/backend_template.py +++ b/lib/matplotlib/backends/backend_template.py @@ -65,7 +65,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib from matplotlib._pylab_helpers import Gcf diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py index 10d29c9fad68..2e14c20a99a2 100644 --- a/lib/matplotlib/backends/backend_tkagg.py +++ b/lib/matplotlib/backends/backend_tkagg.py @@ -2,9 +2,9 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import tkinter as Tk -from matplotlib.externals.six.moves import tkinter_filedialog as FileDialog +import six +from six.moves import tkinter as Tk +from six.moves import tkinter_filedialog as FileDialog import os, sys, math import os.path @@ -60,7 +60,7 @@ def raise_msg_to_str(msg): return msg def error_msg_tkpaint(msg, parent=None): - from matplotlib.externals.six.moves import tkinter_messagebox as tkMessageBox + from six.moves import tkinter_messagebox as tkMessageBox tkMessageBox.showerror("matplotlib", msg) def draw_if_interactive(): @@ -782,7 +782,7 @@ def configure_subplots(self): canvas.get_tk_widget().pack(side=Tk.TOP, fill=Tk.BOTH, expand=1) def save_figure(self, *args): - from matplotlib.externals.six.moves import tkinter_tkfiledialog, tkinter_messagebox + from six.moves import tkinter_tkfiledialog, tkinter_messagebox filetypes = self.canvas.get_supported_filetypes().copy() default_filetype = self.canvas.get_default_filetype() @@ -1022,7 +1022,7 @@ def set_message(self, s): class SaveFigureTk(backend_tools.SaveFigureBase): def trigger(self, *args): - from matplotlib.externals.six.moves import tkinter_tkfiledialog, tkinter_messagebox + from six.moves import tkinter_tkfiledialog, tkinter_messagebox filetypes = self.figure.canvas.get_supported_filetypes().copy() default_filetype = self.figure.canvas.get_default_filetype() diff --git a/lib/matplotlib/backends/backend_webagg.py b/lib/matplotlib/backends/backend_webagg.py index c55767778439..7729e73fe068 100644 --- a/lib/matplotlib/backends/backend_webagg.py +++ b/lib/matplotlib/backends/backend_webagg.py @@ -13,7 +13,7 @@ # - `backend_webagg.py` contains a concrete implementation of a basic # application, implemented with tornado. -from matplotlib.externals import six +import six import datetime import errno diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py index 315490aa16f4..25464d167e9a 100644 --- a/lib/matplotlib/backends/backend_webagg_core.py +++ b/lib/matplotlib/backends/backend_webagg_core.py @@ -13,7 +13,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import io import json diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py index 74721528ac09..d710224cce48 100644 --- a/lib/matplotlib/backends/backend_wx.py +++ b/lib/matplotlib/backends/backend_wx.py @@ -16,7 +16,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals.six.moves import xrange +from six.moves import xrange import sys import os diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py index bc355a7b2f8b..36d10a8a41e6 100644 --- a/lib/matplotlib/backends/backend_wxagg.py +++ b/lib/matplotlib/backends/backend_wxagg.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib from matplotlib.figure import Figure diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py index e3cfff7c9ea4..1a4db713738b 100644 --- a/lib/matplotlib/backends/qt_compat.py +++ b/lib/matplotlib/backends/qt_compat.py @@ -3,7 +3,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os import sys diff --git a/lib/matplotlib/backends/qt_editor/figureoptions.py b/lib/matplotlib/backends/qt_editor/figureoptions.py index 218577993774..1b220173c5f6 100644 --- a/lib/matplotlib/backends/qt_editor/figureoptions.py +++ b/lib/matplotlib/backends/qt_editor/figureoptions.py @@ -10,7 +10,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os.path as osp diff --git a/lib/matplotlib/backends/qt_editor/formlayout.py b/lib/matplotlib/backends/qt_editor/formlayout.py index 4e9a2737f6e6..a786a6105342 100644 --- a/lib/matplotlib/backends/qt_editor/formlayout.py +++ b/lib/matplotlib/backends/qt_editor/formlayout.py @@ -35,8 +35,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange # History: # 1.0.10: added float validator (disable "Ok" and "Apply" button when not valid) diff --git a/lib/matplotlib/backends/tkagg.py b/lib/matplotlib/backends/tkagg.py index 816dd1e8b55d..81fe9265a351 100644 --- a/lib/matplotlib/backends/tkagg.py +++ b/lib/matplotlib/backends/tkagg.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import tkinter as Tk +import six +from six.moves import tkinter as Tk import numpy as np diff --git a/lib/matplotlib/backends/windowing.py b/lib/matplotlib/backends/windowing.py index f0074d8d036e..6c2e495906cb 100644 --- a/lib/matplotlib/backends/windowing.py +++ b/lib/matplotlib/backends/windowing.py @@ -9,7 +9,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib import rcParams diff --git a/lib/matplotlib/backends/wx_compat.py b/lib/matplotlib/backends/wx_compat.py index 8381de6f8b58..0d2bd409ed86 100644 --- a/lib/matplotlib/backends/wx_compat.py +++ b/lib/matplotlib/backends/wx_compat.py @@ -10,7 +10,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from distutils.version import LooseVersion missingwx = "Matplotlib backend_wx and backend_wxagg require wxPython >=2.8.12" diff --git a/lib/matplotlib/bezier.py b/lib/matplotlib/bezier.py index 6271ee909341..baace75fa6c1 100644 --- a/lib/matplotlib/bezier.py +++ b/lib/matplotlib/bezier.py @@ -5,7 +5,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np from matplotlib.path import Path diff --git a/lib/matplotlib/blocking_input.py b/lib/matplotlib/blocking_input.py index 90123b5d2696..d7035221e8eb 100644 --- a/lib/matplotlib/blocking_input.py +++ b/lib/matplotlib/blocking_input.py @@ -25,7 +25,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib import verbose from matplotlib.cbook import is_sequence_of_strings import matplotlib.lines as mlines diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py index 7763424135f7..49b0de403b6f 100644 --- a/lib/matplotlib/cbook.py +++ b/lib/matplotlib/cbook.py @@ -9,8 +9,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange, zip +import six +from six.moves import xrange, zip from itertools import repeat import collections diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py index dcc0a1db6bd6..f9ca3ec6388c 100644 --- a/lib/matplotlib/cm.py +++ b/lib/matplotlib/cm.py @@ -7,7 +7,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py index 60fed3e41403..43293c2b0c40 100644 --- a/lib/matplotlib/collections.py +++ b/lib/matplotlib/collections.py @@ -11,8 +11,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip import warnings import numpy as np import numpy.ma as ma diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py index cc46385569d2..4f11171c0c48 100644 --- a/lib/matplotlib/colorbar.py +++ b/lib/matplotlib/colorbar.py @@ -21,8 +21,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange, zip +import six +from six.moves import xrange, zip import warnings diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py index 0b5a7c789936..98bf3ca4f4b3 100644 --- a/lib/matplotlib/colors.py +++ b/lib/matplotlib/colors.py @@ -59,8 +59,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) import re -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip import warnings import numpy as np diff --git a/lib/matplotlib/container.py b/lib/matplotlib/container.py index 348fb1650c6c..0fd50991439b 100644 --- a/lib/matplotlib/container.py +++ b/lib/matplotlib/container.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib.cbook as cbook import matplotlib.artist as martist diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py index 2c25ba27a5a9..16758a49ccaa 100644 --- a/lib/matplotlib/contour.py +++ b/lib/matplotlib/contour.py @@ -5,8 +5,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import warnings import matplotlib as mpl diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py index 715f75fd9f97..4952e9ae0181 100755 --- a/lib/matplotlib/dates.py +++ b/lib/matplotlib/dates.py @@ -112,8 +112,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip from matplotlib import rcParams import re import time diff --git a/lib/matplotlib/delaunay/__init__.py b/lib/matplotlib/delaunay/__init__.py index 02e43d91a8ac..450fca84e32f 100644 --- a/lib/matplotlib/delaunay/__init__.py +++ b/lib/matplotlib/delaunay/__init__.py @@ -8,7 +8,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib._delaunay import delaunay from .triangulate import * diff --git a/lib/matplotlib/delaunay/interpolate.py b/lib/matplotlib/delaunay/interpolate.py index b5ca2d3e5cea..51f00da487f2 100644 --- a/lib/matplotlib/delaunay/interpolate.py +++ b/lib/matplotlib/delaunay/interpolate.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np diff --git a/lib/matplotlib/delaunay/testfuncs.py b/lib/matplotlib/delaunay/testfuncs.py index c9943d69f7f6..40d203ddb582 100644 --- a/lib/matplotlib/delaunay/testfuncs.py +++ b/lib/matplotlib/delaunay/testfuncs.py @@ -7,8 +7,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import numpy as np diff --git a/lib/matplotlib/delaunay/triangulate.py b/lib/matplotlib/delaunay/triangulate.py index 40ed2bdbbb7c..7de24ad78215 100644 --- a/lib/matplotlib/delaunay/triangulate.py +++ b/lib/matplotlib/delaunay/triangulate.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip import warnings diff --git a/lib/matplotlib/docstring.py b/lib/matplotlib/docstring.py index 2a3d49dc435c..cf9537f0c6fe 100644 --- a/lib/matplotlib/docstring.py +++ b/lib/matplotlib/docstring.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib import cbook import sys diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py index 1141f6aa08e1..6a50409f2d15 100644 --- a/lib/matplotlib/dviread.py +++ b/lib/matplotlib/dviread.py @@ -21,8 +21,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import errno import matplotlib diff --git a/lib/matplotlib/externals/__init__.py b/lib/matplotlib/externals/__init__.py deleted file mode 100644 index 88993704c46e..000000000000 --- a/lib/matplotlib/externals/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# Init for externals package diff --git a/lib/matplotlib/externals/six.py b/lib/matplotlib/externals/six.py deleted file mode 100644 index db5b92baa953..000000000000 --- a/lib/matplotlib/externals/six.py +++ /dev/null @@ -1,838 +0,0 @@ -"""Utilities for writing code that runs on Python 2 and 3""" - -# Copyright (c) 2010-2015 Benjamin Peterson -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -from __future__ import absolute_import - -import functools -import itertools -import operator -import sys -import types - -__author__ = "Benjamin Peterson " -__version__ = "1.9.0" - - -# Useful for very coarse version differentiation. -PY2 = sys.version_info[0] == 2 -PY3 = sys.version_info[0] == 3 - -if PY3: - string_types = str, - integer_types = int, - class_types = type, - text_type = str - binary_type = bytes - - MAXSIZE = sys.maxsize -else: - string_types = basestring, - integer_types = (int, long) - class_types = (type, types.ClassType) - text_type = unicode - binary_type = str - - if sys.platform.startswith("java"): - # Jython always uses 32 bits. - MAXSIZE = int((1 << 31) - 1) - else: - # It's possible to have sizeof(long) != sizeof(Py_ssize_t). - class X(object): - def __len__(self): - return 1 << 31 - try: - len(X()) - except OverflowError: - # 32-bit - MAXSIZE = int((1 << 31) - 1) - else: - # 64-bit - MAXSIZE = int((1 << 63) - 1) - del X - - -def _add_doc(func, doc): - """Add documentation to a function.""" - func.__doc__ = doc - - -def _import_module(name): - """Import module, returning the module after the last dot.""" - __import__(name) - return sys.modules[name] - - -class _LazyDescr(object): - - def __init__(self, name): - self.name = name - - def __get__(self, obj, tp): - result = self._resolve() - setattr(obj, self.name, result) # Invokes __set__. - try: - # This is a bit ugly, but it avoids running this again by - # removing this descriptor. - delattr(obj.__class__, self.name) - except AttributeError: - pass - return result - - -class MovedModule(_LazyDescr): - - def __init__(self, name, old, new=None): - super(MovedModule, self).__init__(name) - if PY3: - if new is None: - new = name - self.mod = new - else: - self.mod = old - - def _resolve(self): - return _import_module(self.mod) - - def __getattr__(self, attr): - _module = self._resolve() - value = getattr(_module, attr) - setattr(self, attr, value) - return value - - -class _LazyModule(types.ModuleType): - - def __init__(self, name): - super(_LazyModule, self).__init__(name) - self.__doc__ = self.__class__.__doc__ - - def __dir__(self): - attrs = ["__doc__", "__name__"] - attrs += [attr.name for attr in self._moved_attributes] - return attrs - - # Subclasses should override this - _moved_attributes = [] - - -class MovedAttribute(_LazyDescr): - - def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None): - super(MovedAttribute, self).__init__(name) - if PY3: - if new_mod is None: - new_mod = name - self.mod = new_mod - if new_attr is None: - if old_attr is None: - new_attr = name - else: - new_attr = old_attr - self.attr = new_attr - else: - self.mod = old_mod - if old_attr is None: - old_attr = name - self.attr = old_attr - - def _resolve(self): - module = _import_module(self.mod) - return getattr(module, self.attr) - - -class _SixMetaPathImporter(object): - """ - A meta path importer to from matplotlib.externals import six.moves and its submodules. - - This class implements a PEP302 finder and loader. It should be compatible - with Python 2.5 and all existing versions of Python3 - """ - def __init__(self, six_module_name): - self.name = six_module_name - self.known_modules = {} - - def _add_module(self, mod, *fullnames): - for fullname in fullnames: - self.known_modules[self.name + "." + fullname] = mod - - def _get_module(self, fullname): - return self.known_modules[self.name + "." + fullname] - - def find_module(self, fullname, path=None): - if fullname in self.known_modules: - return self - return None - - def __get_module(self, fullname): - try: - return self.known_modules[fullname] - except KeyError: - raise ImportError("This loader does not know module " + fullname) - - def load_module(self, fullname): - try: - # in case of a reload - return sys.modules[fullname] - except KeyError: - pass - mod = self.__get_module(fullname) - if isinstance(mod, MovedModule): - mod = mod._resolve() - else: - mod.__loader__ = self - sys.modules[fullname] = mod - return mod - - def is_package(self, fullname): - """ - Return true, if the named module is a package. - - We need this method to get correct spec objects with - Python 3.4 (see PEP451) - """ - return hasattr(self.__get_module(fullname), "__path__") - - def get_code(self, fullname): - """Return None - - Required, if is_package is implemented""" - self.__get_module(fullname) # eventually raises ImportError - return None - get_source = get_code # same as get_code - -_importer = _SixMetaPathImporter(__name__) - - -class _MovedItems(_LazyModule): - """Lazy loading of moved objects""" - __path__ = [] # mark as package - - -_moved_attributes = [ - MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"), - MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"), - MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"), - MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"), - MovedAttribute("intern", "__builtin__", "sys"), - MovedAttribute("map", "itertools", "builtins", "imap", "map"), - MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"), - MovedAttribute("reload_module", "__builtin__", "imp", "reload"), - MovedAttribute("reduce", "__builtin__", "functools"), - MovedAttribute("shlex_quote", "pipes", "shlex", "quote"), - MovedAttribute("StringIO", "StringIO", "io"), - MovedAttribute("UserDict", "UserDict", "collections"), - MovedAttribute("UserList", "UserList", "collections"), - MovedAttribute("UserString", "UserString", "collections"), - MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"), - MovedAttribute("zip", "itertools", "builtins", "izip", "zip"), - MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"), - - MovedModule("builtins", "__builtin__"), - MovedModule("configparser", "ConfigParser"), - MovedModule("copyreg", "copy_reg"), - MovedModule("dbm_gnu", "gdbm", "dbm.gnu"), - MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"), - MovedModule("http_cookiejar", "cookielib", "http.cookiejar"), - MovedModule("http_cookies", "Cookie", "http.cookies"), - MovedModule("html_entities", "htmlentitydefs", "html.entities"), - MovedModule("html_parser", "HTMLParser", "html.parser"), - MovedModule("http_client", "httplib", "http.client"), - MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"), - MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"), - MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"), - MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"), - MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"), - MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"), - MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"), - MovedModule("cPickle", "cPickle", "pickle"), - MovedModule("queue", "Queue"), - MovedModule("reprlib", "repr"), - MovedModule("socketserver", "SocketServer"), - MovedModule("_thread", "thread", "_thread"), - MovedModule("tkinter", "Tkinter"), - MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"), - MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"), - MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"), - MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"), - MovedModule("tkinter_tix", "Tix", "tkinter.tix"), - MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"), - MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"), - MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"), - MovedModule("tkinter_colorchooser", "tkColorChooser", - "tkinter.colorchooser"), - MovedModule("tkinter_commondialog", "tkCommonDialog", - "tkinter.commondialog"), - MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"), - MovedModule("tkinter_font", "tkFont", "tkinter.font"), - MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"), - MovedModule("tkinter_tksimpledialog", "tkSimpleDialog", - "tkinter.simpledialog"), - MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"), - MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"), - MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"), - MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"), - MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"), - MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"), - MovedModule("winreg", "_winreg"), -] -for attr in _moved_attributes: - setattr(_MovedItems, attr.name, attr) - if isinstance(attr, MovedModule): - _importer._add_module(attr, "moves." + attr.name) -del attr - -_MovedItems._moved_attributes = _moved_attributes - -moves = _MovedItems(__name__ + ".moves") -_importer._add_module(moves, "moves") - - -class Module_six_moves_urllib_parse(_LazyModule): - """Lazy loading of moved objects in six.moves.urllib_parse""" - - -_urllib_parse_moved_attributes = [ - MovedAttribute("ParseResult", "urlparse", "urllib.parse"), - MovedAttribute("SplitResult", "urlparse", "urllib.parse"), - MovedAttribute("parse_qs", "urlparse", "urllib.parse"), - MovedAttribute("parse_qsl", "urlparse", "urllib.parse"), - MovedAttribute("urldefrag", "urlparse", "urllib.parse"), - MovedAttribute("urljoin", "urlparse", "urllib.parse"), - MovedAttribute("urlparse", "urlparse", "urllib.parse"), - MovedAttribute("urlsplit", "urlparse", "urllib.parse"), - MovedAttribute("urlunparse", "urlparse", "urllib.parse"), - MovedAttribute("urlunsplit", "urlparse", "urllib.parse"), - MovedAttribute("quote", "urllib", "urllib.parse"), - MovedAttribute("quote_plus", "urllib", "urllib.parse"), - MovedAttribute("unquote", "urllib", "urllib.parse"), - MovedAttribute("unquote_plus", "urllib", "urllib.parse"), - MovedAttribute("urlencode", "urllib", "urllib.parse"), - MovedAttribute("splitquery", "urllib", "urllib.parse"), - MovedAttribute("splittag", "urllib", "urllib.parse"), - MovedAttribute("splituser", "urllib", "urllib.parse"), - MovedAttribute("uses_fragment", "urlparse", "urllib.parse"), - MovedAttribute("uses_netloc", "urlparse", "urllib.parse"), - MovedAttribute("uses_params", "urlparse", "urllib.parse"), - MovedAttribute("uses_query", "urlparse", "urllib.parse"), - MovedAttribute("uses_relative", "urlparse", "urllib.parse"), -] -for attr in _urllib_parse_moved_attributes: - setattr(Module_six_moves_urllib_parse, attr.name, attr) -del attr - -Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes - -_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"), - "moves.urllib_parse", "moves.urllib.parse") - - -class Module_six_moves_urllib_error(_LazyModule): - """Lazy loading of moved objects in six.moves.urllib_error""" - - -_urllib_error_moved_attributes = [ - MovedAttribute("URLError", "urllib2", "urllib.error"), - MovedAttribute("HTTPError", "urllib2", "urllib.error"), - MovedAttribute("ContentTooShortError", "urllib", "urllib.error"), -] -for attr in _urllib_error_moved_attributes: - setattr(Module_six_moves_urllib_error, attr.name, attr) -del attr - -Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes - -_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"), - "moves.urllib_error", "moves.urllib.error") - - -class Module_six_moves_urllib_request(_LazyModule): - """Lazy loading of moved objects in six.moves.urllib_request""" - - -_urllib_request_moved_attributes = [ - MovedAttribute("urlopen", "urllib2", "urllib.request"), - MovedAttribute("install_opener", "urllib2", "urllib.request"), - MovedAttribute("build_opener", "urllib2", "urllib.request"), - MovedAttribute("pathname2url", "urllib", "urllib.request"), - MovedAttribute("url2pathname", "urllib", "urllib.request"), - MovedAttribute("getproxies", "urllib", "urllib.request"), - MovedAttribute("Request", "urllib2", "urllib.request"), - MovedAttribute("OpenerDirector", "urllib2", "urllib.request"), - MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"), - MovedAttribute("ProxyHandler", "urllib2", "urllib.request"), - MovedAttribute("BaseHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"), - MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"), - MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"), - MovedAttribute("FileHandler", "urllib2", "urllib.request"), - MovedAttribute("FTPHandler", "urllib2", "urllib.request"), - MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"), - MovedAttribute("UnknownHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"), - MovedAttribute("urlretrieve", "urllib", "urllib.request"), - MovedAttribute("urlcleanup", "urllib", "urllib.request"), - MovedAttribute("URLopener", "urllib", "urllib.request"), - MovedAttribute("FancyURLopener", "urllib", "urllib.request"), - MovedAttribute("proxy_bypass", "urllib", "urllib.request"), -] -for attr in _urllib_request_moved_attributes: - setattr(Module_six_moves_urllib_request, attr.name, attr) -del attr - -Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes - -_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"), - "moves.urllib_request", "moves.urllib.request") - - -class Module_six_moves_urllib_response(_LazyModule): - """Lazy loading of moved objects in six.moves.urllib_response""" - - -_urllib_response_moved_attributes = [ - MovedAttribute("addbase", "urllib", "urllib.response"), - MovedAttribute("addclosehook", "urllib", "urllib.response"), - MovedAttribute("addinfo", "urllib", "urllib.response"), - MovedAttribute("addinfourl", "urllib", "urllib.response"), -] -for attr in _urllib_response_moved_attributes: - setattr(Module_six_moves_urllib_response, attr.name, attr) -del attr - -Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes - -_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"), - "moves.urllib_response", "moves.urllib.response") - - -class Module_six_moves_urllib_robotparser(_LazyModule): - """Lazy loading of moved objects in six.moves.urllib_robotparser""" - - -_urllib_robotparser_moved_attributes = [ - MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"), -] -for attr in _urllib_robotparser_moved_attributes: - setattr(Module_six_moves_urllib_robotparser, attr.name, attr) -del attr - -Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes - -_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"), - "moves.urllib_robotparser", "moves.urllib.robotparser") - - -class Module_six_moves_urllib(types.ModuleType): - """Create a six.moves.urllib namespace that resembles the Python 3 namespace""" - __path__ = [] # mark as package - parse = _importer._get_module("moves.urllib_parse") - error = _importer._get_module("moves.urllib_error") - request = _importer._get_module("moves.urllib_request") - response = _importer._get_module("moves.urllib_response") - robotparser = _importer._get_module("moves.urllib_robotparser") - - def __dir__(self): - return ['parse', 'error', 'request', 'response', 'robotparser'] - -_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"), - "moves.urllib") - - -def add_move(move): - """Add an item to six.moves.""" - setattr(_MovedItems, move.name, move) - - -def remove_move(name): - """Remove item from six.moves.""" - try: - delattr(_MovedItems, name) - except AttributeError: - try: - del moves.__dict__[name] - except KeyError: - raise AttributeError("no such move, %r" % (name,)) - - -if PY3: - _meth_func = "__func__" - _meth_self = "__self__" - - _func_closure = "__closure__" - _func_code = "__code__" - _func_defaults = "__defaults__" - _func_globals = "__globals__" -else: - _meth_func = "im_func" - _meth_self = "im_self" - - _func_closure = "func_closure" - _func_code = "func_code" - _func_defaults = "func_defaults" - _func_globals = "func_globals" - - -try: - advance_iterator = next -except NameError: - def advance_iterator(it): - return it.next() -next = advance_iterator - - -try: - callable = callable -except NameError: - def callable(obj): - return any("__call__" in klass.__dict__ for klass in type(obj).__mro__) - - -if PY3: - def get_unbound_function(unbound): - return unbound - - create_bound_method = types.MethodType - - Iterator = object -else: - def get_unbound_function(unbound): - return unbound.im_func - - def create_bound_method(func, obj): - return types.MethodType(func, obj, obj.__class__) - - class Iterator(object): - - def next(self): - return type(self).__next__(self) - - callable = callable -_add_doc(get_unbound_function, - """Get the function out of a possibly unbound function""") - - -get_method_function = operator.attrgetter(_meth_func) -get_method_self = operator.attrgetter(_meth_self) -get_function_closure = operator.attrgetter(_func_closure) -get_function_code = operator.attrgetter(_func_code) -get_function_defaults = operator.attrgetter(_func_defaults) -get_function_globals = operator.attrgetter(_func_globals) - - -if PY3: - def iterkeys(d, **kw): - return iter(d.keys(**kw)) - - def itervalues(d, **kw): - return iter(d.values(**kw)) - - def iteritems(d, **kw): - return iter(d.items(**kw)) - - def iterlists(d, **kw): - return iter(d.lists(**kw)) - - viewkeys = operator.methodcaller("keys") - - viewvalues = operator.methodcaller("values") - - viewitems = operator.methodcaller("items") -else: - def iterkeys(d, **kw): - return iter(d.iterkeys(**kw)) - - def itervalues(d, **kw): - return iter(d.itervalues(**kw)) - - def iteritems(d, **kw): - return iter(d.iteritems(**kw)) - - def iterlists(d, **kw): - return iter(d.iterlists(**kw)) - - viewkeys = operator.methodcaller("viewkeys") - - viewvalues = operator.methodcaller("viewvalues") - - viewitems = operator.methodcaller("viewitems") - -_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.") -_add_doc(itervalues, "Return an iterator over the values of a dictionary.") -_add_doc(iteritems, - "Return an iterator over the (key, value) pairs of a dictionary.") -_add_doc(iterlists, - "Return an iterator over the (key, [values]) pairs of a dictionary.") - - -if PY3: - def b(s): - return s.encode("latin-1") - def u(s): - return s - unichr = chr - if sys.version_info[1] <= 1: - def int2byte(i): - return bytes((i,)) - else: - # This is about 2x faster than the implementation above on 3.2+ - int2byte = operator.methodcaller("to_bytes", 1, "big") - byte2int = operator.itemgetter(0) - indexbytes = operator.getitem - iterbytes = iter - import io - StringIO = io.StringIO - BytesIO = io.BytesIO - _assertCountEqual = "assertCountEqual" - _assertRaisesRegex = "assertRaisesRegex" - _assertRegex = "assertRegex" -else: - def b(s): - return s - # Workaround for standalone backslash - def u(s): - return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape") - unichr = unichr - int2byte = chr - def byte2int(bs): - return ord(bs[0]) - def indexbytes(buf, i): - return ord(buf[i]) - iterbytes = functools.partial(itertools.imap, ord) - import StringIO - StringIO = BytesIO = StringIO.StringIO - _assertCountEqual = "assertItemsEqual" - _assertRaisesRegex = "assertRaisesRegexp" - _assertRegex = "assertRegexpMatches" -_add_doc(b, """Byte literal""") -_add_doc(u, """Text literal""") - - -def assertCountEqual(self, *args, **kwargs): - return getattr(self, _assertCountEqual)(*args, **kwargs) - - -def assertRaisesRegex(self, *args, **kwargs): - return getattr(self, _assertRaisesRegex)(*args, **kwargs) - - -def assertRegex(self, *args, **kwargs): - return getattr(self, _assertRegex)(*args, **kwargs) - - -if PY3: - exec_ = getattr(moves.builtins, "exec") - - - def reraise(tp, value, tb=None): - if value is None: - value = tp() - if value.__traceback__ is not tb: - raise value.with_traceback(tb) - raise value - -else: - def exec_(_code_, _globs_=None, _locs_=None): - """Execute code in a namespace.""" - if _globs_ is None: - frame = sys._getframe(1) - _globs_ = frame.f_globals - if _locs_ is None: - _locs_ = frame.f_locals - del frame - elif _locs_ is None: - _locs_ = _globs_ - exec("""exec _code_ in _globs_, _locs_""") - - - exec_("""def reraise(tp, value, tb=None): - raise tp, value, tb -""") - - -if sys.version_info[:2] == (3, 2): - exec_("""def raise_from(value, from_value): - if from_value is None: - raise value - raise value from from_value -""") -elif sys.version_info[:2] > (3, 2): - exec_("""def raise_from(value, from_value): - raise value from from_value -""") -else: - def raise_from(value, from_value): - raise value - - -print_ = getattr(moves.builtins, "print", None) -if print_ is None: - def print_(*args, **kwargs): - """The new-style print function for Python 2.4 and 2.5.""" - fp = kwargs.pop("file", sys.stdout) - if fp is None: - return - def write(data): - if not isinstance(data, basestring): - data = str(data) - # If the file has an encoding, encode unicode with it. - if (isinstance(fp, file) and - isinstance(data, unicode) and - fp.encoding is not None): - errors = getattr(fp, "errors", None) - if errors is None: - errors = "strict" - data = data.encode(fp.encoding, errors) - fp.write(data) - want_unicode = False - sep = kwargs.pop("sep", None) - if sep is not None: - if isinstance(sep, unicode): - want_unicode = True - elif not isinstance(sep, str): - raise TypeError("sep must be None or a string") - end = kwargs.pop("end", None) - if end is not None: - if isinstance(end, unicode): - want_unicode = True - elif not isinstance(end, str): - raise TypeError("end must be None or a string") - if kwargs: - raise TypeError("invalid keyword arguments to print()") - if not want_unicode: - for arg in args: - if isinstance(arg, unicode): - want_unicode = True - break - if want_unicode: - newline = unicode("\n") - space = unicode(" ") - else: - newline = "\n" - space = " " - if sep is None: - sep = space - if end is None: - end = newline - for i, arg in enumerate(args): - if i: - write(sep) - write(arg) - write(end) -if sys.version_info[:2] < (3, 3): - _print = print_ - def print_(*args, **kwargs): - fp = kwargs.get("file", sys.stdout) - flush = kwargs.pop("flush", False) - _print(*args, **kwargs) - if flush and fp is not None: - fp.flush() - -_add_doc(reraise, """Reraise an exception.""") - -if sys.version_info[0:2] < (3, 4): - def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS, - updated=functools.WRAPPER_UPDATES): - def wrapper(f): - f = functools.wraps(wrapped, assigned, updated)(f) - f.__wrapped__ = wrapped - return f - return wrapper -else: - wraps = functools.wraps - -def with_metaclass(meta, *bases): - """Create a base class with a metaclass.""" - # This requires a bit of explanation: the basic idea is to make a dummy - # metaclass for one level of class instantiation that replaces itself with - # the actual metaclass. - class metaclass(meta): - def __new__(cls, name, this_bases, d): - return meta(name, bases, d) - return type.__new__(metaclass, 'temporary_class', (), {}) - - -def add_metaclass(metaclass): - """Class decorator for creating a class with a metaclass.""" - def wrapper(cls): - orig_vars = cls.__dict__.copy() - slots = orig_vars.get('__slots__') - if slots is not None: - if isinstance(slots, str): - slots = [slots] - for slots_var in slots: - orig_vars.pop(slots_var) - orig_vars.pop('__dict__', None) - orig_vars.pop('__weakref__', None) - return metaclass(cls.__name__, cls.__bases__, orig_vars) - return wrapper - - -def python_2_unicode_compatible(klass): - """ - A decorator that defines __unicode__ and __str__ methods under Python 2. - Under Python 3 it does nothing. - - To support Python 2 and 3 with a single code base, define a __str__ method - returning text and apply this decorator to the class. - """ - if PY2: - if '__str__' not in klass.__dict__: - raise ValueError("@python_2_unicode_compatible cannot be applied " - "to %s because it doesn't define __str__()." % - klass.__name__) - klass.__unicode__ = klass.__str__ - klass.__str__ = lambda self: self.__unicode__().encode('utf-8') - return klass - - -# Complete the moves implementation. -# This code is at the end of this module to speed up module loading. -# Turn this module into a package. -__path__ = [] # required for PEP 302 and PEP 451 -__package__ = __name__ # see PEP 366 @ReservedAssignment -if globals().get("__spec__") is not None: - __spec__.submodule_search_locations = [] # PEP 451 @UndefinedVariable -# Remove other six meta path importers, since they cause problems. This can -# happen if six is removed from sys.modules and then reloaded. (Setuptools does -# this for some reason.) -if sys.meta_path: - for i, importer in enumerate(sys.meta_path): - # Here's some real nastiness: Another "instance" of the six module might - # be floating around. Therefore, we can't use isinstance() to check for - # the six meta path importer, since the other six instance will have - # inserted an importer with different class. - if (type(importer).__name__ == "_SixMetaPathImporter" and - importer.name == __name__): - del sys.meta_path[i] - break - del i, importer -# Finally, add the importer to the meta path import hook. -sys.meta_path.append(_importer) diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py index 27c72b01b2d3..fa852e855cc6 100644 --- a/lib/matplotlib/figure.py +++ b/lib/matplotlib/figure.py @@ -14,7 +14,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import warnings from operator import itemgetter diff --git a/lib/matplotlib/finance.py b/lib/matplotlib/finance.py index cbdb592c8b3e..7c68fe0dcb12 100644 --- a/lib/matplotlib/finance.py +++ b/lib/matplotlib/finance.py @@ -9,13 +9,13 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange, zip +import six +from six.moves import xrange, zip import contextlib import os import warnings -from matplotlib.externals.six.moves.urllib.request import urlopen +from six.moves.urllib.request import urlopen import datetime diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py index be8de5568629..87a5239e7ca9 100644 --- a/lib/matplotlib/font_manager.py +++ b/lib/matplotlib/font_manager.py @@ -22,8 +22,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import cPickle as pickle +import six +from six.moves import cPickle as pickle """ KNOWN ISSUES @@ -186,7 +186,7 @@ def win32FontDirectory(): If the key is not found, $WINDIR/Fonts will be returned. """ try: - from matplotlib.externals.six.moves import winreg + from six.moves import winreg except ImportError: pass # Fall through to default else: @@ -211,7 +211,7 @@ def win32InstalledFonts(directory=None, fontext='ttf'): 'afm'. """ - from matplotlib.externals.six.moves import winreg + from six.moves import winreg if directory is None: directory = win32FontDirectory() diff --git a/lib/matplotlib/fontconfig_pattern.py b/lib/matplotlib/fontconfig_pattern.py index 157277f67ae6..2b1358c86bc9 100644 --- a/lib/matplotlib/fontconfig_pattern.py +++ b/lib/matplotlib/fontconfig_pattern.py @@ -19,7 +19,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import re, sys from pyparsing import Literal, ZeroOrMore, \ diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py index b31aa70c6787..bf2afb72adfc 100644 --- a/lib/matplotlib/gridspec.py +++ b/lib/matplotlib/gridspec.py @@ -17,8 +17,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip import matplotlib rcParams = matplotlib.rcParams diff --git a/lib/matplotlib/hatch.py b/lib/matplotlib/hatch.py index 5e3df910c2ad..94294afdf8a8 100644 --- a/lib/matplotlib/hatch.py +++ b/lib/matplotlib/hatch.py @@ -5,8 +5,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import numpy as np from matplotlib.path import Path diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py index 0d86e2b74081..8493f8e191a5 100644 --- a/lib/matplotlib/image.py +++ b/lib/matplotlib/image.py @@ -6,9 +6,9 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves.urllib.parse import urlparse -from matplotlib.externals.six.moves.urllib.request import urlopen +import six +from six.moves.urllib.parse import urlparse +from six.moves.urllib.request import urlopen from io import BytesIO from math import ceil diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py index 3af482cf6033..65ec29b136a5 100644 --- a/lib/matplotlib/legend.py +++ b/lib/matplotlib/legend.py @@ -24,8 +24,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import warnings diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py index 5b589b0c501d..50473fa6df50 100644 --- a/lib/matplotlib/legend_handler.py +++ b/lib/matplotlib/legend_handler.py @@ -27,8 +27,8 @@ def legend_artist(self, legend, orig_handle, fontsize, handlebox): from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip import numpy as np diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py index 006f190925a5..02f4b03c1991 100644 --- a/lib/matplotlib/lines.py +++ b/lib/matplotlib/lines.py @@ -7,7 +7,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import warnings diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py index 2310e6dc3fcd..6bdcb56d0c6c 100644 --- a/lib/matplotlib/markers.py +++ b/lib/matplotlib/markers.py @@ -82,8 +82,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import numpy as np diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py index 478d1cb379d0..a859aaf9bce8 100644 --- a/lib/matplotlib/mathtext.py +++ b/lib/matplotlib/mathtext.py @@ -17,10 +17,10 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os, sys -from matplotlib.externals.six import unichr +from six import unichr from math import ceil try: set diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py index 57fc4995f440..07ddd98cd22c 100644 --- a/lib/matplotlib/mlab.py +++ b/lib/matplotlib/mlab.py @@ -165,8 +165,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import map, xrange, zip +import six +from six.moves import map, xrange, zip import copy import csv diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py index a35403c9e369..2e23b7e3bdfc 100644 --- a/lib/matplotlib/offsetbox.py +++ b/lib/matplotlib/offsetbox.py @@ -17,8 +17,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange, zip +import six +from six.moves import xrange, zip import warnings import matplotlib.transforms as mtransforms diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py index fd5380d2caab..0b802260a541 100644 --- a/lib/matplotlib/patches.py +++ b/lib/matplotlib/patches.py @@ -3,8 +3,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import map, zip +import six +from six.moves import map, zip import math diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py index 2e0d86456167..9f387ca232cc 100644 --- a/lib/matplotlib/path.py +++ b/lib/matplotlib/path.py @@ -15,7 +15,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import math from weakref import WeakValueDictionary diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py index a0c8933b9b86..a55fdeda8410 100644 --- a/lib/matplotlib/patheffects.py +++ b/lib/matplotlib/patheffects.py @@ -7,7 +7,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib.backend_bases import RendererBase from matplotlib import ( diff --git a/lib/matplotlib/projections/__init__.py b/lib/matplotlib/projections/__init__.py index 54bbdfeef7b5..235598563931 100644 --- a/lib/matplotlib/projections/__init__.py +++ b/lib/matplotlib/projections/__init__.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from .geo import AitoffAxes, HammerAxes, LambertAxes, MollweideAxes from .polar import PolarAxes diff --git a/lib/matplotlib/projections/geo.py b/lib/matplotlib/projections/geo.py index 338deec8279d..dd726990eefb 100644 --- a/lib/matplotlib/projections/geo.py +++ b/lib/matplotlib/projections/geo.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import math diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py index a52e343bb07e..394301a23df2 100644 --- a/lib/matplotlib/projections/polar.py +++ b/lib/matplotlib/projections/polar.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import math import warnings diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py index 3c97e9249d25..bd1b4936cdc4 100644 --- a/lib/matplotlib/pylab.py +++ b/lib/matplotlib/pylab.py @@ -218,7 +218,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import sys, warnings diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py index be928242ce16..7b130107916b 100644 --- a/lib/matplotlib/pyplot.py +++ b/lib/matplotlib/pyplot.py @@ -18,7 +18,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import sys import warnings diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py index 0234bfd11a7e..f22367ea58c7 100644 --- a/lib/matplotlib/quiver.py +++ b/lib/matplotlib/quiver.py @@ -17,7 +17,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import weakref import numpy as np diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py index 4988b0c30019..dea567921e9b 100644 --- a/lib/matplotlib/rcsetup.py +++ b/lib/matplotlib/rcsetup.py @@ -16,7 +16,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from functools import reduce import operator diff --git a/lib/matplotlib/sankey.py b/lib/matplotlib/sankey.py index 41d3e04a308d..2b5188f12303 100755 --- a/lib/matplotlib/sankey.py +++ b/lib/matplotlib/sankey.py @@ -5,8 +5,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip # Original version by Yannick Copin (ycopin@ipnl.in2p3.fr) 10/2/2010, available # at: diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py index b38e5e500a54..7193d1e7edf6 100644 --- a/lib/matplotlib/scale.py +++ b/lib/matplotlib/scale.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np from numpy import ma diff --git a/lib/matplotlib/sphinxext/mathmpl.py b/lib/matplotlib/sphinxext/mathmpl.py index 8fc7ed2b3d2e..39b6694ba3fe 100644 --- a/lib/matplotlib/sphinxext/mathmpl.py +++ b/lib/matplotlib/sphinxext/mathmpl.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os import sys diff --git a/lib/matplotlib/sphinxext/only_directives.py b/lib/matplotlib/sphinxext/only_directives.py index 05b99b38ffb4..99978a0b53df 100644 --- a/lib/matplotlib/sphinxext/only_directives.py +++ b/lib/matplotlib/sphinxext/only_directives.py @@ -6,7 +6,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from docutils.nodes import Body, Element from docutils.parsers.rst import directives diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index a2ac924bc91d..43ca8818b021 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -133,8 +133,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import sys, os, shutil, io, re, textwrap from os.path import relpath diff --git a/lib/matplotlib/spines.py b/lib/matplotlib/spines.py index a68245086c31..20042d4ea314 100644 --- a/lib/matplotlib/spines.py +++ b/lib/matplotlib/spines.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib diff --git a/lib/matplotlib/stackplot.py b/lib/matplotlib/stackplot.py index 78e838f74416..3123d9089cb1 100644 --- a/lib/matplotlib/stackplot.py +++ b/lib/matplotlib/stackplot.py @@ -9,8 +9,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange from cycler import cycler import numpy as np diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py index 470065d9c523..6a60a26dd7fc 100644 --- a/lib/matplotlib/streamplot.py +++ b/lib/matplotlib/streamplot.py @@ -5,8 +5,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import numpy as np import matplotlib diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py index a6b9c06d4542..075010e212ce 100644 --- a/lib/matplotlib/style/core.py +++ b/lib/matplotlib/style/core.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six """ Core functions and attributes for the matplotlib style library: diff --git a/lib/matplotlib/table.py b/lib/matplotlib/table.py index 2d8adfbd5db3..cc6f6a1970ad 100644 --- a/lib/matplotlib/table.py +++ b/lib/matplotlib/table.py @@ -22,8 +22,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import warnings diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py index 2252aa9b8c76..7905aa273a36 100644 --- a/lib/matplotlib/testing/compare.py +++ b/lib/matplotlib/testing/compare.py @@ -5,7 +5,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import hashlib import os diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py index c3089ffe368e..1896f2816b8d 100644 --- a/lib/matplotlib/testing/decorators.py +++ b/lib/matplotlib/testing/decorators.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import functools import gc diff --git a/lib/matplotlib/testing/disable_internet.py b/lib/matplotlib/testing/disable_internet.py index 41235c4ee5cd..e70c6565276f 100644 --- a/lib/matplotlib/testing/disable_internet.py +++ b/lib/matplotlib/testing/disable_internet.py @@ -7,7 +7,7 @@ import contextlib import socket -from matplotlib.externals.six.moves import urllib +from six.moves import urllib # save original socket method for restoration # These are global so that re-calling the turn_off_internet function doesn't diff --git a/lib/matplotlib/testing/jpl_units/Duration.py b/lib/matplotlib/testing/jpl_units/Duration.py index df6e7e82b9e0..4d71c78e8270 100644 --- a/lib/matplotlib/testing/jpl_units/Duration.py +++ b/lib/matplotlib/testing/jpl_units/Duration.py @@ -13,7 +13,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six # # Place all imports before here. #=========================================================================== diff --git a/lib/matplotlib/testing/jpl_units/Epoch.py b/lib/matplotlib/testing/jpl_units/Epoch.py index e68bc41184aa..91b4c127eb5c 100644 --- a/lib/matplotlib/testing/jpl_units/Epoch.py +++ b/lib/matplotlib/testing/jpl_units/Epoch.py @@ -13,7 +13,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import math import datetime as DT diff --git a/lib/matplotlib/testing/jpl_units/EpochConverter.py b/lib/matplotlib/testing/jpl_units/EpochConverter.py index 24a0340a5612..dc0f36c3b7a5 100644 --- a/lib/matplotlib/testing/jpl_units/EpochConverter.py +++ b/lib/matplotlib/testing/jpl_units/EpochConverter.py @@ -13,7 +13,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib.units as units import matplotlib.dates as date_ticker diff --git a/lib/matplotlib/testing/jpl_units/StrConverter.py b/lib/matplotlib/testing/jpl_units/StrConverter.py index cdf44d903b07..b5b8814f7c78 100644 --- a/lib/matplotlib/testing/jpl_units/StrConverter.py +++ b/lib/matplotlib/testing/jpl_units/StrConverter.py @@ -13,8 +13,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import matplotlib.units as units from matplotlib.cbook import iterable diff --git a/lib/matplotlib/testing/jpl_units/UnitDbl.py b/lib/matplotlib/testing/jpl_units/UnitDbl.py index a23f8454bd4f..4eca2fb30951 100644 --- a/lib/matplotlib/testing/jpl_units/UnitDbl.py +++ b/lib/matplotlib/testing/jpl_units/UnitDbl.py @@ -13,7 +13,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six # # Place all imports before here. #=========================================================================== diff --git a/lib/matplotlib/testing/jpl_units/UnitDblConverter.py b/lib/matplotlib/testing/jpl_units/UnitDblConverter.py index c5e3307e1d66..73bda0bb7f5b 100644 --- a/lib/matplotlib/testing/jpl_units/UnitDblConverter.py +++ b/lib/matplotlib/testing/jpl_units/UnitDblConverter.py @@ -13,7 +13,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np import matplotlib.units as units diff --git a/lib/matplotlib/testing/jpl_units/UnitDblFormatter.py b/lib/matplotlib/testing/jpl_units/UnitDblFormatter.py index b4ccb1d21b09..c63f396c81e8 100644 --- a/lib/matplotlib/testing/jpl_units/UnitDblFormatter.py +++ b/lib/matplotlib/testing/jpl_units/UnitDblFormatter.py @@ -13,7 +13,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib.ticker as ticker # diff --git a/lib/matplotlib/testing/jpl_units/__init__.py b/lib/matplotlib/testing/jpl_units/__init__.py index e371b9ac531c..842cc677fbfe 100644 --- a/lib/matplotlib/testing/jpl_units/__init__.py +++ b/lib/matplotlib/testing/jpl_units/__init__.py @@ -34,7 +34,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from .Duration import Duration from .Epoch import Epoch diff --git a/lib/matplotlib/testing/noseclasses.py b/lib/matplotlib/testing/noseclasses.py index d2ad1dde96fe..8bcb09d28a29 100644 --- a/lib/matplotlib/testing/noseclasses.py +++ b/lib/matplotlib/testing/noseclasses.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os from nose.plugins.errorclass import ErrorClass, ErrorClassPlugin diff --git a/lib/matplotlib/tests/__init__.py b/lib/matplotlib/tests/__init__.py index 354d9e8a23b8..6a382247e018 100644 --- a/lib/matplotlib/tests/__init__.py +++ b/lib/matplotlib/tests/__init__.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import difflib import os diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py index 6db086126e16..748a62874772 100644 --- a/lib/matplotlib/tests/test_agg.py +++ b/lib/matplotlib/tests/test_agg.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import io import os diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py index 4118ab7b797e..786edeed3337 100644 --- a/lib/matplotlib/tests/test_animation.py +++ b/lib/matplotlib/tests/test_animation.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os import tempfile diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py index c15389ee0f51..16b473e957ef 100644 --- a/lib/matplotlib/tests/test_arrow_patches.py +++ b/lib/matplotlib/tests/test_arrow_patches.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib.pyplot as plt from matplotlib.testing.decorators import image_comparison diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py index f4eb54ae07de..59a9561d4756 100644 --- a/lib/matplotlib/tests/test_artist.py +++ b/lib/matplotlib/tests/test_artist.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) import warnings -from matplotlib.externals import six +import six import io diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py index a52a95464491..2feee6fb1238 100644 --- a/lib/matplotlib/tests/test_backend_pdf.py +++ b/lib/matplotlib/tests/test_backend_pdf.py @@ -3,7 +3,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import io import os diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py index 41a25b71d21c..36315d185262 100644 --- a/lib/matplotlib/tests/test_backend_pgf.py +++ b/lib/matplotlib/tests/test_backend_pgf.py @@ -2,7 +2,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os import shutil diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py index 49056865d403..ae12c501ba14 100644 --- a/lib/matplotlib/tests/test_backend_ps.py +++ b/lib/matplotlib/tests/test_backend_ps.py @@ -6,7 +6,7 @@ import io import re import numpy as np -from matplotlib.externals import six +import six import matplotlib import matplotlib.pyplot as plt diff --git a/lib/matplotlib/tests/test_backend_qt4.py b/lib/matplotlib/tests/test_backend_qt4.py index 5dfdfdf6cf46..80e965e4f945 100644 --- a/lib/matplotlib/tests/test_backend_qt4.py +++ b/lib/matplotlib/tests/test_backend_qt4.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six import unichr +import six +from six import unichr from matplotlib import pyplot as plt from matplotlib.testing.decorators import cleanup, switch_backend from matplotlib.testing.decorators import knownfailureif diff --git a/lib/matplotlib/tests/test_backend_qt5.py b/lib/matplotlib/tests/test_backend_qt5.py index eefe86fd2001..8d2704e04603 100644 --- a/lib/matplotlib/tests/test_backend_qt5.py +++ b/lib/matplotlib/tests/test_backend_qt5.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib import pyplot as plt from matplotlib.testing.decorators import cleanup, switch_backend diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py index fcbdefb9102f..c59263fe34f6 100644 --- a/lib/matplotlib/tests/test_backend_svg.py +++ b/lib/matplotlib/tests/test_backend_svg.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np from io import BytesIO diff --git a/lib/matplotlib/tests/test_basic.py b/lib/matplotlib/tests/test_basic.py index db3d8b94ed4b..d5f23ba868aa 100644 --- a/lib/matplotlib/tests/test_basic.py +++ b/lib/matplotlib/tests/test_basic.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from nose.tools import assert_equal diff --git a/lib/matplotlib/tests/test_bbox_tight.py b/lib/matplotlib/tests/test_bbox_tight.py index 76e2e3427393..28555811cae7 100644 --- a/lib/matplotlib/tests/test_bbox_tight.py +++ b/lib/matplotlib/tests/test_bbox_tight.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import numpy as np diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py index fe0377a72eba..093220ab659e 100644 --- a/lib/matplotlib/tests/test_cbook.py +++ b/lib/matplotlib/tests/test_cbook.py @@ -4,7 +4,7 @@ from weakref import ref import warnings -from matplotlib.externals import six +import six from datetime import datetime diff --git a/lib/matplotlib/tests/test_coding_standards.py b/lib/matplotlib/tests/test_coding_standards.py index 15cb31b738bf..a2ae045c8a20 100644 --- a/lib/matplotlib/tests/test_coding_standards.py +++ b/lib/matplotlib/tests/test_coding_standards.py @@ -242,8 +242,7 @@ def test_pep8_conformance_installed_files(): 'sphinxext/plot_directive.py', 'projections/__init__.py', 'projections/geo.py', - 'projections/polar.py', - 'externals/six.py'] + 'projections/polar.py'] expected_bad_files = ['*/matplotlib/' + s for s in expected_bad_files] assert_pep8_conformance(module=matplotlib, exclude_files=exclude_files, diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py index 5bffd9172ff9..18465a0423f6 100644 --- a/lib/matplotlib/tests/test_collections.py +++ b/lib/matplotlib/tests/test_collections.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import io diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py index 8d0bc1d709b8..a194bcb80c9f 100644 --- a/lib/matplotlib/tests/test_colorbar.py +++ b/lib/matplotlib/tests/test_colorbar.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np from numpy import ma diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py index c9f01ae64a68..c1eebc8bfa28 100644 --- a/lib/matplotlib/tests/test_colors.py +++ b/lib/matplotlib/tests/test_colors.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import itertools from distutils.version import LooseVersion as V diff --git a/lib/matplotlib/tests/test_compare_images.py b/lib/matplotlib/tests/test_compare_images.py index f9ee9159f204..8aa4497845ff 100644 --- a/lib/matplotlib/tests/test_compare_images.py +++ b/lib/matplotlib/tests/test_compare_images.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import os import shutil diff --git a/lib/matplotlib/tests/test_container.py b/lib/matplotlib/tests/test_container.py index 0594e95b1644..ffb6213c2369 100644 --- a/lib/matplotlib/tests/test_container.py +++ b/lib/matplotlib/tests/test_container.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib.pyplot as plt from matplotlib.testing.decorators import cleanup diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py index ff2a441c4e4a..312643bc91b7 100644 --- a/lib/matplotlib/tests/test_contour.py +++ b/lib/matplotlib/tests/test_contour.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import datetime diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py index 54afc633bf7e..abdf5180846d 100644 --- a/lib/matplotlib/tests/test_dates.py +++ b/lib/matplotlib/tests/test_dates.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import map +import six +from six.moves import map import datetime import warnings diff --git a/lib/matplotlib/tests/test_delaunay.py b/lib/matplotlib/tests/test_delaunay.py index 82284513fec9..373f77404fe0 100644 --- a/lib/matplotlib/tests/test_delaunay.py +++ b/lib/matplotlib/tests/test_delaunay.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import warnings import numpy as np diff --git a/lib/matplotlib/tests/test_dviread.py b/lib/matplotlib/tests/test_dviread.py index 1b8c51a0c6f8..dccc677eb6b3 100644 --- a/lib/matplotlib/tests/test_dviread.py +++ b/lib/matplotlib/tests/test_dviread.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from nose.tools import assert_equal import matplotlib.dviread as dr diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py index 631474c23287..f6260a51907b 100644 --- a/lib/matplotlib/tests/test_figure.py +++ b/lib/matplotlib/tests/test_figure.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange from nose.tools import assert_equal, assert_true from matplotlib.testing.decorators import image_comparison, cleanup diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py index 37f6671bc7ab..ff13904c51cd 100644 --- a/lib/matplotlib/tests/test_font_manager.py +++ b/lib/matplotlib/tests/test_font_manager.py @@ -2,7 +2,7 @@ unicode_literals) from nose.tools import assert_equal -from matplotlib.externals import six +import six import os diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index 81d996354d5e..15f5c6686efa 100644 --- a/lib/matplotlib/tests/test_image.py +++ b/lib/matplotlib/tests/test_image.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import sys import io import os diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py index 06a535df8ba8..8e6708b3489c 100644 --- a/lib/matplotlib/tests/test_legend.py +++ b/lib/matplotlib/tests/test_legend.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange try: # mock in python 3.3+ from unittest import mock diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py index 0828dcff2770..084a97b681fd 100644 --- a/lib/matplotlib/tests/test_lines.py +++ b/lib/matplotlib/tests/test_lines.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import itertools import matplotlib.lines as mlines import nose diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py index 4486e2d22f00..fe3fe18ac4ce 100644 --- a/lib/matplotlib/tests/test_mathtext.py +++ b/lib/matplotlib/tests/test_mathtext.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import io diff --git a/lib/matplotlib/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py index 5eca224813c8..700473895924 100644 --- a/lib/matplotlib/tests/test_mlab.py +++ b/lib/matplotlib/tests/test_mlab.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import tempfile diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py index a2e21255540f..44856642b282 100644 --- a/lib/matplotlib/tests/test_patches.py +++ b/lib/matplotlib/tests/test_patches.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np from numpy.testing import assert_array_equal diff --git a/lib/matplotlib/tests/test_path.py b/lib/matplotlib/tests/test_path.py index d397d54f40e4..ef4cfb413e22 100644 --- a/lib/matplotlib/tests/test_path.py +++ b/lib/matplotlib/tests/test_path.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py index b9ece19b36ef..b5ce1a7f68c6 100644 --- a/lib/matplotlib/tests/test_patheffects.py +++ b/lib/matplotlib/tests/test_patheffects.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py index 3419b82c2822..6bd43238ea8c 100644 --- a/lib/matplotlib/tests/test_pickle.py +++ b/lib/matplotlib/tests/test_pickle.py @@ -1,9 +1,9 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import cPickle as pickle -from matplotlib.externals.six.moves import xrange +import six +from six.moves import cPickle as pickle +from six.moves import xrange from io import BytesIO diff --git a/lib/matplotlib/tests/test_png.py b/lib/matplotlib/tests/test_png.py index 0528052348bc..590b395fca3d 100644 --- a/lib/matplotlib/tests/test_png.py +++ b/lib/matplotlib/tests/test_png.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import glob import os diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py index 6b759aa9a509..1db45d9e1cd1 100644 --- a/lib/matplotlib/tests/test_rcparams.py +++ b/lib/matplotlib/tests/test_rcparams.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import io import os diff --git a/lib/matplotlib/tests/test_sankey.py b/lib/matplotlib/tests/test_sankey.py index bcb565d99496..9e5e0098a26a 100644 --- a/lib/matplotlib/tests/test_sankey.py +++ b/lib/matplotlib/tests/test_sankey.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib.sankey import Sankey diff --git a/lib/matplotlib/tests/test_simplification.py b/lib/matplotlib/tests/test_simplification.py index ac0ef91f2a4f..94a69203642f 100644 --- a/lib/matplotlib/tests/test_simplification.py +++ b/lib/matplotlib/tests/test_simplification.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np import matplotlib diff --git a/lib/matplotlib/tests/test_skew.py b/lib/matplotlib/tests/test_skew.py index fd72cadba90a..662bbc6cbb8c 100644 --- a/lib/matplotlib/tests/test_skew.py +++ b/lib/matplotlib/tests/test_skew.py @@ -5,7 +5,7 @@ unicode_literals) import itertools -from matplotlib.externals import six +import six from nose.tools import assert_true import numpy as np diff --git a/lib/matplotlib/tests/test_spines.py b/lib/matplotlib/tests/test_spines.py index 2f6a9a3084cc..924610ddad25 100644 --- a/lib/matplotlib/tests/test_spines.py +++ b/lib/matplotlib/tests/test_spines.py @@ -3,7 +3,7 @@ import numpy as np from nose.tools import assert_true, assert_less -from matplotlib.externals import six +import six import matplotlib import matplotlib.pyplot as plt diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py index b5d4e3e86018..560b48438f10 100644 --- a/lib/matplotlib/tests/test_streamplot.py +++ b/lib/matplotlib/tests/test_streamplot.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np from numpy.testing import assert_array_almost_equal diff --git a/lib/matplotlib/tests/test_style.py b/lib/matplotlib/tests/test_style.py index 8957b0706c65..ecf0a6457600 100644 --- a/lib/matplotlib/tests/test_style.py +++ b/lib/matplotlib/tests/test_style.py @@ -15,7 +15,7 @@ from matplotlib import style from matplotlib.style.core import USER_LIBRARY_PATHS, STYLE_EXTENSION -from matplotlib.externals import six +import six PARAM = 'image.cmap' VALUE = 'pink' diff --git a/lib/matplotlib/tests/test_subplots.py b/lib/matplotlib/tests/test_subplots.py index d588f7b4b13b..5f3457181017 100644 --- a/lib/matplotlib/tests/test_subplots.py +++ b/lib/matplotlib/tests/test_subplots.py @@ -2,8 +2,8 @@ unicode_literals) import warnings -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange import numpy import matplotlib.pyplot as plt diff --git a/lib/matplotlib/tests/test_table.py b/lib/matplotlib/tests/test_table.py index ef768d89e935..be6d9b693184 100644 --- a/lib/matplotlib/tests/test_table.py +++ b/lib/matplotlib/tests/test_table.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib.pyplot as plt import numpy as np diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py index f975ca597037..beddb9edb75a 100644 --- a/lib/matplotlib/tests/test_text.py +++ b/lib/matplotlib/tests/test_text.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import warnings import numpy as np diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py index 1d06047cb7a7..430ca7bfdd2a 100644 --- a/lib/matplotlib/tests/test_ticker.py +++ b/lib/matplotlib/tests/test_ticker.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import nose.tools from nose.tools import assert_equal, assert_raises from numpy.testing import assert_almost_equal diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py index 588f66dbae65..b3b3a9647afc 100644 --- a/lib/matplotlib/tests/test_tightlayout.py +++ b/lib/matplotlib/tests/test_tightlayout.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import warnings import numpy as np diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py index 753a9494aeb4..d4b6c4996c69 100644 --- a/lib/matplotlib/tests/test_transforms.py +++ b/lib/matplotlib/tests/test_transforms.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange, zip +import six +from six.moves import xrange, zip import unittest diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py index 966990373434..06e56a3c6230 100644 --- a/lib/matplotlib/tests/test_triangulation.py +++ b/lib/matplotlib/tests/test_triangulation.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np import matplotlib.pyplot as plt diff --git a/lib/matplotlib/tests/test_ttconv.py b/lib/matplotlib/tests/test_ttconv.py index 34b9cdc47616..63dd928144c2 100644 --- a/lib/matplotlib/tests/test_ttconv.py +++ b/lib/matplotlib/tests/test_ttconv.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib from matplotlib.font_manager import FontProperties diff --git a/lib/matplotlib/tests/test_type1font.py b/lib/matplotlib/tests/test_type1font.py index fa8136def496..751571f93a8e 100644 --- a/lib/matplotlib/tests/test_type1font.py +++ b/lib/matplotlib/tests/test_type1font.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from nose.tools import assert_equal, assert_in import matplotlib.type1font as t1f diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py index cb33f847c9a3..f805cb0f3f03 100644 --- a/lib/matplotlib/texmanager.py +++ b/lib/matplotlib/texmanager.py @@ -37,7 +37,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import copy import glob diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py index a3d9331079f2..71744149831c 100644 --- a/lib/matplotlib/text.py +++ b/lib/matplotlib/text.py @@ -4,8 +4,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip import math import warnings diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py index b69461917769..e4e4f2af6b38 100644 --- a/lib/matplotlib/textpath.py +++ b/lib/matplotlib/textpath.py @@ -5,8 +5,8 @@ from collections import OrderedDict -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip import warnings @@ -21,7 +21,7 @@ import matplotlib.dviread as dviread from matplotlib.font_manager import FontProperties, get_font from matplotlib.transforms import Affine2D -from matplotlib.externals.six.moves.urllib.parse import quote as urllib_quote +from six.moves.urllib.parse import quote as urllib_quote class TextToPath(object): diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py index 23ecae9646a7..a68036b392c8 100644 --- a/lib/matplotlib/ticker.py +++ b/lib/matplotlib/ticker.py @@ -156,7 +156,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import decimal import itertools diff --git a/lib/matplotlib/tight_bbox.py b/lib/matplotlib/tight_bbox.py index 8d414bab91c2..69ff23abf426 100644 --- a/lib/matplotlib/tight_bbox.py +++ b/lib/matplotlib/tight_bbox.py @@ -5,7 +5,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import warnings from matplotlib.transforms import Bbox, TransformedBbox, Affine2D diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py index 905523edbc7b..3bb3cab77826 100644 --- a/lib/matplotlib/transforms.py +++ b/lib/matplotlib/transforms.py @@ -32,7 +32,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np from numpy import ma diff --git a/lib/matplotlib/tri/__init__.py b/lib/matplotlib/tri/__init__.py index 9f54bab6504d..7ea09f8b3f10 100644 --- a/lib/matplotlib/tri/__init__.py +++ b/lib/matplotlib/tri/__init__.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from .triangulation import * from .tricontour import * diff --git a/lib/matplotlib/tri/triangulation.py b/lib/matplotlib/tri/triangulation.py index 442cf5d483fa..69c4c153e715 100644 --- a/lib/matplotlib/tri/triangulation.py +++ b/lib/matplotlib/tri/triangulation.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib._tri as _tri import matplotlib._qhull as _qhull diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py index 98b0ba794c04..02fac3822170 100644 --- a/lib/matplotlib/tri/tricontour.py +++ b/lib/matplotlib/tri/tricontour.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib.contour import ContourSet from matplotlib.tri.triangulation import Triangulation diff --git a/lib/matplotlib/tri/trifinder.py b/lib/matplotlib/tri/trifinder.py index 45a763802309..247d061ea1d0 100644 --- a/lib/matplotlib/tri/trifinder.py +++ b/lib/matplotlib/tri/trifinder.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib.tri import Triangulation import matplotlib._tri as _tri diff --git a/lib/matplotlib/tri/triinterpolate.py b/lib/matplotlib/tri/triinterpolate.py index 8eb01f13a85e..1e53e7dbf398 100644 --- a/lib/matplotlib/tri/triinterpolate.py +++ b/lib/matplotlib/tri/triinterpolate.py @@ -4,8 +4,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange +import six +from six.moves import xrange from matplotlib.tri import Triangulation from matplotlib.tri.trifinder import TriFinder diff --git a/lib/matplotlib/tri/tripcolor.py b/lib/matplotlib/tri/tripcolor.py index cc076e9f0845..c5ae41e85c75 100644 --- a/lib/matplotlib/tri/tripcolor.py +++ b/lib/matplotlib/tri/tripcolor.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib.collections import PolyCollection, TriMesh from matplotlib.colors import Normalize diff --git a/lib/matplotlib/tri/triplot.py b/lib/matplotlib/tri/triplot.py index 664820c64aa8..fe0a064d8a71 100644 --- a/lib/matplotlib/tri/triplot.py +++ b/lib/matplotlib/tri/triplot.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np from matplotlib.tri.triangulation import Triangulation diff --git a/lib/matplotlib/tri/trirefine.py b/lib/matplotlib/tri/trirefine.py index fb40baba314f..62a9f804ac1c 100644 --- a/lib/matplotlib/tri/trirefine.py +++ b/lib/matplotlib/tri/trirefine.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np from matplotlib.tri.triangulation import Triangulation diff --git a/lib/matplotlib/tri/tritools.py b/lib/matplotlib/tri/tritools.py index bd876c8cbe95..fa1ef54db5b3 100644 --- a/lib/matplotlib/tri/tritools.py +++ b/lib/matplotlib/tri/tritools.py @@ -4,7 +4,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib.tri import Triangulation import numpy as np diff --git a/lib/matplotlib/type1font.py b/lib/matplotlib/type1font.py index db8957bf0e26..b414b8dfaaa7 100644 --- a/lib/matplotlib/type1font.py +++ b/lib/matplotlib/type1font.py @@ -25,8 +25,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six import unichr +import six +from six import unichr import binascii import io diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py index b074ac2d536d..081827910b56 100644 --- a/lib/matplotlib/units.py +++ b/lib/matplotlib/units.py @@ -45,7 +45,7 @@ def default_units(x, axis): from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib.cbook import iterable, is_numlike import numpy as np diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py index ad008c4f0d70..d2f6ae8de46a 100644 --- a/lib/matplotlib/widgets.py +++ b/lib/matplotlib/widgets.py @@ -13,8 +13,8 @@ unicode_literals) import copy -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip import numpy as np diff --git a/lib/mpl_toolkits/axes_grid/__init__.py b/lib/mpl_toolkits/axes_grid/__init__.py index acdd625bf452..8e9fd9e21968 100644 --- a/lib/mpl_toolkits/axes_grid/__init__.py +++ b/lib/mpl_toolkits/axes_grid/__init__.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from . import axes_size as Size from .axes_divider import Divider, SubplotDivider, LocatableAxes, \ diff --git a/lib/mpl_toolkits/axes_grid/anchored_artists.py b/lib/mpl_toolkits/axes_grid/anchored_artists.py index af88bcc9583f..09f281276fcc 100644 --- a/lib/mpl_toolkits/axes_grid/anchored_artists.py +++ b/lib/mpl_toolkits/axes_grid/anchored_artists.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib.offsetbox import AnchoredOffsetbox, AuxTransformBox, VPacker,\ TextArea, AnchoredText, DrawingArea, AnnotationBbox diff --git a/lib/mpl_toolkits/axes_grid/angle_helper.py b/lib/mpl_toolkits/axes_grid/angle_helper.py index 259918a1a1d8..da894aeff92c 100644 --- a/lib/mpl_toolkits/axes_grid/angle_helper.py +++ b/lib/mpl_toolkits/axes_grid/angle_helper.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axisartist.angle_helper import * diff --git a/lib/mpl_toolkits/axes_grid/axes_divider.py b/lib/mpl_toolkits/axes_grid/axes_divider.py index 9d05c639be93..9575c796c5cd 100644 --- a/lib/mpl_toolkits/axes_grid/axes_divider.py +++ b/lib/mpl_toolkits/axes_grid/axes_divider.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axes_grid1.axes_divider import Divider, AxesLocator, SubplotDivider, \ AxesDivider, locatable_axes_factory, make_axes_locatable diff --git a/lib/mpl_toolkits/axes_grid/axes_grid.py b/lib/mpl_toolkits/axes_grid/axes_grid.py index 96bc7bb7ad1e..5f61652c5f96 100644 --- a/lib/mpl_toolkits/axes_grid/axes_grid.py +++ b/lib/mpl_toolkits/axes_grid/axes_grid.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import mpl_toolkits.axes_grid1.axes_grid as axes_grid_orig from .axes_divider import LocatableAxes diff --git a/lib/mpl_toolkits/axes_grid/axes_rgb.py b/lib/mpl_toolkits/axes_grid/axes_rgb.py index d433928804b3..969dc3e466cc 100644 --- a/lib/mpl_toolkits/axes_grid/axes_rgb.py +++ b/lib/mpl_toolkits/axes_grid/axes_rgb.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six #from mpl_toolkits.axes_grid1.axes_rgb import * from mpl_toolkits.axes_grid1.axes_rgb import make_rgb_axes, imshow_rgb, RGBAxesBase diff --git a/lib/mpl_toolkits/axes_grid/axes_size.py b/lib/mpl_toolkits/axes_grid/axes_size.py index 35f18aa81fa4..9b0c1729f6cf 100644 --- a/lib/mpl_toolkits/axes_grid/axes_size.py +++ b/lib/mpl_toolkits/axes_grid/axes_size.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axes_grid1.axes_size import * diff --git a/lib/mpl_toolkits/axes_grid/axis_artist.py b/lib/mpl_toolkits/axes_grid/axis_artist.py index b33a8acd4a94..6f829db66a72 100644 --- a/lib/mpl_toolkits/axes_grid/axis_artist.py +++ b/lib/mpl_toolkits/axes_grid/axis_artist.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axisartist.axis_artist import * diff --git a/lib/mpl_toolkits/axes_grid/axisline_style.py b/lib/mpl_toolkits/axes_grid/axisline_style.py index 992a90a4b7b8..4bc8f7440c40 100644 --- a/lib/mpl_toolkits/axes_grid/axisline_style.py +++ b/lib/mpl_toolkits/axes_grid/axisline_style.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axisartist.axisline_style import * diff --git a/lib/mpl_toolkits/axes_grid/axislines.py b/lib/mpl_toolkits/axes_grid/axislines.py index 6a03a97d0568..db1619bf3aac 100644 --- a/lib/mpl_toolkits/axes_grid/axislines.py +++ b/lib/mpl_toolkits/axes_grid/axislines.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axisartist.axislines import * diff --git a/lib/mpl_toolkits/axes_grid/clip_path.py b/lib/mpl_toolkits/axes_grid/clip_path.py index b27b376abbf4..7ef59481105c 100644 --- a/lib/mpl_toolkits/axes_grid/clip_path.py +++ b/lib/mpl_toolkits/axes_grid/clip_path.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axisartist.clip_path import * diff --git a/lib/mpl_toolkits/axes_grid/floating_axes.py b/lib/mpl_toolkits/axes_grid/floating_axes.py index d7fe42e6266e..171ed23fbfd5 100644 --- a/lib/mpl_toolkits/axes_grid/floating_axes.py +++ b/lib/mpl_toolkits/axes_grid/floating_axes.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axisartist.floating_axes import * diff --git a/lib/mpl_toolkits/axes_grid/grid_finder.py b/lib/mpl_toolkits/axes_grid/grid_finder.py index 59a47cbb6bcd..5397f2caab50 100644 --- a/lib/mpl_toolkits/axes_grid/grid_finder.py +++ b/lib/mpl_toolkits/axes_grid/grid_finder.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axisartist.grid_finder import * diff --git a/lib/mpl_toolkits/axes_grid/grid_helper_curvelinear.py b/lib/mpl_toolkits/axes_grid/grid_helper_curvelinear.py index d4ea1f67ad1a..fa3a84cd6da1 100644 --- a/lib/mpl_toolkits/axes_grid/grid_helper_curvelinear.py +++ b/lib/mpl_toolkits/axes_grid/grid_helper_curvelinear.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axisartist.grid_helper_curvelinear import * diff --git a/lib/mpl_toolkits/axes_grid/inset_locator.py b/lib/mpl_toolkits/axes_grid/inset_locator.py index 14bc7b4b0781..4c94ccf5c02f 100644 --- a/lib/mpl_toolkits/axes_grid/inset_locator.py +++ b/lib/mpl_toolkits/axes_grid/inset_locator.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axes_grid1.inset_locator import InsetPosition, \ AnchoredSizeLocator, \ diff --git a/lib/mpl_toolkits/axes_grid/parasite_axes.py b/lib/mpl_toolkits/axes_grid/parasite_axes.py index 7c77482e6853..f1b2cb877b4f 100644 --- a/lib/mpl_toolkits/axes_grid/parasite_axes.py +++ b/lib/mpl_toolkits/axes_grid/parasite_axes.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from mpl_toolkits.axes_grid1.parasite_axes import \ subplot_class_factory, \ diff --git a/lib/mpl_toolkits/axes_grid1/__init__.py b/lib/mpl_toolkits/axes_grid1/__init__.py index 8df39f489717..3e225ba9f0cd 100644 --- a/lib/mpl_toolkits/axes_grid1/__init__.py +++ b/lib/mpl_toolkits/axes_grid1/__init__.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from . import axes_size as Size from .axes_divider import Divider, SubplotDivider, LocatableAxes, \ diff --git a/lib/mpl_toolkits/axes_grid1/anchored_artists.py b/lib/mpl_toolkits/axes_grid1/anchored_artists.py index fd02370f230b..cd3844264f06 100644 --- a/lib/mpl_toolkits/axes_grid1/anchored_artists.py +++ b/lib/mpl_toolkits/axes_grid1/anchored_artists.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib.patches import Rectangle, Ellipse diff --git a/lib/mpl_toolkits/axes_grid1/axes_divider.py b/lib/mpl_toolkits/axes_grid1/axes_divider.py index e0f239a1ce8c..35743c474dc4 100644 --- a/lib/mpl_toolkits/axes_grid1/axes_divider.py +++ b/lib/mpl_toolkits/axes_grid1/axes_divider.py @@ -13,8 +13,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import map +import six +from six.moves import map import matplotlib.transforms as mtransforms diff --git a/lib/mpl_toolkits/axes_grid1/axes_grid.py b/lib/mpl_toolkits/axes_grid1/axes_grid.py index 6f07a196ca7b..b331ec0d0062 100644 --- a/lib/mpl_toolkits/axes_grid1/axes_grid.py +++ b/lib/mpl_toolkits/axes_grid1/axes_grid.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib.cbook as cbook diff --git a/lib/mpl_toolkits/axes_grid1/axes_rgb.py b/lib/mpl_toolkits/axes_grid1/axes_rgb.py index 653e20f6f824..b4a76ebddb14 100644 --- a/lib/mpl_toolkits/axes_grid1/axes_rgb.py +++ b/lib/mpl_toolkits/axes_grid1/axes_rgb.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np from .axes_divider import make_axes_locatable, Size, locatable_axes_factory diff --git a/lib/mpl_toolkits/axes_grid1/axes_size.py b/lib/mpl_toolkits/axes_grid1/axes_size.py index 946db5157dc6..147a34e25838 100644 --- a/lib/mpl_toolkits/axes_grid1/axes_size.py +++ b/lib/mpl_toolkits/axes_grid1/axes_size.py @@ -13,7 +13,7 @@ class (or others) to determine the size of each axes. The unit from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib.cbook as cbook from matplotlib.axes import Axes diff --git a/lib/mpl_toolkits/axes_grid1/colorbar.py b/lib/mpl_toolkits/axes_grid1/colorbar.py index f5912c9fcfc2..064e25c84559 100644 --- a/lib/mpl_toolkits/axes_grid1/colorbar.py +++ b/lib/mpl_toolkits/axes_grid1/colorbar.py @@ -21,8 +21,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange, zip +import six +from six.moves import xrange, zip import numpy as np import matplotlib as mpl diff --git a/lib/mpl_toolkits/axes_grid1/inset_locator.py b/lib/mpl_toolkits/axes_grid1/inset_locator.py index 65c96d082d8c..eecee9d7fab2 100644 --- a/lib/mpl_toolkits/axes_grid1/inset_locator.py +++ b/lib/mpl_toolkits/axes_grid1/inset_locator.py @@ -5,7 +5,7 @@ unicode_literals) from matplotlib import docstring -from matplotlib.externals import six +import six from matplotlib.offsetbox import AnchoredOffsetbox from matplotlib.patches import Patch, Rectangle from matplotlib.path import Path diff --git a/lib/mpl_toolkits/axes_grid1/mpl_axes.py b/lib/mpl_toolkits/axes_grid1/mpl_axes.py index a8670660e6c6..68eb9eeea1dc 100644 --- a/lib/mpl_toolkits/axes_grid1/mpl_axes.py +++ b/lib/mpl_toolkits/axes_grid1/mpl_axes.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import warnings diff --git a/lib/mpl_toolkits/axes_grid1/parasite_axes.py b/lib/mpl_toolkits/axes_grid1/parasite_axes.py index 1241c93a0d67..c9f4869a4357 100644 --- a/lib/mpl_toolkits/axes_grid1/parasite_axes.py +++ b/lib/mpl_toolkits/axes_grid1/parasite_axes.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import warnings diff --git a/lib/mpl_toolkits/axisartist/__init__.py b/lib/mpl_toolkits/axisartist/__init__.py index 74da18a64e91..d54bf7f3e808 100644 --- a/lib/mpl_toolkits/axisartist/__init__.py +++ b/lib/mpl_toolkits/axisartist/__init__.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from .axislines import Axes, Subplot, AxesZero, SubplotZero, GridHelperRectlinear, \ AxisArtistHelperRectlinear, AxisArtistHelper, GridHelperBase, AxisArtist diff --git a/lib/mpl_toolkits/axisartist/angle_helper.py b/lib/mpl_toolkits/axisartist/angle_helper.py index 3d89fda17afe..5d921b0ba553 100644 --- a/lib/mpl_toolkits/axisartist/angle_helper.py +++ b/lib/mpl_toolkits/axisartist/angle_helper.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from math import floor diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py index 6b1904673f71..a8c7c7f87f7b 100644 --- a/lib/mpl_toolkits/axisartist/axis_artist.py +++ b/lib/mpl_toolkits/axisartist/axis_artist.py @@ -86,7 +86,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six # FIXME : diff --git a/lib/mpl_toolkits/axisartist/axisline_style.py b/lib/mpl_toolkits/axisartist/axisline_style.py index ae39a498d65b..876f5fe18985 100644 --- a/lib/mpl_toolkits/axisartist/axisline_style.py +++ b/lib/mpl_toolkits/axisartist/axisline_style.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from matplotlib.patches import _Style, FancyArrowPatch from matplotlib.transforms import IdentityTransform diff --git a/lib/mpl_toolkits/axisartist/axislines.py b/lib/mpl_toolkits/axisartist/axislines.py index 83d65db86055..5b9ff70cd1bf 100644 --- a/lib/mpl_toolkits/axisartist/axislines.py +++ b/lib/mpl_toolkits/axisartist/axislines.py @@ -45,7 +45,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib.axes as maxes import matplotlib.artist as martist diff --git a/lib/mpl_toolkits/axisartist/clip_path.py b/lib/mpl_toolkits/axisartist/clip_path.py index 4c0e9cfde8d6..5c3344426474 100644 --- a/lib/mpl_toolkits/axisartist/clip_path.py +++ b/lib/mpl_toolkits/axisartist/clip_path.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip import numpy as np from math import degrees diff --git a/lib/mpl_toolkits/axisartist/floating_axes.py b/lib/mpl_toolkits/axisartist/floating_axes.py index c7c03c137340..6caab8bce31e 100644 --- a/lib/mpl_toolkits/axisartist/floating_axes.py +++ b/lib/mpl_toolkits/axisartist/floating_axes.py @@ -4,8 +4,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip # TODO : diff --git a/lib/mpl_toolkits/axisartist/grid_finder.py b/lib/mpl_toolkits/axisartist/grid_finder.py index db9157ac5204..93c7e69214c9 100644 --- a/lib/mpl_toolkits/axisartist/grid_finder.py +++ b/lib/mpl_toolkits/axisartist/grid_finder.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import numpy as np import matplotlib.cbook as mcbook diff --git a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py index 6e8d6b8d1610..bbef9f330513 100644 --- a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py +++ b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py @@ -4,8 +4,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip from itertools import chain from .grid_finder import GridFinder diff --git a/lib/mpl_toolkits/exceltools.py b/lib/mpl_toolkits/exceltools.py index 9d9c8e6ec81c..74da93f1ad21 100644 --- a/lib/mpl_toolkits/exceltools.py +++ b/lib/mpl_toolkits/exceltools.py @@ -22,7 +22,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import copy import numpy as np diff --git a/lib/mpl_toolkits/gtktools.py b/lib/mpl_toolkits/gtktools.py index e437669b81c3..32f2a0933651 100644 --- a/lib/mpl_toolkits/gtktools.py +++ b/lib/mpl_toolkits/gtktools.py @@ -34,8 +34,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import xrange, zip +import six +from six.moves import xrange, zip import copy import gtk, gobject diff --git a/lib/mpl_toolkits/mplot3d/__init__.py b/lib/mpl_toolkits/mplot3d/__init__.py index 567abbac7c7c..cd9c2139d277 100644 --- a/lib/mpl_toolkits/mplot3d/__init__.py +++ b/lib/mpl_toolkits/mplot3d/__init__.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six from .axes3d import Axes3D diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py index b8a4619959ef..a9b83e38497c 100755 --- a/lib/mpl_toolkits/mplot3d/art3d.py +++ b/lib/mpl_toolkits/mplot3d/art3d.py @@ -10,8 +10,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip from matplotlib import lines, text as mtext, path as mpath, colors as mcolors from matplotlib import artist diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py index eb5f620c29a4..ce969545f28c 100755 --- a/lib/mpl_toolkits/mplot3d/axes3d.py +++ b/lib/mpl_toolkits/mplot3d/axes3d.py @@ -13,8 +13,8 @@ unicode_literals) import math -from matplotlib.externals import six -from matplotlib.externals.six.moves import map, xrange, zip, reduce +import six +from six.moves import map, xrange, zip, reduce import warnings from operator import itemgetter diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py index ad07fea32160..6170203d1342 100755 --- a/lib/mpl_toolkits/mplot3d/axis3d.py +++ b/lib/mpl_toolkits/mplot3d/axis3d.py @@ -6,7 +6,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import math import copy diff --git a/lib/mpl_toolkits/mplot3d/proj3d.py b/lib/mpl_toolkits/mplot3d/proj3d.py index 404d21e79bb0..1df85bb55959 100755 --- a/lib/mpl_toolkits/mplot3d/proj3d.py +++ b/lib/mpl_toolkits/mplot3d/proj3d.py @@ -7,8 +7,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six -from matplotlib.externals.six.moves import zip +import six +from six.moves import zip from matplotlib.collections import LineCollection from matplotlib.patches import Circle diff --git a/lib/mpl_toolkits/tests/__init__.py b/lib/mpl_toolkits/tests/__init__.py index 9b06bd1cbc91..b8b250f0c03d 100644 --- a/lib/mpl_toolkits/tests/__init__.py +++ b/lib/mpl_toolkits/tests/__init__.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import difflib import os diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py index c20826604b35..231f45dccb04 100644 --- a/lib/mpl_toolkits/tests/test_axes_grid1.py +++ b/lib/mpl_toolkits/tests/test_axes_grid1.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six +import six import matplotlib.pyplot as plt from matplotlib.testing.decorators import image_comparison, cleanup diff --git a/setup.py b/setup.py index db00a6ed2241..5fdc01d1a3f1 100644 --- a/setup.py +++ b/setup.py @@ -67,6 +67,7 @@ setupext.Platform(), 'Required dependencies and extensions', setupext.Numpy(), + setupext.Six(), setupext.Dateutil(), setupext.FuncTools32(), setupext.Pytz(), @@ -86,7 +87,6 @@ setupext.Delaunay(), setupext.QhullWrap(), setupext.Tri(), - setupext.Externals(), 'Optional subpackages', setupext.SampleData(), setupext.Toolkits(), diff --git a/setupext.py b/setupext.py index c4680626486c..514ab795eefa 100755 --- a/setupext.py +++ b/setupext.py @@ -1283,11 +1283,31 @@ def get_extension(self): return ext -class Externals(SetupPackage): - name = "externals" +class Six(SetupPackage): + name = "six" + min_version = "1.10" - def get_packages(self): - return ['matplotlib.externals'] + def check(self): + try: + import six + except ImportError: + return ( + "six was not found." + "pip will attempt to install it " + "after matplotlib.") + + if not is_min_version(six.__version__, self.min_version): + return ("The installed version of six is {inst_ver} but " + "a the minimum required version is {min_ver}. " + "pip/easy install will attempt to install a " + "newer version." + ).format(min_ver=self.min_version, + inst_ver=six.__version__) + + return "using six version %s" % six.__version__ + + def get_install_requires(self): + return ['six>={0}'.format(self.min_version)] class Pytz(SetupPackage): pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy