Merge remote-tracking branch 'matplotlib/v2.x'

Conflicts:
	lib/matplotlib/backend_tools.py
	lib/matplotlib/font_manager.py
	lib/matplotlib/legend_handler.py
	lib/matplotlib/tests/test_dviread.py
	lib/matplotlib/tests/test_image.py
	lib/mpl_toolkits/axes_grid1/anchored_artists.py

Author: tacaswell

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

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")

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.

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 = {

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),

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

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

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
@@ -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,

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

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