Merge pull request #10433 from matplotlib/auto-backport-of-pr-10427

QuLogic · web-flow · commit a2476e7afae3 · 2018-02-12T23:00:08.000-05:00
Backport PR #10427 on branch v2.2.x
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -62,7 +62,8 @@ def DEBUG_MSG(string, lvl=3, o=None):
         # Jeremy, often times the commented line won't print but the
         # one below does.  I think WX is redefining stderr, damned
         # beast
-        # print >>sys.stderr, "%s- %s in %s" % (_DEBUG_lvls[lvl], string, cls)
+        # print("%s- %s in %s" % (_DEBUG_lvls[lvl], string, cls),
+        #       file=sys.stderr)
         print("%s- %s in %s" % (_DEBUG_lvls[lvl], string, cls))
 
 
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -191,7 +191,7 @@ class Dvi(object):
 
     >>> with matplotlib.dviread.Dvi('input.dvi', 72) as dvi:
     >>>     for page in dvi:
-    >>>         print ''.join(unichr(t.glyph) for t in page.text)
+    >>>         print(''.join(unichr(t.glyph) for t in page.text))
     """
     # dispatch table
     _dtable = [None for _ in xrange(256)]
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -93,25 +93,21 @@ def segment_hits(cx, cy, x, y, radius):
     Lnorm_sq = dx ** 2 + dy ** 2  # Possibly want to eliminate Lnorm==0
     u = ((cx - xr) * dx + (cy - yr) * dy) / Lnorm_sq
     candidates = (u >= 0) & (u <= 1)
-    #if any(candidates): print "candidates",xr[candidates]
 
     # Note that there is a little area near one side of each point
     # which will be near neither segment, and another which will
     # be near both, depending on the angle of the lines.  The
     # following radius test eliminates these ambiguities.
     point_hits = (cx - x) ** 2 + (cy - y) ** 2 <= radius ** 2
-    #if any(point_hits): print "points",xr[candidates]
     candidates = candidates & ~(point_hits[:-1] | point_hits[1:])
 
     # For those candidates which remain, determine how far they lie away
     # from the line.
     px, py = xr + u * dx, yr + u * dy
     line_hits = (cx - px) ** 2 + (cy - py) ** 2 <= radius ** 2
-    #if any(line_hits): print "lines",xr[candidates]
     line_hits = line_hits & candidates
     points, = point_hits.ravel().nonzero()
     lines, = line_hits.ravel().nonzero()
-    #print points,lines
     return np.concatenate((points, lines))
 
 
diff --git a/lib/mpl_toolkits/axisartist/angle_helper.py b/lib/mpl_toolkits/axisartist/angle_helper.py
@@ -114,11 +114,9 @@ def select_step(v1, v2, nv, hour=False, include_last=True,
 
     # for degree
     if dv > 1./threshold_factor:
-        #print "degree"
         step, factor = _select_step(dv)
     else:
         step, factor = select_step_sub(dv*threshold_factor)
-        #print "feac", step, factor
 
         factor = factor * threshold_factor
 
diff --git a/tutorials/intermediate/artists.py b/tutorials/intermediate/artists.py
@@ -304,7 +304,7 @@ class in the matplotlib API, and the one you will be working with most
 #     In [159]: ax1
 #     Out[159]: <matplotlib.axes.Subplot instance at 0xd54b26c>
 #
-#     In [160]: print fig.axes
+#     In [160]: print(fig.axes)
 #     [<matplotlib.axes.Subplot instance at 0xd54b26c>, <matplotlib.axes.Axes instance at 0xd3f0b2c>]
 #
 # Because the figure maintains the concept of the "current axes" (see
@@ -404,7 +404,7 @@ class in the matplotlib API, and the one you will be working with most
 #
 # .. sourcecode:: ipython
 #
-#     In [229]: print ax.lines
+#     In [229]: print(ax.lines)
 #     [<matplotlib.lines.Line2D instance at 0xd378b0c>]
 #
 # Similarly, methods that create patches, like
@@ -419,7 +419,7 @@ class in the matplotlib API, and the one you will be working with most
 #     In [234]: rectangles
 #     Out[234]: <a list of 50 Patch objects>
 #
-#     In [235]: print len(ax.patches)
+#     In [235]: print(len(ax.patches))
 #
 # You should not add objects directly to the ``Axes.lines`` or
 # ``Axes.patches`` lists unless you know exactly what you are doing,
@@ -445,42 +445,42 @@ class in the matplotlib API, and the one you will be working with most
 #     In [263]: rect = matplotlib.patches.Rectangle( (1,1), width=5, height=12)
 #
 #     # by default the axes instance is None
-#     In [264]: print rect.get_axes()
+#     In [264]: print(rect.get_axes())
 #     None
 #
 #     # and the transformation instance is set to the "identity transform"
-#     In [265]: print rect.get_transform()
+#     In [265]: print(rect.get_transform())
 #     <Affine object at 0x13695544>
 #
 #     # now we add the Rectangle to the Axes
 #     In [266]: ax.add_patch(rect)
 #
 #     # and notice that the ax.add_patch method has set the axes
 #     # instance
-#     In [267]: print rect.get_axes()
+#     In [267]: print(rect.get_axes())
 #     Axes(0.125,0.1;0.775x0.8)
 #
 #     # and the transformation has been set too
-#     In [268]: print rect.get_transform()
+#     In [268]: print(rect.get_transform())
 #     <Affine object at 0x15009ca4>
 #
 #     # the default axes transformation is ax.transData
-#     In [269]: print ax.transData
+#     In [269]: print(ax.transData)
 #     <Affine object at 0x15009ca4>
 #
 #     # notice that the xlimits of the Axes have not been changed
-#     In [270]: print ax.get_xlim()
+#     In [270]: print(ax.get_xlim())
 #     (0.0, 1.0)
 #
 #     # but the data limits have been updated to encompass the rectangle
-#     In [271]: print ax.dataLim.bounds
+#     In [271]: print(ax.dataLim.bounds)
 #     (1.0, 1.0, 5.0, 12.0)
 #
 #     # we can manually invoke the auto-scaling machinery
 #     In [272]: ax.autoscale_view()
 #
 #     # and now the xlim are updated to encompass the rectangle
-#     In [273]: print ax.get_xlim()
+#     In [273]: print(ax.get_xlim())
 #     (1.0, 6.0)
 #
 #     # we have to manually force a figure draw

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ class in the matplotlib API, and the one you will be working with most`
`304`	`304`	`# In [159]: ax1`
`305`	`305`	`# Out[159]: <matplotlib.axes.Subplot instance at 0xd54b26c>`
`306`	`306`	`#`
`307`		`-# In [160]: print fig.axes`
	`307`	`+# In [160]: print(fig.axes)`
`308`	`308`	`# [<matplotlib.axes.Subplot instance at 0xd54b26c>, <matplotlib.axes.Axes instance at 0xd3f0b2c>]`
`309`	`309`	`#`
`310`	`310`	`# Because the figure maintains the concept of the "current axes" (see`
`@@ -404,7 +404,7 @@ class in the matplotlib API, and the one you will be working with most`
`404`	`404`	`#`
`405`	`405`	`# .. sourcecode:: ipython`
`406`	`406`	`#`
`407`		`-# In [229]: print ax.lines`
	`407`	`+# In [229]: print(ax.lines)`
`408`	`408`	`# [<matplotlib.lines.Line2D instance at 0xd378b0c>]`
`409`	`409`	`#`
`410`	`410`	`# Similarly, methods that create patches, like`
`@@ -419,7 +419,7 @@ class in the matplotlib API, and the one you will be working with most`
`419`	`419`	`# In [234]: rectangles`
`420`	`420`	`# Out[234]: <a list of 50 Patch objects>`
`421`	`421`	`#`
`422`		`-# In [235]: print len(ax.patches)`
	`422`	`+# In [235]: print(len(ax.patches))`
`423`	`423`	`#`
`424`	`424`	# You should not add objects directly to the ``Axes.lines`` or
`425`	`425`	# ``Axes.patches`` lists unless you know exactly what you are doing,
`@@ -445,42 +445,42 @@ class in the matplotlib API, and the one you will be working with most`
`445`	`445`	`# In [263]: rect = matplotlib.patches.Rectangle( (1,1), width=5, height=12)`
`446`	`446`	`#`
`447`	`447`	`# # by default the axes instance is None`
`448`		`-# In [264]: print rect.get_axes()`
	`448`	`+# In [264]: print(rect.get_axes())`
`449`	`449`	`# None`
`450`	`450`	`#`
`451`	`451`	`# # and the transformation instance is set to the "identity transform"`
`452`		`-# In [265]: print rect.get_transform()`
	`452`	`+# In [265]: print(rect.get_transform())`
`453`	`453`	`# <Affine object at 0x13695544>`
`454`	`454`	`#`
`455`	`455`	`# # now we add the Rectangle to the Axes`
`456`	`456`	`# In [266]: ax.add_patch(rect)`
`457`	`457`	`#`
`458`	`458`	`# # and notice that the ax.add_patch method has set the axes`
`459`	`459`	`# # instance`
`460`		`-# In [267]: print rect.get_axes()`
	`460`	`+# In [267]: print(rect.get_axes())`
`461`	`461`	`# Axes(0.125,0.1;0.775x0.8)`
`462`	`462`	`#`
`463`	`463`	`# # and the transformation has been set too`
`464`		`-# In [268]: print rect.get_transform()`
	`464`	`+# In [268]: print(rect.get_transform())`
`465`	`465`	`# <Affine object at 0x15009ca4>`
`466`	`466`	`#`
`467`	`467`	`# # the default axes transformation is ax.transData`
`468`		`-# In [269]: print ax.transData`
	`468`	`+# In [269]: print(ax.transData)`
`469`	`469`	`# <Affine object at 0x15009ca4>`
`470`	`470`	`#`
`471`	`471`	`# # notice that the xlimits of the Axes have not been changed`
`472`		`-# In [270]: print ax.get_xlim()`
	`472`	`+# In [270]: print(ax.get_xlim())`
`473`	`473`	`# (0.0, 1.0)`
`474`	`474`	`#`
`475`	`475`	`# # but the data limits have been updated to encompass the rectangle`
`476`		`-# In [271]: print ax.dataLim.bounds`
	`476`	`+# In [271]: print(ax.dataLim.bounds)`
`477`	`477`	`# (1.0, 1.0, 5.0, 12.0)`
`478`	`478`	`#`
`479`	`479`	`# # we can manually invoke the auto-scaling machinery`
`480`	`480`	`# In [272]: ax.autoscale_view()`
`481`	`481`	`#`
`482`	`482`	`# # and now the xlim are updated to encompass the rectangle`
`483`		`-# In [273]: print ax.get_xlim()`
	`483`	`+# In [273]: print(ax.get_xlim())`
`484`	`484`	`# (1.0, 6.0)`
`485`	`485`	`#`
`486`	`486`	`# # we have to manually force a figure draw`