matplotlib
diff --git a/‎lib/matplotlib/colorbar.py
Copy file name to clipboardExpand all lines: lib/matplotlib/colorbar.py
+17-6Lines changed: 17 additions & 6 deletions b/‎lib/matplotlib/colorbar.py
Copy file name to clipboardExpand all lines: lib/matplotlib/colorbar.py
+17-6Lines changed: 17 additions & 6 deletions
diff --git a/‎lib/matplotlib/tests/test_colorbar.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_colorbar.py
+14Lines changed: 14 additions & 0 deletions b/‎lib/matplotlib/tests/test_colorbar.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_colorbar.py
+14Lines changed: 14 additions & 0 deletions
@@ -262,7 +262,7 @@ def __init__(self, parent, userax=True):
             outer_ax = parent
 
         inner_ax = outer_ax.inset_axes([0, 0, 1, 1])
-        self.__dict__ = inner_ax.__dict__
+        self.__dict__.update(inner_ax.__dict__)
 
         self.outer_ax = outer_ax
         self.inner_ax = inner_ax
@@ -749,6 +749,8 @@ def _get_ticker_locator_formatter(self):
                 locator = ticker.FixedLocator(b, nbins=10)
         else:  # most cases:
             if locator is None:
+                # we haven't set the locator explicitly, so use the default
+                # for this axis:
                 locator = self._long_axis().get_major_locator()
             if minorlocator is None:
                 minorlocator = self._long_axis().get_minor_locator()
@@ -793,8 +795,18 @@ def set_ticks(self, ticks, update_ticks=True):
         self.stale = True
 
     def get_ticks(self, minor=False):
-        """Return the x ticks as a list of locations."""
-        return self._long_axis().get_majorticklocs()
+        """
+        Return the x ticks as a list of locations.
+
+        Parameters
+        ----------
+        minor : boolean, default: False
+            if True return the minor ticks.
+        """
+        if minor:
+            return self._long_axis().get_minorticklocs()
+        else:
+            return self._long_axis().get_majorticklocs()
 
     @_api.delete_parameter("3.5", "update_ticks")
     def set_ticklabels(self, ticklabels, update_ticks=True):
@@ -905,8 +917,7 @@ def _process_values(self):
             self._boundaries = np.array(self.boundaries)
             return
 
-        # otherwise values are set from the boundaries (and probably aren't
-        # that important)
+        # otherwise values are set from the boundaries
         if isinstance(self.norm, colors.BoundaryNorm):
             b = self.norm.boundaries
         else:
@@ -916,7 +927,7 @@ def _process_values(self):
         # add extra boundaries if needed:
         if self._extend_lower():
             b = np.hstack((b[0] - 1, b))
-        if self._extend_lower():
+        if self._extend_upper():
             b = np.hstack((b, b[-1] + 1))
 
         # transform from 0-1 to vmin-vmax:
 
@@ -442,6 +442,20 @@ def test_colorbar_get_ticks():
     defTicks = plt.colorbar(orientation='horizontal')
     np.testing.assert_allclose(defTicks.get_ticks().tolist(), levels)
 
+    # test normal ticks and minor ticks
+    fig, ax = plt.subplots()
+    x = np.arange(-3.0, 4.001)
+    y = np.arange(-4.0, 3.001)
+    X, Y = np.meshgrid(x, y)
+    Z = X * Y
+    Z = Z[:-1, :-1]
+    pcm = ax.pcolormesh(X, Y, Z)
+    cbar = fig.colorbar(pcm, ax=ax, extend='both',
+                        orientation='vertical')
+    ticks = cbar.get_ticks()
+    np.testing.assert_allclose(ticks, np.arange(-15, 16, 5))
+    assert len(cbar.get_ticks(minor=True)) == 0
+
 
 def test_colorbar_lognorm_extension():
     # Test that colorbar with lognorm is extended correctly