Merge pull request matplotlib#10333 from anntzer/debug-prints

Remove some commented out debug prints.

Author: jklymak

examples/misc/font_indexing.py

@@ -12,7 +12,6 @@
 from matplotlib.ft2font import FT2Font, KERNING_DEFAULT, KERNING_UNFITTED, KERNING_UNSCALED
 
 
-#fname = '/usr/share/fonts/sfd/FreeSans.ttf'
 fname = matplotlib.get_data_path() + '/fonts/ttf/DejaVuSans.ttf'
 font = FT2Font(fname)
 font.set_charmap(0)
@@ -36,7 +35,7 @@
 
 code = coded['A']
 glyph = font.load_char(code)
-#print(glyph.bbox)
+print(glyph.bbox)
 print(glyphd['A'], glyphd['V'], coded['A'], coded['V'])
 print('AV', font.get_kerning(glyphd['A'], glyphd['V'], KERNING_DEFAULT))
 print('AV', font.get_kerning(glyphd['A'], glyphd['V'], KERNING_UNFITTED))

examples/tests/backend_driver_sgskip.py

@@ -467,8 +467,7 @@ def parse_options():
         switches=switches)
     if 'pylab_examples' in result.dirs:
         result.dirs[result.dirs.index('pylab_examples')] = 'pylab'
-    #print(result)
-    return (result)
+    return result
 
 if __name__ == '__main__':
     times = {}
@@ -507,9 +506,8 @@ def parse_options():
         failures[backend] = \
             drive(backend, options.dirs, python, options.switches)
         t1 = time.time()
-        times[backend] = (t1 - t0)/60.0
+        times[backend] = (t1 - t0) / 60
 
-    #print(times)
     for backend, elapsed in times.items():
         print('Backend %s took %1.2f minutes to complete' % (backend, elapsed))
         failed = failures[backend]

examples/text_labels_and_annotations/dashpointlabel.py

@@ -12,8 +12,7 @@
         (4, 2))
 # dash_style =
 #     direction, length, (text)rotation, dashrotation, push
-# (The parameters are varied to show their effects,
-# not for visual appeal).
+# (The parameters are varied to show their effects, not for visual appeal).
 dash_style = (
     (0, 20, -15, 30, 10),
     (1, 30, 0, 15, 10),
@@ -27,7 +26,6 @@
 for i in range(len(DATA)):
     (x, y) = DATA[i]
     (dd, dl, r, dr, dp) = dash_style[i]
-    # print('dashlen call %d' % dl)
     t = ax.text(x, y, str((x, y)), withdash=True,
                 dashdirection=dd,
                 dashlength=dl,
@@ -36,7 +34,7 @@
                 dashpush=dp,
                 )
 
-ax.set_xlim((0.0, 5.0))
-ax.set_ylim((0.0, 5.0))
+ax.set_xlim((0, 5))
+ax.set_ylim((0, 5))
 
 plt.show()

lib/matplotlib/axes/_axes.py

@@ -1049,7 +1049,6 @@ def vlines(self, x, ymin, ymax, colors='k', linestyles='solid',
 
         verts = [((thisx, thisymin), (thisx, thisymax))
                  for thisx, thisymin, thisymax in zip(x, ymin, ymax)]
-        #print 'creating line collection'
         lines = mcoll.LineCollection(verts, colors=colors,
                                      linestyles=linestyles, label=label)
         self.add_collection(lines, autolim=False)

lib/matplotlib/backends/backend_agg.py

@@ -205,14 +205,13 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             font.set_text(s, 0, flags=flags)
         font.draw_glyphs_to_bitmap(antialiased=rcParams['text.antialiased'])
         d = font.get_descent() / 64.0
-        # The descent needs to be adjusted for the angle
+        # The descent needs to be adjusted for the angle.
         xo, yo = font.get_bitmap_offset()
         xo /= 64.0
         yo /= 64.0
         xd = -d * sin(radians(angle))
         yd = d * cos(radians(angle))
 
-        #print x, y, int(x), int(y), s
         self._renderer.draw_text_image(
             font, np.round(x - xd + xo), np.round(y + yd + yo) + 1, angle, gc)
 

lib/matplotlib/backends/backend_pdf.py

@@ -2364,8 +2364,8 @@ def delta(self, other):
                 ours = getattr(self, p)
                 theirs = getattr(other, p)
                 try:
-                    if (ours is None or theirs is None):
-                        different = bool(not(ours is theirs))
+                    if ours is None or theirs is None:
+                        different = ours is not theirs
                     else:
                         different = bool(ours != theirs)
                 except ValueError:

lib/matplotlib/backends/backend_ps.py

@@ -364,7 +364,6 @@ def get_text_width_height_descent(self, s, prop, ismath):
         h /= 64.0
         d = font.get_descent()
         d /= 64.0
-        #print s, w, h
         return w, h, d
 
     def flipy(self):
@@ -456,7 +455,6 @@ def draw_image(self, gc, x, y, im, transform=None):
             yscale = 1.0
 
         figh = self.height * 72
-        #print 'values', origin, flipud, figh, h, y
 
         bbox = gc.get_clip_rectangle()
         clippath, clippath_trans = gc.get_clip_path()
@@ -470,7 +468,6 @@ def draw_image(self, gc, x, y, im, transform=None):
             clip.append('%s' % id)
         clip = '\n'.join(clip)
 
-        #y = figh-(y+h)
         ps = """gsave
 %(clip)s
 %(x)s %(y)s translate
@@ -726,7 +723,6 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             self.set_font(ps_name, prop.get_size_in_points())
 
             lastgind = None
-            #print 'text', s
             lines = []
             thisx = 0
             thisy = 0

lib/matplotlib/backends/backend_wx.py

@@ -998,7 +998,6 @@ def _onKeyDown(self, evt):
     def _onKeyUp(self, evt):
         """Release key."""
         key = self._get_key(evt)
-        # print 'release key', key
         evt.Skip()
         FigureCanvasBase.key_release_event(self, key, guiEvent=evt)
 
@@ -1059,7 +1058,6 @@ def _onLeftButtonUp(self, evt):
         """End measuring on an axis."""
         x = evt.GetX()
         y = self.figure.bbox.height - evt.GetY()
-        # print 'release button', 1
         evt.Skip()
         self._set_capture(False)
         FigureCanvasBase.button_release_event(self, x, y, 1, guiEvent=evt)
@@ -1086,7 +1084,6 @@ def _onMiddleButtonUp(self, evt):
         """End measuring on an axis."""
         x = evt.GetX()
         y = self.figure.bbox.height - evt.GetY()
-        # print 'release button', 1
         evt.Skip()
         self._set_capture(False)
         FigureCanvasBase.button_release_event(self, x, y, 2, guiEvent=evt)
@@ -1102,7 +1099,6 @@ def _onMouseWheel(self, evt):
         delta = evt.GetWheelDelta()
         rotation = evt.GetWheelRotation()
         rate = evt.GetLinesPerAction()
-        # print "delta,rotation,rate",delta,rotation,rate
         step = rate * float(rotation) / delta
 
         # Done handling event

lib/matplotlib/colorbar.py

@@ -974,7 +974,6 @@ def add_lines(self, CS, erase=True):
         # to make one object track another automatically.
         #tcolors = [col.get_colors()[0] for col in CS.collections]
         #tlinewidths = [col.get_linewidth()[0] for lw in CS.collections]
-        #print 'tlinewidths:', tlinewidths
         ColorbarBase.add_lines(self, CS.levels, tcolors, tlinewidths,
                                erase=erase)
 

lib/matplotlib/mathtext.py

@@ -2582,21 +2582,17 @@ def push_state(self):
         self._state_stack.append(self.get_state().copy())
 
     def main(self, s, loc, toks):
-        #~ print "finish", toks
         return [Hlist(toks)]
 
     def math_string(self, s, loc, toks):
-        # print "math_string", toks[0][1:-1]
         return self._math_expression.parseString(toks[0][1:-1])
 
     def math(self, s, loc, toks):
-        #~ print "math", toks
         hlist = Hlist(toks)
         self.pop_state()
         return [hlist]
 
     def non_math(self, s, loc, toks):
-        #~ print "non_math", toks
         s = toks[0].replace(r'\$', '$')
         symbols = [Char(c, self.get_state(), math=False) for c in s]
         hlist = Hlist(symbols)
@@ -2630,7 +2626,7 @@ def _make_space(self, percentage):
                       r'\!'         : -0.16667, # -3/18 em = -3 mu
                       }
     def space(self, s, loc, toks):
-        assert(len(toks)==1)
+        assert len(toks)==1
         num = self._space_widths[toks[0]]
         box = self._make_space(num)
         return [box]
@@ -2639,7 +2635,6 @@ def customspace(self, s, loc, toks):
         return [self._make_space(float(toks[0]))]
 
     def symbol(self, s, loc, toks):
-        # print "symbol", toks
         c = toks[0]
         try:
             char = Char(c, self.get_state())
@@ -2691,7 +2686,6 @@ def symbol(self, s, loc, toks):
     snowflake = symbol
 
     def unknown_symbol(self, s, loc, toks):
-        # print "symbol", toks
         c = toks[0]
         raise ParseFatalException(s, loc, "Unknown symbol: %s" % c)
 
@@ -2768,7 +2762,7 @@ def c_over_c(self, s, loc, toks):
                   ) (set(_accent_map))
 
     def accent(self, s, loc, toks):
-        assert(len(toks)==1)
+        assert len(toks)==1
         state = self.get_state()
         thickness = state.font_output.get_underline_thickness(
             state.font, state.fontsize, state.dpi)
@@ -2792,7 +2786,6 @@ def accent(self, s, loc, toks):
                 ])
 
     def function(self, s, loc, toks):
-        #~ print "function", toks
         self.push_state()
         state = self.get_state()
         state.font = 'rm'
@@ -2830,7 +2823,7 @@ def end_group(self, s, loc, toks):
         return []
 
     def font(self, s, loc, toks):
-        assert(len(toks)==1)
+        assert len(toks)==1
         name = toks[0]
         self.get_state().font = name
         return []
@@ -2856,7 +2849,7 @@ def is_between_brackets(self, s, loc):
         return False
 
     def subsuper(self, s, loc, toks):
-        assert(len(toks)==1)
+        assert len(toks)==1
 
         nucleus = None
         sub = None
@@ -3086,14 +3079,14 @@ def _genfrac(self, ldelim, rdelim, rule, style, num, den):
         return result
 
     def genfrac(self, s, loc, toks):
-        assert(len(toks) == 1)
-        assert(len(toks[0]) == 6)
+        assert len(toks) == 1
+        assert len(toks[0]) == 6
 
         return self._genfrac(*tuple(toks[0]))
 
     def frac(self, s, loc, toks):
-        assert(len(toks) == 1)
-        assert(len(toks[0]) == 2)
+        assert len(toks) == 1
+        assert len(toks[0]) == 2
         state = self.get_state()
 
         thickness = state.font_output.get_underline_thickness(
@@ -3104,8 +3097,8 @@ def frac(self, s, loc, toks):
                              self._math_style_dict['textstyle'], num, den)
 
     def dfrac(self, s, loc, toks):
-        assert(len(toks) == 1)
-        assert(len(toks[0]) == 2)
+        assert len(toks) == 1
+        assert len(toks[0]) == 2
         state = self.get_state()
 
         thickness = state.font_output.get_underline_thickness(
@@ -3116,23 +3109,22 @@ def dfrac(self, s, loc, toks):
                              self._math_style_dict['displaystyle'], num, den)
 
     def stackrel(self, s, loc, toks):
-        assert(len(toks) == 1)
-        assert(len(toks[0]) == 2)
+        assert len(toks) == 1
+        assert len(toks[0]) == 2
         num, den = toks[0]
 
         return self._genfrac('', '', 0.0,
                              self._math_style_dict['textstyle'], num, den)
 
     def binom(self, s, loc, toks):
-        assert(len(toks) == 1)
-        assert(len(toks[0]) == 2)
+        assert len(toks) == 1
+        assert len(toks[0]) == 2
         num, den = toks[0]
 
         return self._genfrac('(', ')', 0.0,
                              self._math_style_dict['textstyle'], num, den)
 
     def sqrt(self, s, loc, toks):
-        #~ print "sqrt", toks
         root, body = toks[0]
         state = self.get_state()
         thickness = state.font_output.get_underline_thickness(
@@ -3177,8 +3169,8 @@ def sqrt(self, s, loc, toks):
         return [hlist]
 
     def overline(self, s, loc, toks):
-        assert(len(toks)==1)
-        assert(len(toks[0])==1)
+        assert len(toks)==1
+        assert len(toks[0])==1
 
         body = toks[0][0]
 
@@ -3222,7 +3214,6 @@ def _auto_sized_delimiter(self, front, middle, back):
         return hlist
 
     def auto_delim(self, s, loc, toks):
-        #~ print "auto_delim", toks
         front, middle, back = toks
 
         return self._auto_sized_delimiter(front, middle.asList(), back)
@@ -3320,7 +3311,7 @@ def to_mask(self, texstr, dpi=120, fontsize=14):
           - depth is the offset of the baseline from the bottom of the
             image in pixels.
         """
-        assert(self._output=="bitmap")
+        assert self._output == "bitmap"
         prop = FontProperties(size=fontsize)
         ftimage, depth = self.parse(texstr, dpi=dpi, prop=prop)
 
@@ -3402,7 +3393,7 @@ def get_depth(self, texstr, dpi=120, fontsize=14):
         *fontsize*
             The font size in points
         """
-        assert(self._output=="bitmap")
+        assert self._output=="bitmap"
         prop = FontProperties(size=fontsize)
         ftimage, depth = self.parse(texstr, dpi=dpi, prop=prop)
         return depth

lib/matplotlib/tests/test_axes.py

@@ -226,20 +226,20 @@ def test_inverted_cla():
     fig = plt.figure(0)
     ax = fig.gca()
     # 1. test that a new axis is not inverted per default
-    assert not(ax.xaxis_inverted())
-    assert not(ax.yaxis_inverted())
+    assert not ax.xaxis_inverted()
+    assert not ax.yaxis_inverted()
     img = np.random.random((100, 100))
     ax.imshow(img)
     # 2. test that a image axis is inverted
-    assert not(ax.xaxis_inverted())
+    assert not ax.xaxis_inverted()
     assert ax.yaxis_inverted()
     # 3. test that clearing and plotting a line, axes are
     # not inverted
     ax.cla()
     x = np.linspace(0, 2*np.pi, 100)
     ax.plot(x, np.cos(x))
-    assert not(ax.xaxis_inverted())
-    assert not(ax.yaxis_inverted())
+    assert not ax.xaxis_inverted()
+    assert not ax.yaxis_inverted()
 
     # 4. autoscaling should not bring back axes to normal
     ax.cla()
@@ -5494,7 +5494,7 @@ def test_twinx_knows_limits():
     ax2.axvspan(1, 2)
     ax2.plot([0, 0.5], [1, 2])
 
-    assert((xtwin.viewLim.intervalx == ax2.viewLim.intervalx).all())
+    assert_array_equal(xtwin.viewLim.intervalx, ax2.viewLim.intervalx)
 
 
 @pytest.mark.style('mpl20')

lib/matplotlib/tests/test_colors.py

@@ -67,7 +67,6 @@ def test_colormap_endian():
     for dt in ["f2", "f4", "f8"]:
         anative = np.ma.masked_invalid(np.array(a, dtype=dt))
         aforeign = anative.byteswap().newbyteorder()
-        #print(anative.dtype.isnative, aforeign.dtype.isnative)
         assert_array_equal(cmap(anative), cmap(aforeign))