Merge remote-tracking branch 'upstream/v1.5.x' into v2.x

efiring · efiring · commit a38e1daf0874 · 2016-05-04T09:19:18.000-10:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -45,6 +45,17 @@
 
 rcParams = matplotlib.rcParams
 
+_alias_map = {'color': ['c'],
+              'linewidth': ['lw'],
+              'linestyle': ['ls'],
+              'facecolor': ['fc'],
+              'edgecolor': ['ec'],
+              'markerfacecolor': ['mfc'],
+              'markeredgecolor': ['mec'],
+              'markeredgewidth': ['mew'],
+              'markersize': ['ms'],
+             }
+
 
 def _plot_args_replacer(args, data):
     if len(args) == 1:
@@ -1416,11 +1427,7 @@ def plot(self, *args, **kwargs):
             self.cla()
         lines = []
 
-        # Convert "c" alias to "color" immediately, to avoid
-        # confusion farther on.
-        c = kwargs.pop('c', None)
-        if c is not None:
-            kwargs['color'] = c
+        kwargs = cbook.normalize_kwargs(kwargs, _alias_map)
 
         for line in self._get_lines(*args, **kwargs):
             self.add_line(line)
@@ -3172,8 +3179,8 @@ def boxplot(self, x, notch=None, sym=None, vert=None, whis=None,
             ``shownotches`` is also True. Otherwise, means will be shown
             as points.
 
-        Additional Options
-        ---------------------
+        Other Parameters
+        ----------------
         The following boolean options toggle the drawing of individual
         components of the boxplots:
             - showcaps: the caps on the ends of whiskers
@@ -4574,6 +4581,8 @@ def fill(self, *args, **kwargs):
         if not self._hold:
             self.cla()
 
+        kwargs = cbook.normalize_kwargs(kwargs, _alias_map)
+
         patches = []
         for poly in self._get_patches_for_fill(*args, **kwargs):
             self.add_patch(poly)
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -184,7 +184,6 @@ def update_from(self, other):
         self.set_linewidth(other.get_linewidth())
         self.set_linestyle(other.get_linestyle())
         self.set_transform(other.get_data_transform())
-        self.set_figure(other.get_figure())
         self.set_alpha(other.get_alpha())
 
     def get_extents(self):
diff --git a/lib/matplotlib/tests/baseline_images/test_cycles/property_collision_fill.png b/lib/matplotlib/tests/baseline_images/test_cycles/property_collision_fill.png
diff --git a/lib/matplotlib/tests/baseline_images/test_cycles/property_collision_plot.png b/lib/matplotlib/tests/baseline_images/test_cycles/property_collision_plot.png
diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
@@ -123,6 +123,30 @@ def test_fillcycle_ignore():
     ax.legend(loc='upper left')
 
 
+@image_comparison(baseline_images=['property_collision_plot'],
+                  remove_text=True, extensions=['png'])
+def test_property_collision_plot():
+    fig, ax = plt.subplots()
+    ax.set_prop_cycle('linewidth', [2, 4])
+    for c in range(1, 4):
+        ax.plot(np.arange(10), c * np.arange(10), lw=0.1)
+    ax.plot(np.arange(10), 4 * np.arange(10))
+    ax.plot(np.arange(10), 5 * np.arange(10))
+
+
+@image_comparison(baseline_images=['property_collision_fill'],
+                  remove_text=True, extensions=['png'])
+def test_property_collision_fill():
+    fig, ax = plt.subplots()
+    xs = np.arange(10)
+    ys = 0.25 * xs**.5 + 2
+    ax.set_prop_cycle(linewidth=[2, 3, 4, 5, 6], facecolor='bgcmy')
+    for c in range(1, 4):
+        ax.fill(xs, c * ys, lw=0.1)
+    ax.fill(xs, 4 * ys)
+    ax.fill(xs, 5 * ys)
+
+
 @cleanup
 def test_valid_input_forms():
     fig, ax = plt.subplots()
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
@@ -241,6 +241,15 @@ def test_legend_stackplot():
     ax.legend(loc=0)
 
 
+@cleanup
+def test_cross_figure_patch_legend():
+    fig, ax = plt.subplots()
+    fig2, ax2 = plt.subplots()
+
+    brs = ax.bar(range(3), range(3))
+    fig2.legend(brs, 'foo')
+
+
 @cleanup
 def test_nanscatter():
     fig, ax = plt.subplots()
