matplotlib · Tranquilled · Oct 5, 2020 · Oct 6, 2020 · Oct 6, 2020 · Oct 6, 2020
diff --git a/doc/api/animation_api.rst b/doc/api/animation_api.rst
@@ -186,7 +186,6 @@ on all systems.
 
    FFMpegWriter
    ImageMagickWriter
-   AVConvWriter
 
 The file-based writers save temporary files for each frame which are stitched
 into a single file at the end.  Although slower, these writers can be easier to
@@ -198,7 +197,6 @@ debug.
 
    FFMpegFileWriter
    ImageMagickFileWriter
-   AVConvFileWriter
 
 Fundamentally, a `MovieWriter` provides a way to grab sequential frames
 from the same underlying `~matplotlib.figure.Figure` object.  The base
@@ -283,7 +281,6 @@ and mixins
    :toctree: _as_gen
    :nosignatures:
 
-   AVConvBase
    FFMpegBase
    ImageMagickBase
 
@@ -298,6 +295,6 @@ Inheritance Diagrams
    :private-bases:
    :parts: 1
 
-.. inheritance-diagram:: matplotlib.animation.AVConvFileWriter matplotlib.animation.AVConvWriter matplotlib.animation.FFMpegFileWriter matplotlib.animation.FFMpegWriter matplotlib.animation.ImageMagickFileWriter matplotlib.animation.ImageMagickWriter
+.. inheritance-diagram:: matplotlib.animation.FFMpegFileWriter matplotlib.animation.FFMpegWriter matplotlib.animation.ImageMagickFileWriter matplotlib.animation.ImageMagickWriter
    :private-bases:
    :parts: 1
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -584,17 +584,6 @@ def output_args(self):
 
         return args + ['-y', self.outfile]
 
-    @classmethod
-    def isAvailable(cls):
-        return (
-            super().isAvailable()
-            # Ubuntu 12.04 ships a broken ffmpeg binary which we shouldn't use.
-            # NOTE: when removed, remove the same method in AVConvBase.
-            and b'LibAv' not in subprocess.run(
-                [cls.bin_path()], creationflags=subprocess_creation_flags,
-                stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
-                stderr=subprocess.PIPE).stderr)
-
 
 # Combine FFMpeg options with pipe-based writing
 @writers.register('ffmpeg')
@@ -640,45 +629,6 @@ def _args(self):
                 '-vframes', str(self._frame_counter)] + self.output_args
 
 
-# Base class of avconv information.  AVConv has identical arguments to FFMpeg.
-@cbook.deprecated('3.3')
-class AVConvBase(FFMpegBase):
-    """
-    Mixin class for avconv output.
-
-    To be useful this must be multiply-inherited from with a
-    `MovieWriterBase` sub-class.
-    """
-
-    _exec_key = 'animation.avconv_path'
-    _args_key = 'animation.avconv_args'
-
-    # NOTE : should be removed when the same method is removed in FFMpegBase.
-    isAvailable = classmethod(MovieWriter.isAvailable.__func__)
-
-
-# Combine AVConv options with pipe-based writing
-@writers.register('avconv')
-class AVConvWriter(AVConvBase, FFMpegWriter):
-    """
-    Pipe-based avconv writer.
-
-    Frames are streamed directly to avconv via a pipe and written in a single
-    pass.
-    """
-
-
-# Combine AVConv options with file-based writing
-@writers.register('avconv_file')
-class AVConvFileWriter(AVConvBase, FFMpegFileWriter):
-    """
-    File-based avconv writer.
-
-    Frames are written to temporary files on disk and then stitched
-    together at the end.
-    """
-
-
 # Base class for animated GIFs with ImageMagick
 class ImageMagickBase:
     """
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -211,6 +211,11 @@ def _update_bbox_to_anchor(self, loc_in_canvas):
 shadow : bool, default: :rc:`legend.shadow`
     Whether to draw a shadow behind the legend.
 
+shadowcolor : color or None
+    Takes a valid color string. If ``None``, defaults to the legend's
+    ``facecolor`` as usual.
+    Sets shadow color directly if shadow is activated.
+
 framealpha : float, default: :rc:`legend.framealpha`
     The alpha transparency of the legend's background.
     If *shadow* is activated and *framealpha* is ``None``, the default value is
@@ -322,6 +327,7 @@ def __init__(self, parent, handles, labels,
                  fancybox=None,  # True use a fancy box, false use a rounded
                                  # box, none use rc
                  shadow=None,
+                 shadowcolor=None,    # set shadow color directly
                  title=None,  # set a title for the legend
                  title_fontsize=None,  # the font size for the title
                  framealpha=None,  # set frame alpha
@@ -514,7 +520,6 @@ def __init__(self, parent, handles, labels,
         self._draggable = None
 
         # set the text color
-
         color_getters = {  # getter function depends on line or patch
             'linecolor':       ['get_color',           'get_facecolor'],
             'markerfacecolor': ['get_markerfacecolor', 'get_facecolor'],
@@ -543,6 +548,9 @@ def __init__(self, parent, handles, labels,
             raise ValueError("Invalid argument for labelcolor : %s" %
                              str(labelcolor))
 
+        # set shadow color
+        self.shadowcolor = shadowcolor
+
     def _set_artist_props(self, a):
         """
         Set the boilerplate props for artists added to axes.
@@ -607,7 +615,10 @@ def draw(self, renderer):
         self.legendPatch.set_bounds(bbox.x0, bbox.y0, bbox.width, bbox.height)
         self.legendPatch.set_mutation_scale(fontsize)
 
-        if self.shadow:
+        if self.shadowcolor and self.shadow:
+            Shadow(self.legendPatch, 2, -2,
+                   color=self.shadowcolor).draw(renderer)
+        elif self.shadow:
             Shadow(self.legendPatch, 2, -2).draw(renderer)
 
         self.legendPatch.draw(renderer)

diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
@@ -294,7 +294,8 @@ legend.handletextpad : 0.8    # the space between the legend line and legend tex
 legend.borderaxespad : 0.5   # the border between the axes and legend edge in fraction of fontsize
 legend.columnspacing : 2.    # the border between the axes and legend edge in fraction of fontsize
 legend.shadow        : False
-legend.frameon       : True   # whether or not to draw a frame around legend
+legend.shadowcolor   : None    # sets shadow color; defaults to legend.facecolor
+legend.frameon       : True    # whether or not to draw a frame around legend
 legend.framealpha    : None    # opacity of legend frame
 legend.scatterpoints : 3 # number of scatter points
 legend.facecolor     : inherit   # legend background color (when 'inherit' uses axes.facecolor)

diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -1246,6 +1246,7 @@ def _convert_validator_spec(key, conv):
      # the relative size of legend markers vs. original
     "legend.markerscale":    validate_float,
     "legend.shadow":         validate_bool,
+    "legend.shadowcolor":    validate_color,
      # whether or not to draw a frame around legend
     "legend.frameon":        validate_bool,
      # alpha value of the legend frame

diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -520,6 +520,7 @@
 #legend.fancybox:      True     # if True, use a rounded box for the
                                 # legend background, else a rectangle
 #legend.shadow:        False    # if True, give background a shadow effect
+#legend.shadowcolor:   None     # takes a color string, otherwise default behavior
 #legend.numpoints:     1        # the number of marker points in the legend line
 #legend.scatterpoints: 1        # number of scatter points
 #legend.markerscale:   1.0      # the relative size of legend markers vs. original