Merge remote-tracking branch 'upstream/master'

sasoripathos · sasoripathos · commit b8ae7bdcb562 · 2019-05-01T12:49:18.000-04:00
diff --git a/examples/lines_bars_and_markers/scatter_piecharts.py b/examples/lines_bars_and_markers/scatter_piecharts.py
@@ -5,7 +5,7 @@
 
 This example makes custom 'pie charts' as the markers for a scatter plot.
 
-Thanks to Manuel Metz for the example
+Thanks to Manuel Metz for the example.
 """
 
 import numpy as np
@@ -19,31 +19,26 @@
 sizes = np.array([60, 80, 120])
 
 # calculate the points of the first pie marker
-#
-# these are just the origin (0,0) +
-# some points on a circle cos,sin
-x = [0] + np.cos(np.linspace(0, 2 * np.pi * r1, 10)).tolist()
-y = [0] + np.sin(np.linspace(0, 2 * np.pi * r1, 10)).tolist()
-xy1 = np.column_stack([x, y])
+# these are just the origin (0,0) + some points on a circle cos,sin
+x1 = np.cos(2 * np.pi * np.linspace(0, r1))
+y1 = np.sin(2 * np.pi * np.linspace(0, r1))
+xy1 = np.row_stack([[0, 0], np.column_stack([x1, y1])])
 s1 = np.abs(xy1).max()
 
-x = [0] + np.cos(np.linspace(2 * np.pi * r1, 2 * np.pi * r2, 10)).tolist()
-y = [0] + np.sin(np.linspace(2 * np.pi * r1, 2 * np.pi * r2, 10)).tolist()
-xy2 = np.column_stack([x, y])
+x2 = np.cos(2 * np.pi * np.linspace(r1, r2))
+y2 = np.sin(2 * np.pi * np.linspace(r1, r2))
+xy2 = np.row_stack([[0, 0], np.column_stack([x2, y2])])
 s2 = np.abs(xy2).max()
 
-x = [0] + np.cos(np.linspace(2 * np.pi * r2, 2 * np.pi, 10)).tolist()
-y = [0] + np.sin(np.linspace(2 * np.pi * r2, 2 * np.pi, 10)).tolist()
-xy3 = np.column_stack([x, y])
+x3 = np.cos(2 * np.pi * np.linspace(r2, 1))
+y3 = np.sin(2 * np.pi * np.linspace(r2, 1))
+xy3 = np.row_stack([[0, 0], np.column_stack([x3, y3])])
 s3 = np.abs(xy3).max()
 
 fig, ax = plt.subplots()
-ax.scatter(range(3), range(3), marker=xy1,
-           s=s1 ** 2 * sizes, facecolor='blue')
-ax.scatter(range(3), range(3), marker=xy2,
-           s=s2 ** 2 * sizes, facecolor='green')
-ax.scatter(range(3), range(3), marker=xy3,
-           s=s3 ** 2 * sizes, facecolor='red')
+ax.scatter(range(3), range(3), marker=xy1, s=s1**2 * sizes, facecolor='blue')
+ax.scatter(range(3), range(3), marker=xy2, s=s2**2 * sizes, facecolor='green')
+ax.scatter(range(3), range(3), marker=xy3, s=s3**2 * sizes, facecolor='red')
 
 plt.show()
 
diff --git a/examples/misc/agg_buffer.py b/examples/misc/agg_buffer.py
@@ -14,7 +14,7 @@
 
 plt.plot([1, 2, 3])
 
-canvas = plt.get_current_fig_manager().canvas
+canvas = plt.gcf().canvas
 
 agg = canvas.switch_backends(FigureCanvasAgg)
 agg.draw()
diff --git a/lib/matplotlib/hatch.py b/lib/matplotlib/hatch.py
@@ -57,7 +57,7 @@ def __init__(self, hatch, density):
             self.num_vertices = 0
 
     def set_vertices_and_codes(self, vertices, codes):
-        steps = np.linspace(-0.5, 0.5, self.num_lines + 1, True)
+        steps = np.linspace(-0.5, 0.5, self.num_lines + 1)
         vertices[0::2, 0] = 0.0 + steps
         vertices[0::2, 1] = 0.0 - steps
         vertices[1::2, 0] = 1.0 + steps
@@ -77,7 +77,7 @@ def __init__(self, hatch, density):
             self.num_vertices = 0
 
     def set_vertices_and_codes(self, vertices, codes):
-        steps = np.linspace(-0.5, 0.5, self.num_lines + 1, True)
+        steps = np.linspace(-0.5, 0.5, self.num_lines + 1)
         vertices[0::2, 0] = 0.0 + steps
         vertices[0::2, 1] = 1.0 + steps
         vertices[1::2, 0] = 1.0 + steps
@@ -111,10 +111,9 @@ def set_vertices_and_codes(self, vertices, codes):
         cursor = 0
         for row in range(self.num_rows + 1):
             if row % 2 == 0:
-                cols = np.linspace(0.0, 1.0, self.num_rows + 1, True)
+                cols = np.linspace(0, 1, self.num_rows + 1)
             else:
-                cols = np.linspace(offset / 2.0, 1.0 - offset / 2.0,
-                                   self.num_rows, True)
+                cols = np.linspace(offset / 2, 1 - offset / 2, self.num_rows)
             row_pos = row * offset
             for col_pos in cols:
                 vertices[cursor:cursor + shape_size] = (shape_vertices +
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
@@ -168,7 +168,7 @@ def get_xdata(self, legend, xdescent, ydescent, width, height, fontsize):
                                 numpoints)
             xdata_marker = xdata
         else:
-            xdata = np.linspace(-xdescent, -xdescent + width, 2)
+            xdata = [-xdescent, -xdescent + width]
             xdata_marker = [-xdescent + 0.5 * width]
         return xdata, xdata_marker
 
@@ -326,7 +326,7 @@ def create_artists(self, legend, orig_handle,
 
         xdata, xdata_marker = self.get_xdata(legend, xdescent, ydescent,
                                              width, height, fontsize)
-        ydata = ((height - ydescent) / 2.) * np.ones(xdata.shape, float)
+        ydata = np.full_like(xdata, (height - ydescent) / 2)
         legline = Line2D(xdata, ydata)
 
         self.update_prop(legline, orig_handle, legend)
@@ -468,7 +468,7 @@ def create_artists(self, legend, orig_handle,
         xdata, xdata_marker = self.get_xdata(legend, xdescent, ydescent,
                                              width, height, fontsize)
 
-        ydata = ((height - ydescent) / 2.) * np.ones(xdata.shape, float)
+        ydata = np.full_like(xdata, (height - ydescent) / 2)
         legline = Line2D(xdata, ydata)
 
         xdata_marker = np.asarray(xdata_marker)
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -602,26 +602,18 @@ def get_figlabels():
 
 
 def get_current_fig_manager():
-    """
-    Return the figure manager of the active figure.
-
-    If there is currently no active figure, a new one is created.
-    """
-    figManager = _pylab_helpers.Gcf.get_active()
-    if figManager is None:
-        gcf()  # creates an active figure as a side effect
-        figManager = _pylab_helpers.Gcf.get_active()
-    return figManager
+    """Return ``gcf().canvas.manager``, the current figure's manager."""
+    return gcf().canvas.manager
 
 
 @docstring.copy(FigureCanvasBase.mpl_connect)
 def connect(s, func):
-    return get_current_fig_manager().canvas.mpl_connect(s, func)
+    return gcf().canvas.mpl_connect(s, func)
 
 
 @docstring.copy(FigureCanvasBase.mpl_disconnect)
 def disconnect(cid):
-    return get_current_fig_manager().canvas.mpl_disconnect(cid)
+    return gcf().canvas.mpl_disconnect(cid)
 
 
 def close(fig=None):
@@ -683,7 +675,7 @@ def draw():
     This is equivalent to calling ``fig.canvas.draw_idle()``, where ``fig`` is
     the current figure.
     """
-    get_current_fig_manager().canvas.draw_idle()
+    gcf().canvas.draw_idle()
 
 
 @docstring.copy(Figure.savefig)
@@ -1262,25 +1254,19 @@ def subplot_tool(targetfig=None):
 
     A :class:`matplotlib.widgets.SubplotTool` instance is returned.
     """
-    tbar = rcParams['toolbar']  # turn off navigation toolbar for the toolfig
-    rcParams['toolbar'] = 'None'
     if targetfig is None:
-        manager = get_current_fig_manager()
-        targetfig = manager.canvas.figure
-    else:
-        # find the manager for this figure
-        for manager in _pylab_helpers.Gcf._activeQue:
-            if manager.canvas.figure == targetfig:
-                break
-        else:
-            raise RuntimeError('Could not find manager for targetfig')
+        targetfig = gcf()
 
+    tbar = rcParams['toolbar']  # Turn off navigation toolbar for the toolfig.
+    rcParams['toolbar'] = 'None'
     toolfig = figure(figsize=(6, 3))
     toolfig.subplots_adjust(top=0.9)
-    ret = SubplotTool(targetfig, toolfig)
     rcParams['toolbar'] = tbar
-    _pylab_helpers.Gcf.set_active(manager)  # restore the current figure
-    return ret
+
+    if hasattr(targetfig.canvas, "manager"):  # Restore the current figure.
+        _pylab_helpers.Gcf.set_active(targetfig.canvas.manager)
+
+    return SubplotTool(targetfig, toolfig)
 
 
 def tight_layout(pad=1.08, h_pad=None, w_pad=None, rect=None):
