Merge error messages

dstansby · dstansby · commit 5b5cb3e5fefd · 2019-07-23T09:05:44.000+01:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1663,9 +1663,7 @@ def axis(self, *args, emit=True, **kwargs):
                 limits = args[0]
                 try:
                     xmin, xmax, ymin, ymax = limits
-                except ValueError:
-                    raise ValueError('args must contain [xmin xmax ymin ymax]')
-                except TypeError:
+                except (TypeError, ValueError):
                     raise TypeError('the first argument to axis() must be an '
                                     'interable of the form '
                                     '[xmin, xmax, ymin, ymax]')
