Trivial fixes.

anntzer · anntzer · commit b1391e1f6079 · 2018-05-21T00:14:14.000-07:00
diff --git a/examples/statistics/histogram_features.py b/examples/statistics/histogram_features.py
@@ -3,20 +3,20 @@
 Demo of the histogram (hist) function with a few features
 =========================================================
 
-In addition to the basic histogram, this demo shows a few optional
-features:
+In addition to the basic histogram, this demo shows a few optional features:
 
-    * Setting the number of data bins
-    * The ``normed`` flag, which normalizes bin heights so that the
-      integral of the histogram is 1. The resulting histogram is an
-      approximation of the probability density function.
-    * Setting the face color of the bars
-    * Setting the opacity (alpha value).
+* Setting the number of data bins.
+* The ``normed`` flag, which normalizes bin heights so that the integral of
+  the histogram is 1. The resulting histogram is an approximation of the
+  probability density function.
+* Setting the face color of the bars.
+* Setting the opacity (alpha value).
 
-Selecting different bin counts and sizes can significantly affect the
-shape of a histogram. The Astropy docs have a great section on how to
-select these parameters:
-http://docs.astropy.org/en/stable/visualization/histogram.html
+Selecting different bin counts and sizes can significantly affect the shape
+of a histogram. The Astropy docs have a great section_ on how to select these
+parameters.
+
+.. _section: http://docs.astropy.org/en/stable/visualization/histogram.html
 """
 
 import matplotlib
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -515,8 +515,7 @@ def __call__(self, X, alpha=None, bytes=False):
             lut = self._lut.copy()  # Don't let alpha modify original _lut.
 
         if alpha is not None:
-            alpha = min(alpha, 1.0)  # alpha must be between 0 and 1
-            alpha = max(alpha, 0.0)
+            alpha = np.clip(alpha, 0, 1)
             if bytes:
                 alpha = int(alpha * 255)
             if (lut[-1] == 0).all():
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -1,5 +1,6 @@
 import math
 from numbers import Number
+import textwrap
 import warnings
 
 import numpy as np
@@ -1797,41 +1798,23 @@ def draw_bbox(bbox, renderer, color='k', trans=None):
     r.draw(renderer)
 
 
-def _pprint_table(_table, leadingspace=2):
+def _pprint_table(table, leadingspace=2):
     """
     Given the list of list of strings, return a string of REST table format.
     """
-    if leadingspace:
-        pad = ' ' * leadingspace
-    else:
-        pad = ''
-
-    columns = [[] for cell in _table[0]]
-
-    for row in _table:
-        for column, cell in zip(columns, row):
-            column.append(cell)
-
-    col_len = [max(len(cell) for cell in column) for column in columns]
-
-    lines = []
-    table_formatstr = pad + '   '.join([('=' * cl) for cl in col_len])
-
-    lines.append('')
-    lines.append(table_formatstr)
-    lines.append(pad + '   '.join([cell.ljust(cl)
-                                   for cell, cl
-                                   in zip(_table[0], col_len)]))
-    lines.append(table_formatstr)
-
-    lines.extend([(pad + '   '.join([cell.ljust(cl)
-                                     for cell, cl
-                                     in zip(row, col_len)]))
-                  for row in _table[1:]])
-
-    lines.append(table_formatstr)
-    lines.append('')
-    return "\n".join(lines)
+    col_len = [max(len(cell) for cell in column) for column in zip(*table)]
+    table_formatstr = '   '.join('=' * cl for cl in col_len)
+    lines = [
+        '',
+        table_formatstr,
+        '   '.join(cell.ljust(cl) for cell, cl in zip(table[0], col_len)),
+        table_formatstr,
+        *['   '.join(cell.ljust(cl) for cell, cl in zip(row, col_len))
+          for row in table[1:]],
+        table_formatstr,
+        '',
+    ]
+    return textwrap.indent('\n'.join(lines), ' ' * leadingspace)
 
 
 def _pprint_styles(_styles):
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -125,7 +125,7 @@ def __init__(self, vertices, codes=None, _interpolation_steps=1,
             and codes as read-only arrays.
         """
         vertices = _to_unmasked_float_array(vertices)
-        if (vertices.ndim != 2) or (vertices.shape[1] != 2):
+        if vertices.ndim != 2 or vertices.shape[1] != 2:
             raise ValueError(
                 "'vertices' must be a 2D list or array with shape Nx2")
 
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -779,12 +779,10 @@ def run(arguments, content, options, state_machine, state, lineno):
     for j, (code_piece, images) in enumerate(results):
         if options['include-source']:
             if is_doctest:
-                lines = ['']
-                lines += [row.rstrip() for row in code_piece.split('\n')]
+                lines = ['', *code_piece.splitlines()]
             else:
-                lines = ['.. code-block:: python', '']
-                lines += ['    %s' % row.rstrip()
-                          for row in code_piece.split('\n')]
+                lines = ['.. code-block:: python', '',
+                         *textwrap.indent(code_piece, '    ').splitlines()]
             source_code = "\n".join(lines)
         else:
             source_code = ""
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1529,9 +1529,7 @@ class FixedLocator(Locator):
 
     def __init__(self, locs, nbins=None):
         self.locs = np.asarray(locs)
-        self.nbins = nbins
-        if self.nbins is not None:
-            self.nbins = max(self.nbins, 2)
+        self.nbins = max(nbins, 2) if nbins is not None else None
 
     def set_params(self, nbins=None):
         """Set parameters within this locator."""
diff --git a/pytest.ini b/pytest.ini
@@ -10,7 +10,6 @@ markers =
 pep8ignore =
     * E111 E114 E115 E116 E121 E122 E123 E124 E125 E126 E127 E128 E129 E131 E226 E240 E241 E242 E243 E244 E245 E246 E247 E248 E249 E265 E266 E704 W503
 
-    tools/boilerplate.py E501
     setup.py E402
     setupext.py E301 E302 E501
     setup_external_compile.py E302 E711
diff --git a/tools/boilerplate.py b/tools/boilerplate.py
@@ -8,37 +8,31 @@
 itself, whereas the generatable content must be edited via templates in
 this file.
 """
-# We did try to do the wrapping the smart way,
-# with callable functions and new.function, but could never get the
-# docstrings right for python2.2.  See
-# http://groups.google.com/group/comp.lang.python/browse_frm/thread/dcd63ec13096a0f6/1b14640f3a4ad3dc?#1b14640f3a4ad3dc
-# For some later history, see
-# http://thread.gmane.org/gmane.comp.python.matplotlib.devel/7068
+
+# Although it is possible to dynamically generate the pyplot functions at
+# runtime with the proper signatures, a static pyplot.py is simpler for static
+# analysis tools to parse.
 
 import inspect
 from inspect import Signature, Parameter
-import os
-import random
+from pathlib import Path
 import textwrap
 
-# this line imports the installed copy of matplotlib, and not the local copy
+# This line imports the installed copy of matplotlib, and not the local copy.
 import numpy as np
 from matplotlib import mlab
 from matplotlib.axes import Axes
 
 
-# this is the magic line that must exist in pyplot, after which the boilerplate content will be
-# appended
-PYPLOT_MAGIC_HEADER = '################# REMAINING CONTENT GENERATED BY boilerplate.py ##############\n'
-
-PYPLOT_PATH = os.path.join(os.path.dirname(__file__), 'lib', 'matplotlib',
-                           'pyplot.py')
-
+# This is the magic line that must exist in pyplot, after which the boilerplate
+# content will be appended.
+PYPLOT_MAGIC_HEADER = (
+    "################# REMAINING CONTENT GENERATED BY boilerplate.py "
+    "##############\n")
 
 AUTOGEN_MSG = """
 # Autogenerated by boilerplate.py.  Do not edit as changes will be lost."""
 
-
 CMAPPABLE_TEMPLATE = AUTOGEN_MSG + """
 @_autogen_docstring(Axes.%(real_name)s)
 def %(func)s%(sig)s:
@@ -47,7 +41,6 @@ def %(func)s%(sig)s:
     return __ret
 """
 
-
 NON_CMAPPABLE_TEMPLATE = AUTOGEN_MSG + """
 @docstring.copy_dedent(Axes.%(real_name)s)
 def %(func)s%(sig)s:
@@ -269,25 +262,22 @@ def __repr__(self):
 
 
 def build_pyplot():
-    pyplot_path = os.path.join(os.path.dirname(__file__), "..", 'lib',
-                               'matplotlib', 'pyplot.py')
-
-    pyplot_orig = open(pyplot_path, 'r').readlines()
+    pyplot_path = Path(__file__).parent / "../lib/matplotlib/pyplot.py"
 
+    pyplot_orig = pyplot_path.read_text().splitlines(keepends=True)
     try:
         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)
 
-    pyplot = open(pyplot_path, 'w')
-    pyplot.writelines(pyplot_orig)
-    pyplot.write('\n')
-
-    pyplot.writelines(boilerplate_gen())
-    pyplot.write('\n')
+    with pyplot_path.open('w') as pyplot:
+        pyplot.writelines(pyplot_orig)
+        pyplot.write('\n')
+        pyplot.writelines(boilerplate_gen())
+        pyplot.write('\n')
 
 
 if __name__ == '__main__':
-    # Write the matplotlib.pyplot file
+    # Write the matplotlib.pyplot file.
     build_pyplot()
