Fix docstring; validate subs

efiring · efiring · commit ecc62126e1dc · 2016-11-24T22:22:29.000-10:00
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -876,8 +876,8 @@ def label_minor(self, labelOnlyBase):
 
         Parameters
         ----------
-        labelOnlyBase : bool, optional, default: True
-            If true, label ticks only at integer powers of base.
+        labelOnlyBase : bool
+            If True, label ticks only at integer powers of base.
 
         """
         self.labelOnlyBase = labelOnlyBase
@@ -1908,7 +1908,9 @@ def subs(self, subs):
         if subs is None:  # consistency with previous bad API
             self._subs = 'auto'
         elif cbook.is_string_like(subs):
-            # TODO: validation ('all', 'auto')
+            if subs not in ('all', 'auto'):
+                raise ValueError("A subs string must be 'all' or 'auto'; "
+                                 "found '%s'." % subs)
             self._subs = subs
         else:
             self._subs = np.asarray(subs, dtype=float)
@@ -2045,8 +2047,8 @@ def __init__(self, transform=None, subs=None, linthresh=None, base=None):
             self._base = base
             self._linthresh = linthresh
         else:
-            raise ValueError("Either transform or linthresh "
-                             "and base must be provided.")
+            raise ValueError("Either transform, or both linthresh "
+                             "and base, must be provided.")
         if subs is None:
             self._subs = [1.0]
         else:
