Jun 6, 2016
diff --git a/boilerplate.py b/boilerplate.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport 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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six

 import matplotlib as mpl
 mpl.use("pgf")
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six
 import sys
 import distutils.version
 from itertools import chain
                                cycler)

 import numpy
 frommatplotlib.externals.six.moves.urllib.request import urlopen
 frommatplotlib.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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six


 BASE_COLORS = {
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six

 latex_to_bakoma = {
    '\\__sqrt__'                 : ('cmex10', 0x70),
diff --git a/lib/matplotlib/_pylab_helpers.py b/lib/matplotlib/_pylab_helpers.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six
 import sys
 import gc
 import atexit
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 frommatplotlib.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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 frommatplotlib.externals.six.moves import xrange, zip
 import six
 from six.moves import xrange, zip

 import os
 import platform
    def _init_from_registry(cls):
        if sys.platform != 'win32' or rcParams[cls.exec_key] != 'convert':
            return
        frommatplotlib.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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six
 from collections import OrderedDict

 import re
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 frommatplotlib.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

 from collections import OrderedDict

 from matplotlib.externalsimport six
 frommatplotlib.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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 frommatplotlib.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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport 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
                        unicode_literals)
 from contextlib import contextmanager

 from matplotlib.externalsimport six
 frommatplotlib.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

 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)
 from matplotlib.externalsimport six
 import six
 import warnings

 import matplotlib.cbook as cbook
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
 from matplotlib._pylab_helpers import Gcf
 import matplotlib.cbook as cbook
 from weakref import WeakKeyDictionary
 from matplotlib.externalsimport six
 import six
 import time
 import warnings

diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six

 import matplotlib
 import inspect
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport 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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six

 import os, sys, warnings, gzip

diff --git a/lib/matplotlib/backends/backend_cocoaagg.py b/lib/matplotlib/backends/backend_cocoaagg.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 frommatplotlib.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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six

 import math
 import os
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport 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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport 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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport 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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport 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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six

 import os

diff --git a/lib/matplotlib/backends/backend_gtkcairo.py b/lib/matplotlib/backends/backend_gtkcairo.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport 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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six

 import os

diff --git a/lib/matplotlib/backends/backend_mixed.py b/lib/matplotlib/backends/backend_mixed.py

 import numpy as np

 from matplotlib.externalsimport 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
 from tempfile import mkdtemp
 import shutil
 import os
 from matplotlib.externalsimport six
 import six
 from uuid import uuid4 as uuid

 from IPython.display import display, HTML
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six

 import codecs
 import os
 from functools import total_ordering

 import numpy as np
 frommatplotlib.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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six

 import math
 import os
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 frommatplotlib.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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 frommatplotlib.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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport 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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)
 from matplotlib.externalsimport six
 import six

 import os
 import re
 import signal
 import sys
 frommatplotlib.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
 from __future__ import (absolute_import, division, print_function,
                        unicode_literals)

 from matplotlib.externalsimport six
 import six

 import sys
 import ctypes
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py

 from collections import OrderedDict

 from matplotlib.externalsimport six
 frommatplotlib.externals.six.moves importxrange
 frommatplotlib.externals.six importunichr
 import six
 from six importunichr
 from six.moves importxrange

 import os, base64, tempfile, gzip, io, sys, codecs, re
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,7 +20,7 @@
		from __future__ import (absolute_import, division, print_function,
		unicode_literals)

		from matplotlib.externalsimport six
		import six

		import os
		import inspect
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,7 @@
		from __future__ import (absolute_import, division, print_function,
		unicode_literals)

		from matplotlib.externalsimport six
		import six

		import matplotlib as mpl
		mpl.use("pgf")
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -102,7 +102,7 @@
		from __future__ import (absolute_import, division, print_function,
		unicode_literals)

		from matplotlib.externalsimport six
		import six
		import sys
		import distutils.version
		from itertools import chain
Expand All		@@ -126,8 +126,8 @@
		cycler)

		import numpy
		frommatplotlib.externals.six.moves.urllib.request import urlopen
		frommatplotlib.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.
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,7 @@
		from __future__ import (absolute_import, division, print_function,
		unicode_literals)

		from matplotlib.externalsimport six
		import six


		BASE_COLORS = {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,7 @@
		from __future__ import (absolute_import, division, print_function,
		unicode_literals)

		from matplotlib.externalsimport six
		import six

		latex_to_bakoma = {
		'\\__sqrt__' : ('cmex10', 0x70),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,8 +36,8 @@
		from __future__ import (absolute_import, division, print_function,
		unicode_literals)

		from matplotlib.externalsimport six
		frommatplotlib.externals.six.moves import map
		import six
		from six.moves import map

		import sys
		import os
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,8 +20,8 @@
		from __future__ import (absolute_import, division, print_function,
		unicode_literals)

		from matplotlib.externalsimport six
		frommatplotlib.externals.six.moves import xrange, zip
		import six
		from six.moves import xrange, zip

		import os
		import platform
Expand DownExpand Up		@@ -652,7 +652,7 @@ def output_args(self):
		def _init_from_registry(cls):
		if sys.platform != 'win32' or rcParams[cls.exec_key] != 'convert':
		return
		frommatplotlib.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,
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,8 +1,8 @@
		from __future__ import (absolute_import, division, print_function,
		unicode_literals)

		from matplotlib.externalsimport six
		frommatplotlib.externals.six.moves import reduce, xrange, zip, zip_longest
		import six
		from six.moves import reduce, xrange, zip, zip_longest

		import itertools
		import math
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,8 +3,8 @@

		from collections import OrderedDict

		from matplotlib.externalsimport six
		frommatplotlib.externals.six.moves import xrange
		import six
		from six.moves import xrange

		import itertools
		import warnings
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,7 @@

		from __future__ import (absolute_import, division, print_function,
		unicode_literals)
		from matplotlib.externalsimport six
		import six
		import warnings

		import matplotlib.cbook as cbook
Expand Down