use validate_linestyle even for rcParam 'contour.negative_linestyle'

afvincent · afvincent · commit e8032dff30c0 · 2017-02-10T10:26:15.000+01:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -530,22 +530,6 @@ def validate_ps_distiller(s):
                                         'top', 'none'])
 validate_fillstylelist = _listify_validator(validate_fillstyle)
 
-validate_negative_linestyle = ValidateInStrings('negative_linestyle',
-                                                ['solid', 'dashed'],
-                                                ignorecase=True)
-
-
-def validate_negative_linestyle_legacy(s):
-    try:
-        res = validate_negative_linestyle(s)
-        return res
-    except ValueError:
-        dashes = validate_nseq_float(2)(s)
-        warnings.warn("Deprecated negative_linestyle specification; use "
-                      "'solid' or 'dashed'",
-                      mplDeprecation)
-        return (0, dashes)  # (offset, (solid, blank))
-
 
 def validate_corner_mask(s):
     if s == 'legacy':
@@ -1081,8 +1065,7 @@ def validate_linestyle(ls):
     'image.composite_image': [True, validate_bool],
 
     # contour props
-    'contour.negative_linestyle': ['dashed',
-                                    validate_negative_linestyle_legacy],
+    'contour.negative_linestyle': ['dashed', validate_linestyle],
     'contour.corner_mask':        [True, validate_corner_mask],
 
     # errorbar props
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -471,7 +471,7 @@ backend      : $TEMPLATE_BACKEND
                                   # such as a PDF.
 
 ### CONTOUR PLOTS
-#contour.negative_linestyle : dashed # dashed | solid
+#contour.negative_linestyle : dashed # string or on-off ink sequence
 #contour.corner_mask        : True   # True | False | legacy
 
 ### ERRORBAR PLOTS
