Merge pull request #14565 from timhoffm/fix-argument-checking

jklymak · web-flow · commit a4ee4963c3e3 · 2019-07-24T17:54:48.000-07:00
Rewrite an argument check to _check_getitem
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2811,21 +2811,15 @@ def ticklabel_format(self, *, axis='both', style='', scilimits=None,
                 m + n + 1  # check that both are numbers
             except (ValueError, TypeError):
                 raise ValueError("scilimits must be a sequence of 2 integers")
-        if style[:3] == 'sci':
-            sb = True
-        elif style == 'plain':
-            sb = False
-        elif style == '':
-            sb = None
-        else:
-            raise ValueError("%s is not a valid style value")
+        STYLES = {'sci': True, 'scientific': True, 'plain': False, '': None}
+        is_sci_style = cbook._check_getitem(STYLES, style=style)
         axis_map = {**{k: [v] for k, v in self._get_axis_map().items()},
                     'both': self._get_axis_list()}
         axises = cbook._check_getitem(axis_map, axis=axis)
         try:
             for axis in axises:
-                if sb is not None:
-                    axis.major.formatter.set_scientific(sb)
+                if is_sci_style is not None:
+                    axis.major.formatter.set_scientific(is_sci_style)
                 if scilimits is not None:
                     axis.major.formatter.set_powerlimits(scilimits)
                 if useOffset is not None:
