BF: remove remaining matplotlib.externals.six refs

matthew-brett · matthew-brett · commit 281fec6b7308 · 2016-06-06T12:27:39.000-07:00
References remaining after reverting original change.
diff --git 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
@@ -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/_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/animation.py b/lib/matplotlib/animation.py
@@ -652,7 +652,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/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -4,8 +4,7 @@
 from collections import OrderedDict
 
 import six
-from ix.moves import xrange
-from matplotlib.externals.six import unichr
+from six.moves import xrange, unichr
 
 import os, base64, tempfile, gzip, io, sys, codecs, re
 
diff --git 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/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_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/mpl_toolkits/axisartist/axes_divider.py b/lib/mpl_toolkits/axisartist/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/axisartist/axes_grid.py b/lib/mpl_toolkits/axisartist/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/axisartist/axes_rgb.py b/lib/mpl_toolkits/axisartist/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/axisartist/parasite_axes.py b/lib/mpl_toolkits/axisartist/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, \
