Merge branch 'v2.x' into master

QuLogic · QuLogic · commit e48900547592 · 2016-10-17T22:53:37.000-04:00
diff --git a/LICENSE/LICENSE.PIL b/LICENSE/LICENSE.PIL
@@ -0,0 +1,12 @@
+Software License
+
+The Python Imaging Library (PIL) is
+
+    Copyright © 1997-2011 by Secret Labs AB
+    Copyright © 1995-2011 by Fredrik Lundh
+
+By obtaining, using, and/or copying this software and/or its associated documentation, you agree that you have read, understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its associated documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies, and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Secret Labs AB or the author not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.
+
+SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3245,22 +3245,26 @@ def boxplot(self, x, notch=None, sym=None, vert=None, whis=None,
 
         Other Parameters
         ----------------
-        The following boolean options toggle the drawing of individual
-        components of the boxplots:
-            - showcaps: the caps on the ends of whiskers
-              (default is True)
-            - showbox: the central box (default is True)
-            - showfliers: the outliers beyond the caps (default is True)
-            - showmeans: the arithmetic means (default is False)
-
-        The remaining options can accept dictionaries that specify the
-        style of the individual artists:
-            - capprops
-            - boxprops
-            - whiskerprops
-            - flierprops
-            - medianprops
-            - meanprops
+        showcaps : bool, optional (True)
+            Show the caps on the ends of whiskers.
+        showbox : bool, optional (True)
+            Show the central box.
+        showfliers : bool, optional (True)
+            Show the outliers beyond the caps.
+        showmeans : bool, optional (False)
+            Show the arithmetic means.
+        capprops : dict, optional (None)
+            Specifies the style of the caps.
+        boxprops : dict, optional (None)
+            Specifies the style of the box.
+        whiskerprops : dict, optional (None)
+            Specifies the style of the whiskers.
+        flierprops : dict, optional (None)
+            Specifies the style of the fliers.
+        medianprops : dict, optional (None)
+            Specifies the style of the median.
+        meanprops : dict, optional (None)
+            Specifies the style of the mean.
 
         Returns
         -------
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -372,9 +372,8 @@ def set_linewidth(self, w):
         self._linewidth = float(w)
         # scale the dash pattern by the linewidth
         offset, ls = self._us_dashes
-        self._dashes = mlines._scale_dashes(offset,
-                                            ls,
-                                            self._linewidth)[1]
+        self._dashoffset, self._dashes = mlines._scale_dashes(
+            offset, ls, self._linewidth)
         self.stale = True
 
     def set_lw(self, lw):
@@ -417,9 +416,8 @@ def set_linestyle(self, ls):
         # get the unscalled dash pattern
         offset, ls = self._us_dashes = mlines._get_dash_pattern(ls)
         # scale the dash pattern by the linewidth
-        self._dashes = mlines._scale_dashes(offset,
-                                            ls,
-                                            self._linewidth)[1]
+        self._dashoffset, self._dashes = mlines._scale_dashes(
+            offset, ls, self._linewidth)
         self.stale = True
 
     def set_ls(self, ls):
@@ -4271,7 +4269,7 @@ def draw(self, renderer):
         if self._edgecolor[3] == 0:
             lw = 0
         gc.set_linewidth(lw)
-        gc.set_linestyle(self._linestyle)
+        gc.set_dashes(self._dashoffset, self._dashes)
 
         gc.set_antialiased(self._antialiased)
         self._set_gc_clip(gc)
diff --git a/lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dash.png b/lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dash.png
diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
@@ -97,6 +97,32 @@ def test_fancyarrow_dpi_cor_200dpi():
     __prepare_fancyarrow_dpi_cor_test()
 
 
+@image_comparison(baseline_images=['fancyarrow_dash'],
+                  remove_text=True, extensions=['png'],
+                  style='default')
+def test_fancyarrow_dash():
+    from matplotlib.patches import FancyArrowPatch
+    fig, ax = plt.subplots()
+
+    e = FancyArrowPatch((0, 0), (0.5, 0.5),
+                        arrowstyle='-|>',
+                        connectionstyle='angle3,angleA=0,angleB=90',
+                        mutation_scale=10.0,
+                        linewidth=2,
+                        linestyle='dashed',
+                        color='k')
+
+    e2 = FancyArrowPatch((0, 0), (0.5, 0.5),
+                         arrowstyle='-|>',
+                         connectionstyle='angle3',
+                         mutation_scale=10.0,
+                         linewidth=2,
+                         linestyle='dotted',
+                         color='k')
+    ax.add_patch(e)
+    ax.add_patch(e2)
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -1,8 +1,10 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
 /*
- * The Python Imaging Library.
- * $Id$
+ * This code is derived from The Python Imaging Library and is covered
+ * by the PIL license.
+ *
+ * See LICENSE/LICENSE.PIL for details.
  *
  */
 
