Merge pull request matplotlib#4081 from tacaswell/pep8_version_fix

Pep8 version fixes

Author: efiring

doc/api/api_changes/code_removal.rst

@@ -3,7 +3,7 @@ Code Removal
 
 Legend
 ------
- - Removed handling of `loc` as a positional argument to `Legend`
+Removed handling of `loc` as a positional argument to `Legend`
 
 
 Legend handlers
@@ -78,3 +78,10 @@ Deprecated in 2009.
 Remove ``NavigationToolbar2QTAgg``
 ----------------------------------
 Added no functionality over the base ``NavigationToolbar2Qt``
+
+
+mpl.py
+------
+
+Remove the module `matplotlib.mpl`.  Deprecated in 1.3 by
+PR #1670 and commit 78ce67d161625833cacff23cfe5d74920248c5b2

examples/animation/strip_chart_demo.py

@@ -8,7 +8,7 @@
 import matplotlib.animation as animation
 
 
-class Scope(object)
+class Scope(object):
     def __init__(self, ax, maxt=2, dt=0.02):
         self.ax = ax
         self.dt = dt

examples/axes_grid/demo_axes_grid2.py

@@ -37,10 +37,10 @@ def add_inner_title(ax, title, loc, size=None, **kwargs):
     grid = ImageGrid(F, 211,  # similar to subplot(111)
                      nrows_ncols=(1, 3),
                      direction="row",
-                     axes_pad = 0.05,
+                     axes_pad=0.05,
                      add_all=True,
-                     label_mode = "1",
-                     share_all = True,
+                     label_mode="1",
+                     share_all=True,
                      cbar_location="top",
                      cbar_mode="each",
                      cbar_size="7%",
@@ -75,10 +75,10 @@ def add_inner_title(ax, title, loc, size=None, **kwargs):
     grid2 = ImageGrid(F, 212,
                       nrows_ncols=(1, 3),
                       direction="row",
-                      axes_pad = 0.05,
+                      axes_pad=0.05,
                       add_all=True,
-                      label_mode = "1",
-                      share_all = True,
+                      label_mode="1",
+                      share_all=True,
                       cbar_location="right",
                       cbar_mode="single",
                       cbar_size="10%",

examples/axes_grid/demo_edge_colorbar.py

@@ -17,13 +17,13 @@ def demo_bottom_cbar(fig):
     """
     grid = AxesGrid(fig, 121,  # similar to subplot(132)
                     nrows_ncols=(2, 2),
-                    axes_pad = 0.10,
+                    axes_pad=0.10,
                     share_all=True,
-                    label_mode = "1",
-                    cbar_location = "bottom",
+                    label_mode="1",
+                    cbar_location="bottom",
                     cbar_mode="edge",
-                    cbar_pad = 0.25,
-                    cbar_size = "15%",
+                    cbar_pad=0.25,
+                    cbar_size="15%",
                     direction="column"
                     )
 
@@ -51,9 +51,9 @@ def demo_right_cbar(fig):
 
     grid = AxesGrid(F, 122,  # similar to subplot(122)
                     nrows_ncols=(2, 2),
-                    axes_pad = 0.10,
-                    label_mode = "1",
-                    share_all = True,
+                    axes_pad=0.10,
+                    label_mode="1",
+                    share_all=True,
                     cbar_location="right",
                     cbar_mode="edge",
                     cbar_size="7%",

examples/event_handling/lasso_demo.py

@@ -43,8 +43,8 @@ def __init__(self, ax, data):
         self.collection = RegularPolyCollection(
             fig.dpi, 6, sizes=(100,),
             facecolors=facecolors,
-            offsets = self.xys,
-            transOffset = ax.transData)
+            offsets=self.xys,
+            transOffset=ax.transData)
 
         ax.add_collection(self.collection)
 
@@ -69,7 +69,9 @@ def onpress(self, event):
             return
         if event.inaxes is None:
             return
-        self.lasso = Lasso(event.inaxes, (event.xdata, event.ydata), self.callback)
+        self.lasso = Lasso(event.inaxes,
+                           (event.xdata, event.ydata),
+                           self.callback)
         # acquire a lock on the widget drawing
         self.canvas.widgetlock(self.lasso)
 

examples/pylab_examples/contourf_demo.py

@@ -77,8 +77,8 @@
 
 CS4 = plt.contour(X, Y, Z, levels,
                   colors=('k',),
-                  linewidths = (3,),
-                  origin = origin)
+                  linewidths=(3,),
+                  origin=origin)
 plt.title('Listed colors (3 masked regions)')
 plt.clabel(CS4, fmt='%2.1f', colors='w', fontsize=14)
 
@@ -95,7 +95,7 @@
 # instead of using the "bad" colormap value for them, it draws
 # nothing at all in them.  Therefore the following would have
 # no effect:
-#cmap.set_bad("red")
+# cmap.set_bad("red")
 
 fig, axs = plt.subplots(2, 2)
 for ax, extend in zip(axs.ravel(), extends):

examples/tests/backend_driver.py

@@ -342,9 +342,9 @@ def report_all_missing(directories):
 
 failbackend = dict(
     svg=('tex_demo.py', ),
-    agg = ('hyperlinks.py', ),
-    pdf = ('hyperlinks.py', ),
-    ps = ('hyperlinks.py', ),
+    agg=('hyperlinks.py', ),
+    pdf=('hyperlinks.py', ),
+    ps=('hyperlinks.py', ),
     )
 
 

lib/matplotlib/__init__.py

@@ -107,6 +107,26 @@
 import distutils.version
 from itertools import chain
 
+import io
+import locale
+import os
+import re
+import tempfile
+import warnings
+import contextlib
+import distutils.sysconfig
+
+# cbook must import matplotlib only within function
+# definitions, so it is safe to import from it here.
+from matplotlib.cbook import is_string_like, mplDeprecation
+from matplotlib.compat import subprocess
+from matplotlib.rcsetup import (defaultParams,
+                                validate_backend)
+
+import numpy
+from six.moves.urllib.request import urlopen
+from six.moves import reload_module as reload
+
 __version__ = str('1.5.dev1')
 __version__numpy__ = str('1.6')  # minimum required numpy version
 
@@ -164,51 +184,18 @@ def _forward_ilshift(self, other):
             return self
         pyparsing.Forward.__ilshift__ = _forward_ilshift
 
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
-
-import io
-import locale
-import os
-import re
-import tempfile
-import warnings
-import contextlib
-import distutils.sysconfig
-
-# cbook must import matplotlib only within function
-# definitions, so it is safe to import from it here.
-from matplotlib.cbook import is_string_like, mplDeprecation
-from matplotlib.compat import subprocess
-
-try:
-    reload
-except NameError:
-    # Python 3
-    from imp import reload
-
 
 if not hasattr(sys, 'argv'):  # for modpython
     sys.argv = [str('modpython')]
 
 
-from matplotlib.rcsetup import (defaultParams,
-                                validate_backend)
-
 major, minor1, minor2, s, tmp = sys.version_info
-_python24 = (major == 2 and minor1 >= 4) or major >= 3
+_python26 = (major == 2 and minor1 >= 6) or major >= 3
 
-# the havedate check was a legacy from old matplotlib which preceeded
-# datetime support
-_havedate = True
+if not _python26:
+    raise ImportError('matplotlib requires Python 2.6 or later')
 
-if not _python24:
-    raise ImportError('matplotlib requires Python 2.4 or later')
 
-
-import numpy
 if not compare_versions(numpy.__version__, __version__numpy__):
     raise ImportError(
         'numpy %s or later is required; you have %s' % (
@@ -1125,7 +1112,6 @@ def rc_params_from_file(fname, fail_on_error=False, use_default_template=True):
 rcParams['text.usetex'] = checkdep_usetex(rcParams['text.usetex'])
 
 if rcParams['axes.formatter.use_locale']:
-    import locale
     locale.setlocale(locale.LC_ALL, '')
 
 

lib/matplotlib/axes/_axes.py

@@ -11,7 +11,6 @@
 from numpy import ma
 
 import matplotlib
-rcParams = matplotlib.rcParams
 
 import matplotlib.cbook as cbook
 from matplotlib.cbook import _string_to_bool, mplDeprecation
@@ -40,6 +39,8 @@
 from matplotlib.axes._base import _AxesBase
 from matplotlib.axes._base import _process_plot_format
 
+rcParams = matplotlib.rcParams
+
 iterable = cbook.iterable
 is_string_like = cbook.is_string_like
 is_sequence_of_strings = cbook.is_sequence_of_strings

lib/matplotlib/axes/_base.py

@@ -13,7 +13,6 @@
 from numpy import ma
 
 import matplotlib
-rcParams = matplotlib.rcParams
 
 from matplotlib import cbook
 from matplotlib.cbook import _string_to_bool
@@ -35,6 +34,7 @@
 
 from matplotlib.cbook import iterable
 
+rcParams = matplotlib.rcParams
 
 is_string_like = cbook.is_string_like
 is_sequence_of_strings = cbook.is_sequence_of_strings