Fix PEP8 coding style violations

`pep8 *.py --ignore=E501` gives no output anymore.

TODO: Fix long lines

As part of http://24pullrequests.com

Author: habi

boilerplate.py

@@ -36,8 +36,8 @@
 # appended
 PYPLOT_MAGIC_HEADER = '################# REMAINING CONTENT GENERATED BY boilerplate.py ##############\n'
 
-PYPLOT_PATH = os.path.join(os.path.dirname(__file__), 'lib',
-                               'matplotlib', 'pyplot.py')
+PYPLOT_PATH = os.path.join(os.path.dirname(__file__), 'lib', 'matplotlib',
+                           'pyplot.py')
 
 
 AUTOGEN_MSG = """
@@ -150,7 +150,7 @@ def boilerplate_gen():
         'vlines',
         'xcorr',
         'barbs',
-        )
+    )
 
     _misccommands = (
         'cla',
@@ -164,25 +164,24 @@ def boilerplate_gen():
         'tick_params',
         'margins',
         'autoscale',
-        )
+    )
 
     cmappable = {
-        'contour' : 'if %(ret)s._A is not None: sci(%(ret)s)',
+        'contour': 'if %(ret)s._A is not None: sci(%(ret)s)',
         'contourf': 'if %(ret)s._A is not None: sci(%(ret)s)',
-        'hexbin' :  'sci(%(ret)s)',
-        'scatter' : 'sci(%(ret)s)',
-        'pcolor'  : 'sci(%(ret)s)',
+        'hexbin': 'sci(%(ret)s)',
+        'scatter': 'sci(%(ret)s)',
+        'pcolor': 'sci(%(ret)s)',
         'pcolormesh': 'sci(%(ret)s)',
-        'hist2d' : 'sci(%(ret)s[-1])',
-        'imshow'  : 'sci(%(ret)s)',
+        'hist2d': 'sci(%(ret)s[-1])',
+        'imshow': 'sci(%(ret)s)',
         #'spy'    :  'sci(%(ret)s)',  ### may return image or Line2D
-        'quiver' :  'sci(%(ret)s)',
-        'specgram'  : 'sci(%(ret)s[-1])',
-        'streamplot' :  'sci(%(ret)s.lines)',
-        'tricontour' : 'if %(ret)s._A is not None: sci(%(ret)s)',
+        'quiver': 'sci(%(ret)s)',
+        'specgram': 'sci(%(ret)s[-1])',
+        'streamplot': 'sci(%(ret)s.lines)',
+        'tricontour': 'if %(ret)s._A is not None: sci(%(ret)s)',
         'tricontourf': 'if %(ret)s._A is not None: sci(%(ret)s)',
-        'tripcolor'  : 'sci(%(ret)s)',
-
+        'tripcolor': 'sci(%(ret)s)',
     }
 
     def format_value(value):
@@ -196,9 +195,9 @@ def format_value(value):
                 return '=mlab.' + value.__name__
             if value.__name__ == 'mean':
                 return '=np.' + value.__name__
-            raise ValueError(('default value %s unknown to boilerplate.' + \
+            raise ValueError(('default value %s unknown to boilerplate.' +
                              'formatvalue') % value)
-        return '='+repr(value)
+        return '=' + repr(value)
 
     text_wrapper = textwrap.TextWrapper(break_long_words=False)
 
@@ -214,7 +213,7 @@ def format_value(value):
 
             # Get argspec of wrapped function
             args, varargs, varkw, defaults = inspect.getargspec(getattr(Axes, func))
-            args.pop(0) # remove 'self' argument
+            args.pop(0)  # remove 'self' argument
             if defaults is None:
                 defaults = ()
             else:
@@ -234,9 +233,9 @@ def format_value(value):
                     call.append('%s=%s' % (arg, arg))
 
             if varargs is not None:
-                call.append('*'+varargs)
+                call.append('*' + varargs)
             if varkw is not None:
-                call.append('**'+varkw)
+                call.append('**' + varkw)
             call = ', '.join(call)
 
             text_wrapper.width = 80 - 19 - len(func)
@@ -257,7 +256,7 @@ def format_value(value):
             # Now we can build the argspec for defining the wrapper
             argspec = inspect.formatargspec(args, varargs, varkw, defaults,
                                             formatvalue=format_value)
-            argspec = argspec[1:-1] # remove parens
+            argspec = argspec[1:-1]  # remove parens
 
             text_wrapper.width = 80 - 5 - len(func)
             join_with = '\n' + ' ' * (5 + len(func))
@@ -268,9 +267,9 @@ def format_value(value):
             washold, ret, ax = 'washold', 'ret', 'ax'
             bad = set(args) | set((varargs, varkw))
             while washold in bad or ret in bad or ax in bad:
-                washold = 'washold' + str(random.randrange(10**12))
-                ret = 'ret' + str(random.randrange(10**12))
-                ax = 'ax' + str(random.randrange(10**12))
+                washold = 'washold' + str(random.randrange(10 ** 12))
+                ret = 'ret' + str(random.randrange(10 ** 12))
+                ax = 'ax' + str(random.randrange(10 ** 12))
 
             # Since we can't avoid using some function names,
             # bail out if they are used as argument names
@@ -287,10 +286,10 @@ def format_value(value):
         'cool',
         'copper',
         'flag',
-        'gray' ,
+        'gray',
         'hot',
         'hsv',
-        'jet' ,
+        'jet',
         'pink',
         'prism',
         'spring',
@@ -305,15 +304,15 @@ def format_value(value):
     yield ''
     yield '_setup_pyplot_info_docstrings()'
 
+
 def build_pyplot():
     pyplot_path = os.path.join(os.path.dirname(__file__), 'lib',
                                'matplotlib', 'pyplot.py')
 
     pyplot_orig = open(pyplot_path, 'r').readlines()
 
-
     try:
-        pyplot_orig = pyplot_orig[:pyplot_orig.index(PYPLOT_MAGIC_HEADER)+1]
+        pyplot_orig = pyplot_orig[:pyplot_orig.index(PYPLOT_MAGIC_HEADER) + 1]
     except IndexError:
         raise ValueError('The pyplot.py file *must* have the exact line: %s' % PYPLOT_MAGIC_HEADER)
 

distribute_setup.py

@@ -531,6 +531,7 @@ def _build_install_args(options):
         install_args.append('--user')
     return install_args
 
+
 def _parse_args():
     """
     Parse the command line for options
@@ -547,6 +548,7 @@ def _parse_args():
     # positional arguments are ignored
     return options
 
+
 def main(version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
     options = _parse_args()

license.py

@@ -1,4 +1,5 @@
-import sys, datetime
+import sys
+import datetime
 
 if len(sys.argv) != 3:
     print >>sys.stderr, 'Usage: license.py version_num filename'
@@ -60,4 +61,3 @@
 
 
 file(sys.argv[2], 'w').write(s)
-

setup.py

@@ -136,7 +136,6 @@
     setup_requires = []
     default_backend = None
 
-
     # Go through all of the packages and figure out which ones we are
     # going to build/install.
     print_line()
@@ -169,7 +168,6 @@
                         default_backend = package.name
     print_raw('')
 
-
     # Abort if any of the required packages can not be built.
     if required_failed:
         print_line()
@@ -179,7 +177,6 @@
             ', '.join(x.name for x in required_failed))
         sys.exit(1)
 
-
     # Now collect all of the information we need to build all of the
     # packages.
     for package in good_packages:
@@ -208,7 +205,6 @@
     with open('lib/matplotlib/mpl-data/matplotlibrc', 'w') as fd:
         fd.write(template % {'backend': default_backend})
 
-
     # Build in verbose mode if requested
     if setupext.options['verbose']:
         for mod in ext_modules:
@@ -245,7 +241,7 @@
         """,
         license="BSD",
         packages=packages,
-        namespace_packages = namespace_packages,
+        namespace_packages=namespace_packages,
         platforms='any',
         py_modules=py_modules,
         ext_modules=ext_modules,

setupext.py

@@ -201,6 +201,8 @@ def print_line(*args, **kwargs):
 
 # Remove the -Wstrict-prototypesoption, is it's not valid for C++
 customize_compiler = sysconfig.customize_compiler
+
+
 def my_customize_compiler(compiler):
     retval = customize_compiler(compiler)
     try:
@@ -373,7 +375,6 @@ def get_namespace_packages(self):
         """
         return []
 
-
     def get_py_modules(self):
         """
         Get a list of top-level modules to add to the configuration.
@@ -645,7 +646,6 @@ def check(self):
                         'suite.  pip/easy_install may attempt to install it '
                         'after matplotlib.')
 
-
         bad_nose = msg_template.format(
             package='nose %s or later' % self.nose_min_version
         )
@@ -658,7 +658,6 @@ def check(self):
         except ImportError:
             msgs += [bad_nose]
 
-
         if sys.version_info >= (3, 3):
             msgs += ['using unittest.mock']
         else:
@@ -695,6 +694,7 @@ def get_install_requires(self):
             requires += ['mock']
         return requires
 
+
 class Toolkits_Tests(Tests):
     name = "toolkits_tests"
 
@@ -929,7 +929,6 @@ def add_flags(self, ext):
             default_libraries=['freetype', 'z'])
 
 
-
 class FT2Font(SetupPackage):
     name = 'ft2font'
 
@@ -1971,6 +1970,7 @@ def backend_pyside_internal_check(self):
         return ("Qt: %s, PySide: %s" %
                 (QtCore.__version__, __version__))
 
+
 def backend_pyqt4_internal_check(self):
     try:
         from PyQt4 import QtCore
@@ -1986,6 +1986,7 @@ def backend_pyqt4_internal_check(self):
         BackendAgg.force = True
         return ("Qt: %s, PyQt: %s" % (self.convert_qt_version(qt_version), pyqt_version_str))
 
+
 def backend_qt4_internal_check(self):
     successes = []
     failures = []
@@ -2001,7 +2002,8 @@ def backend_qt4_internal_check(self):
 
     if len(successes) == 0:
         raise CheckFailed('; '.join(failures))
-    return '; '.join(successes+failures)
+    return '; '.join(successes + failures)
+
 
 class BackendQt4(BackendQtBase):
     name = "qt4agg"