BF: remove remaining matplotlib.externals.six refs

References remaining after reverting original change.

Author: matthew-brett

Diff for: 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 for: 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 for: 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 for: lib/matplotlib/animation.py

@@ -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 for: lib/matplotlib/backends/backend_svg.py

@@ -4,8 +4,8 @@
 from collections import OrderedDict
 
 import six
-from ix.moves import xrange
-from matplotlib.externals.six import unichr
+from six import unichr
+from six.moves import xrange
 
 import os, base64, tempfile, gzip, io, sys, codecs, re
 

Diff for: 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 for: 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 for: 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