Merge pull request #10086 from anntzer/deprecate-svgfont

QuLogic · web-flow · commit 0211860cba4d · 2018-01-08T20:34:23.000-05:00
Deprecate support for "svg fonts" font embedding.
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -24,6 +24,7 @@
 import warnings
 import re
 
+from matplotlib import cbook
 from matplotlib.cbook import mplDeprecation, deprecated, ls_mapper
 from matplotlib.fontconfig_pattern import parse_fontconfig_pattern
 from matplotlib.colors import is_color_like
@@ -563,8 +564,15 @@ def validate_negative_linestyle_legacy(s):
      'center'], ignorecase=True)
 
 
-validate_svg_fonttype = ValidateInStrings('svg.fonttype',
-                                          ['none', 'path', 'svgfont'])
+def validate_svg_fonttype(s):
+    if s in ["none", "path"]:
+        return s
+    if s == "svgfont":
+        cbook.warn_deprecated(
+            "2.2", "'svgfont' support for svg.fonttype is deprecated.")
+        return s
+    raise ValueError("Unrecognized svg.fonttype string '{}'; "
+                     "valid strings are 'none', 'path'")
 
 
 def validate_hinting(s):
