Update deprecation notices and restore "Exception" to except conditions.

efiring · efiring · commit c06b6bbe745a · 2018-09-04T09:52:16.000-10:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -713,7 +713,7 @@ def __init__(self, axes, pickradius=15):
         self.callbacks = cbook.CallbackRegistry()
 
         self._autolabelpos = True
-        self._smart_bounds = False  # Deprecated in 3.0
+        self._smart_bounds = False  # Deprecated in 3.1
 
         self.label = self._get_label()
         self.labelpad = rcParams['axes.labelpad']
@@ -1003,13 +1003,13 @@ def get_ticklabel_extents(self, renderer):
             bbox2 = mtransforms.Bbox.from_extents(0, 0, 0, 0)
         return bbox, bbox2
 
-    @cbook.deprecated("3.0")
+    @cbook.deprecated("3.1")
     def set_smart_bounds(self, value):
         """set the axis to have smart bounds"""
         self._smart_bounds = value
         self.stale = True
 
-    @cbook.deprecated("3.0")
+    @cbook.deprecated("3.1")
     def get_smart_bounds(self):
         """get whether the axis has smart bounds"""
         return self._smart_bounds
@@ -1024,7 +1024,7 @@ def _update_ticks(self, renderer=None):
         if renderer is not None:
             cbook.warn_deprecated("Axis._update_ticks should be called with"
                                   " no arguments; the 'renderer' argument"
-                                  " is ignored and will be removed in 3.1")
+                                  " is ignored and will be removed in 3.2")
         interval = self.get_view_interval()
         tick_tups = list(self.iter_ticks())  # iter_ticks calls the locator
         if self._smart_bounds and tick_tups:  # _smart_bounds is deprecated
@@ -1081,7 +1081,7 @@ def _update_ticks(self, renderer=None):
                 try:
                     ds1 = self._get_pixel_distance_along_axis(
                         interval_expanded[0], -0.0005)
-                except:
+                except Exception:
                     warnings.warn("Unable to find pixel distance along axis "
                                   "for interval padding of ticks; assuming no "
                                   "interval padding needed.")
@@ -1091,7 +1091,7 @@ def _update_ticks(self, renderer=None):
                 try:
                     ds2 = self._get_pixel_distance_along_axis(
                         interval_expanded[1], +0.0005)
-                except:
+                except Exception:
                     warnings.warn("Unable to find pixel distance along axis "
                                   "for interval padding of ticks; assuming no "
                                   "interval padding needed.")
diff --git a/lib/matplotlib/spines.py b/lib/matplotlib/spines.py
@@ -58,7 +58,7 @@ def __init__(self, axes, spine_type, path, **kwargs):
         self.set_transform(self.axes.transData)  # default transform
 
         self._bounds = None  # default bounds
-        self._smart_bounds = False  # deprecated in 3.0
+        self._smart_bounds = False  # deprecated in 3.1
 
         # Defer initial position determination. (Not much support for
         # non-rectangular axes is currently implemented, and this lets
@@ -81,7 +81,7 @@ def __init__(self, axes, spine_type, path, **kwargs):
         # Note: This cannot be calculated until this is added to an Axes
         self._patch_transform = mtransforms.IdentityTransform()
 
-    @cbook.deprecated("3.0")
+    @cbook.deprecated("3.1")
     def set_smart_bounds(self, value):
         """set the spine and associated axis to have smart bounds"""
         self._smart_bounds = value
@@ -93,7 +93,7 @@ def set_smart_bounds(self, value):
             self.axes.xaxis.set_smart_bounds(value)
         self.stale = True
 
-    @cbook.deprecated("3.0")
+    @cbook.deprecated("3.1")
     def get_smart_bounds(self):
         """get whether the spine has smart bounds"""
         return self._smart_bounds
@@ -218,7 +218,7 @@ def _adjust_location(self):
                 raise ValueError('unknown spine spine_type: %s' %
                                  self.spine_type)
 
-            if self._smart_bounds:  # deprecated in 3.0
+            if self._smart_bounds:  # deprecated in 3.1
                 # attempt to set bounds in sophisticated way
 
                 # handle inverted limits
