matplotlib
diff --git a/‎lib/matplotlib/axes/_base.py
Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_base.py
+13-4Lines changed: 13 additions & 4 deletions b/‎lib/matplotlib/axes/_base.py
Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_base.py
+13-4Lines changed: 13 additions & 4 deletions
diff --git a/‎lib/matplotlib/tests/test_units.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_units.py
-1Lines changed: 0 additions & 1 deletion b/‎lib/matplotlib/tests/test_units.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_units.py
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎lib/mpl_toolkits/mplot3d/axes3d.py
Copy file name to clipboardExpand all lines: lib/mpl_toolkits/mplot3d/axes3d.py
+14-5Lines changed: 14 additions & 5 deletions b/‎lib/mpl_toolkits/mplot3d/axes3d.py
Copy file name to clipboardExpand all lines: lib/mpl_toolkits/mplot3d/axes3d.py
+14-5Lines changed: 14 additions & 5 deletions
@@ -556,12 +556,12 @@ def __init__(self, fig, rect,
             self.update(kwargs)
 
         if self.xaxis is not None:
-            self._xcid = self.xaxis.callbacks.connect('units finalize',
-                                                      self.relim)
+            self._xcid = self.xaxis.callbacks.connect(
+                'units finalize', lambda: self._on_units_changed(scalex=True))
 
         if self.yaxis is not None:
-            self._ycid = self.yaxis.callbacks.connect('units finalize',
-                                                      self.relim)
+            self._ycid = self.yaxis.callbacks.connect(
+                'units finalize', lambda: self._on_units_changed(scaley=True))
 
         self.tick_params(
             top=rcParams['xtick.top'] and rcParams['xtick.minor.top'],
@@ -1891,6 +1891,15 @@ def add_container(self, container):
         container.set_remove_method(lambda h: self.containers.remove(h))
         return container
 
+    def _on_units_changed(self, scalex=False, scaley=False):
+        """
+        Callback for processing changes to axis units.
+
+        Currently forces updates of data limits and view limits.
+        """
+        self.relim()
+        self.autoscale_view(scalex=scalex, scaley=scaley)
+
     def relim(self, visible_only=False):
         """
         Recompute the data limits based on current artists. If you want to
 
@@ -76,7 +76,6 @@ def convert(value, unit, axis):
     ax.axvline(Quantity(120, 'minutes'), color='tab:green')
     ax.yaxis.set_units('inches')
     ax.xaxis.set_units('seconds')
-    ax.autoscale_view()
 
     assert qc.convert.called
     assert qc.axisinfo.called
 
@@ -110,13 +110,13 @@ def __init__(self, fig, rect=None, *args, **kwargs):
         # func used to format z -- fall back on major formatters
         self.fmt_zdata = None
 
-        if zscale is not None :
+        if zscale is not None:
             self.set_zscale(zscale)
 
-        if self.zaxis is not None :
-            self._zcid = self.zaxis.callbacks.connect('units finalize',
-                                                      self.relim)
-        else :
+        if self.zaxis is not None:
+            self._zcid = self.zaxis.callbacks.connect(
+                'units finalize', lambda: self._on_units_changed(scalez=True))
+        else:
             self._zcid = None
 
         self._ready = 1
@@ -307,6 +307,15 @@ def get_axis_position(self):
         zhigh = tc[0][2] > tc[2][2]
         return xhigh, yhigh, zhigh
 
+    def _on_units_changed(self, scalex=False, scaley=False, scalez=False):
+        """
+        Callback for processing changes to axis units.
+
+        Currently forces updates of data limits and view limits.
+        """
+        self.relim()
+        self.autoscale_view(scalex=scalex, scaley=scaley, scalez=scalez)
+
     def update_datalim(self, xys, **kwargs):
         pass