fix all issues in the output of the pep8 unit test

matplotlib · WeatherGod · Nov 15, 2014 · Nov 9, 2014 · Nov 9, 2014 · Nov 9, 2014
commit 1e822e9dfefa6c6b136b93de5034eb30a659514d
diff --git a/examples/event_handling/path_editor.py b/examples/event_handling/path_editor.py
@@ -92,7 +92,7 @@ def button_press_callback(self, event):
         'whenever a mouse button is pressed'
         if not self.showverts:
             return
-        if event.inaxes == None:
+        if event.inaxes is None:
             return
         if event.button != 1:
             return

diff --git a/examples/event_handling/poly_editor.py b/examples/event_handling/poly_editor.py
@@ -83,7 +83,7 @@ def button_press_callback(self, event):
         'whenever a mouse button is pressed'
         if not self.showverts:
             return
-        if event.inaxes == None:
+        if event.inaxes is None:
             return
         if event.button != 1:
             return

diff --git a/examples/pylab_examples/broken_axis.py b/examples/pylab_examples/broken_axis.py
@@ -6,10 +6,10 @@
 
 
 # 30 points between 0 0.2] originally made using np.random.rand(30)*.2
-pts = np.array([0.015,  0.166,  0.133,  0.159,  0.041,  0.024,  0.195,
-                0.039, 0.161,  0.018,  0.143,  0.056,  0.125,  0.096,  0.094, 0.051,
-                0.043,  0.021,  0.138,  0.075,  0.109,  0.195,  0.05 , 0.074, 0.079,
-                0.155,  0.02 ,  0.01 ,  0.061,  0.008])
+pts = np.array([
+    0.015, 0.166, 0.133, 0.159, 0.041, 0.024, 0.195, 0.039, 0.161, 0.018,
+    0.143, 0.056, 0.125, 0.096, 0.094, 0.051, 0.043, 0.021, 0.138, 0.075,
+    0.109, 0.195, 0.050, 0.074, 0.079, 0.155, 0.020, 0.010, 0.061, 0.008])
 
 # Now let's make two outlier points which are far away from everything.
 pts[[3, 14]] += .8

diff --git a/examples/pylab_examples/data_helper.py b/examples/pylab_examples/data_helper.py
@@ -38,6 +38,7 @@ def get_daily_data():
     """
     class C:
         pass
+
     def get_ticker(ticker):
         vals = []
 

diff --git a/examples/pylab_examples/date_demo1.py b/examples/pylab_examples/date_demo1.py
@@ -25,8 +25,7 @@
 months = MonthLocator()  # every month
 yearsFmt = DateFormatter('%Y')
 
-quotes = quotes_historical_yahoo_ochl(
-    'INTC', date1, date2)
+quotes = quotes_historical_yahoo_ochl('INTC', date1, date2)
 if len(quotes) == 0:
     raise SystemExit
 
@@ -44,7 +43,8 @@
 
 
 # format the coords message box
-def price(x): return '$%1.2f' % x
+def price(x):
+    return '$%1.2f' % x
 ax.fmt_xdata = DateFormatter('%Y-%m-%d')
 ax.fmt_ydata = price
 ax.grid(True)

diff --git a/examples/pylab_examples/histogram_percent_demo.py b/examples/pylab_examples/histogram_percent_demo.py
@@ -10,7 +10,7 @@ def to_percent(y, position):
     s = str(100 * y)
 
     # The percent symbol needs escaping in latex
-    if matplotlib.rcParams['text.usetex'] == True:
+    if matplotlib.rcParams['text.usetex'] is True:
         return s + r'$\%$'
     else:
         return s + '%'

diff --git a/examples/pylab_examples/line_collection.py b/examples/pylab_examples/line_collection.py
@@ -32,8 +32,9 @@
 # See matplotlib.collections.LineCollection for more information
 line_segments = LineCollection(segs,
                                linewidths=(0.5, 1, 1.5, 2),
-                               colors        = [colorConverter.to_rgba(i)
-                                                for i in ('b', 'g', 'r', 'c', 'm', 'y', 'k')],
+                               colors=[colorConverter.to_rgba(i)
+                                       for i in ('b', 'g', 'r', 'c',
+                                                 'm', 'y', 'k')],
                                linestyle = 'solid')
 ax.add_collection(line_segments)
 ax.set_title('Line collection with masked arrays')

diff --git a/examples/user_interfaces/embedding_in_tk_canvas.py b/examples/user_interfaces/embedding_in_tk_canvas.py
@@ -7,17 +7,18 @@
 import matplotlib.backends.tkagg as tkagg
 from matplotlib.backends.backend_agg import FigureCanvasAgg
 
-def draw_figure(canvas, figure, loc=[0,0]):
+
+def draw_figure(canvas, figure, loc=[0, 0]):
     """ Draw a matplotlib figure onto a Tk canvas
-    
+
     loc: location of top-left corner of figure on canvas in pixels.
 
     Inspired by matplotlib source: lib/matplotlib/backends/backend_tkagg.py
     """
     figure_canvas_agg = FigureCanvasAgg(figure)
     figure_canvas_agg.draw()
     figure_x, figure_y, figure_w, figure_h = figure.bbox.bounds
-    figure_w, figure_h  = int(figure_w), int(figure_h)
+    figure_w, figure_h = int(figure_w), int(figure_h)
     photo = tk.PhotoImage(master=canvas, width=figure_w, height=figure_h)
 
     # Position: convert from top-left anchor to center anchor
@@ -43,7 +44,7 @@ def draw_figure(canvas, figure, loc=[0,0]):
 
 # Create the figure we desire to add to an existing canvas
 fig = mpl.figure.Figure(figsize=(2, 1))
-ax = fig.add_axes([0,0,1,1])
+ax = fig.add_axes([0, 0, 1, 1])
 ax.plot(X, Y)
 
 # Keep this handle alive, or else figure will disappear

diff --git a/examples/user_interfaces/interactive.py b/examples/user_interfaces/interactive.py
@@ -54,7 +54,7 @@ def __init__(self, on_kill=None, *args, **kw):
         # Check that all things to kill are callable:
         for _ in on_kill:
             if not callable(_):
-                raise TypeError, 'on_kill must be a list of callables'
+                raise TypeError('on_kill must be a list of callables')
         self.on_kill = on_kill
         # Set up tab-completer
         if has_readline:

diff --git a/examples/user_interfaces/interactive2.py b/examples/user_interfaces/interactive2.py
@@ -134,7 +134,7 @@ def write(self, text):
 
         end = self.buffer.get_end_iter()
 
-        if not self.view == None:
+        if self.view is not None:
             self.view.scroll_to_mark(self.mark, 0, True, 1, 1)
 
         self.buffer.insert_with_tags(end, text, self.style)
@@ -225,7 +225,7 @@ def prompt_ps2(self):
 
     def write_line(self, text, style=None):
         start, end = self.text.get_buffer().get_bounds()
-        if style == None:
+        if style is None:
             self.text.get_buffer().insert(end, text)
         else:
             self.text.get_buffer().insert_with_tags(end, text, style)
@@ -325,7 +325,7 @@ def complete_line(self):
 
         completions = []
         p = self.completer.complete(token, len(completions))
-        while p != None:
+        while p is not None:
             completions.append(p)
             p = self.completer.complete(token, len(completions))
 
@@ -353,7 +353,7 @@ def destroy(arg=None):
         gtk.main_quit()
 
     def key_event(widget, event):
-        if gtk.gdk.keyval_name( event.keyval) == 'd' and \
+        if gtk.gdk.keyval_name(event.keyval) == 'd' and \
                 event.state & gtk.gdk.CONTROL_MASK:
             destroy()
         return False

diff --git a/examples/user_interfaces/mathtext_wx.py b/examples/user_interfaces/mathtext_wx.py
@@ -30,10 +30,10 @@ def mathtext_to_wxbitmap(s):
 ############################################################
 
 functions = [
-    (r'$\sin(2 \pi x)$',      lambda x: sin(2*pi*x)),
-    (r'$\frac{4}{3}\pi x^3$', lambda x: (4.0 / 3.0) * pi * x**3),
-    (r'$\cos(2 \pi x)$',      lambda x: cos(2*pi*x)),
-    (r'$\log(x)$',            lambda x: log(x))
+    (r'$\sin(2 \pi x)$', lambda x: sin(2*pi*x)),
+    (r'$\frac{4}{3}\pi x^3$', lambda x: (4.0/3.0)*pi*x**3),
+    (r'$\cos(2 \pi x)$', lambda x: cos(2*pi*x)),
+    (r'$\log(x)$', lambda x: log(x))
 ]
 
 

diff --git a/lib/matplotlib/tests/test_coding_standards.py b/lib/matplotlib/tests/test_coding_standards.py
@@ -276,7 +276,7 @@ def test_pep8_conformance_examples():
     assert_pep8_conformance(dirname=exdir,
                             extra_exclude_directories=blacklist,
                             pep8_additional_ignore=PEP8_ADDITIONAL_IGNORE +
-                            ['E501'],
+                            ['E203', 'E228', 'E261', 'E262', 'E501'],
                             expected_bad_files=())
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,7 @@ def get_daily_data(): @@
         """
         class C:
             pass
         def get_ticker(ticker):
             vals = []
@@ Expand Down @@