Fixed some PEP8 violations to leave the code cleaner than I found it.

breedlun · breedlun · commit 6a5791d9fd58 · 2015-02-07T09:38:10.000-07:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -13,8 +13,6 @@
 from numpy import ma
 
 import matplotlib
-rcParams = matplotlib.rcParams
-
 from matplotlib import cbook
 from matplotlib.cbook import _string_to_bool
 from matplotlib import docstring
@@ -31,10 +29,9 @@
 import matplotlib.text as mtext
 import matplotlib.image as mimage
 from matplotlib.artist import allow_rasterization
-
-
 from matplotlib.cbook import iterable
 
+rcParams = matplotlib.rcParams
 
 is_string_like = cbook.is_string_like
 is_sequence_of_strings = cbook.is_sequence_of_strings
@@ -1241,8 +1238,9 @@ def apply_aspect(self, position=None):
         Xsize = ysize / data_ratio
         Xmarg = Xsize - xr
         Ymarg = Ysize - yr
-        xm = 0  # Setting these targets to, e.g., 0.05*xr does not seem to
-                # help.
+        # Setting these targets to, e.g., 0.05*xr does not seem to
+        # help.
+        xm = 0
         ym = 0
         #print 'xmin, xmax, ymin, ymax', xmin, xmax, ymin, ymax
         #print 'xsize, Xsize, ysize, Ysize', xsize, Xsize, ysize, Ysize
@@ -1402,7 +1400,7 @@ def get_yticklines(self):
         return cbook.silent_list('Line2D ytickline',
                                  self.yaxis.get_ticklines())
 
-    #### Adding and tracking artists
+    # Adding and tracking artists
 
     def _sci(self, im):
         """
@@ -1984,7 +1982,7 @@ def autoscale_view(self, tight=None, scalex=True, scaley=True):
                 y0, y1 = ylocator.view_limits(y0, y1)
             self.set_ybound(y0, y1)
 
-    #### Drawing
+    # Drawing
 
     @allow_rasterization
     def draw(self, renderer=None, inframe=False):
@@ -2133,7 +2131,7 @@ def redraw_in_frame(self):
     def get_renderer_cache(self):
         return self._cachedRenderer
 
-    #### Axes rectangle characteristics
+    # Axes rectangle characteristics
 
     def get_frame_on(self):
         """
@@ -2430,7 +2428,7 @@ def set_axis_bgcolor(self, color):
         self._axisbg = color
         self.patch.set_facecolor(color)
 
-    ### data limits, ticks, tick labels, and formatting
+    # data limits, ticks, tick labels, and formatting
 
     def invert_xaxis(self):
         "Invert the x-axis."
@@ -3004,7 +3002,7 @@ def minorticks_off(self):
         self.xaxis.set_minor_locator(mticker.NullLocator())
         self.yaxis.set_minor_locator(mticker.NullLocator())
 
-    #### Interactive manipulation
+    # Interactive manipulation
 
     def can_zoom(self):
         """
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -462,8 +462,8 @@ def __init__(self, filename):
         self.fontNames = {}     # maps filenames to internal font names
         self.nextFont = 1       # next free internal font name
         self.dviFontInfo = {}   # information on dvi fonts
-        self.type1Descriptors = {}  # differently encoded Type-1 fonts may
-                                    # share the same descriptor
+        # differently encoded Type-1 fonts may share the same descriptor
+        self.type1Descriptors = {}
         self.used_characters = {}
 
         self.alphaStates = {}   # maps alpha values to graphics state objects
@@ -1233,8 +1233,8 @@ def imageObject(self, image):
         self.images[image] = (name, ob)
         return name
 
-    ## These two from backend_ps.py
-    ## TODO: alpha (SMask, p. 518 of pdf spec)
+    # These two from backend_ps.py
+    # TODO: alpha (SMask, p. 518 of pdf spec)
 
     def _rgb(self, im):
         h, w, s = im.as_rgba_str()
@@ -1452,9 +1452,18 @@ def writeXref(self):
     def writeInfoDict(self):
         """Write out the info dictionary, checking it for good form"""
 
-        is_date = lambda x: isinstance(x, datetime)
-        check_trapped = (lambda x: isinstance(x, Name) and
-                         x.name in ('True', 'False', 'Unknown'))
+#        is_date = lambda x: isinstance(x, datetime)
+#        check_trapped = (lambda x: isinstance(x, Name) and
+#                         x.name in ('True', 'False', 'Unknown'))
+        def is_date(x):
+            boolean = isinstance(x, datetime)
+            return(boolean)
+            
+        def check_trapped(x):
+            boolean = isinstance(x, Name) and \
+                x.name in ('True', 'False', 'Unknown')
+            return(boolean)
+            
         keywords = {'Title': is_string_like,
                     'Author': is_string_like,
                     'Subject': is_string_like,
diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
@@ -57,7 +57,7 @@ def test_multipage_pagecount():
 def test_multipage_keep_empty():
     from matplotlib.backends.backend_pdf import PdfPages
     from tempfile import NamedTemporaryFile
-    ### test empty pdf files
+    # test empty pdf files
     # test that an empty pdf is left behind with keep_empty=True (default)
     with NamedTemporaryFile(delete=False) as tmp:
         with PdfPages(tmp) as pdf:
@@ -68,7 +68,7 @@ def test_multipage_keep_empty():
     with PdfPages(filename, keep_empty=False) as pdf:
         pass
     assert not os.path.exists(filename)
-    ### test pdf files with content, they should never be deleted
+    # test pdf files with content, they should never be deleted
     fig = plt.figure()
     ax = fig.add_subplot(111)
     ax.plot([1, 2, 3])
