Use @Property decorator in axisartist.

QuLogic · QuLogic · commit 5458d4ea7636 · 2018-02-06T02:56:56.000-05:00
diff --git a/lib/mpl_toolkits/axisartist/angle_helper.py b/lib/mpl_toolkits/axisartist/angle_helper.py
@@ -168,21 +168,17 @@ def __init__(self, den, include_last=True):
         self.den = den
         self._include_last = include_last
 
-    def _get_nbins(self):
+    @property
+    def nbins(self):
         return self.den
 
-    def _set_nbins(self, v):
+    @nbins.setter
+    def nbins(self, v):
         self.den = v
 
-    nbins = property(_get_nbins, _set_nbins)
-
-    def set_params(self, **kwargs):
-        if "nbins" in kwargs:
-            self.den = int(kwargs.pop("nbins"))
-
-        if kwargs:
-            raise ValueError("Following keys are not processed: %s"
-                             % ", ".join(kwargs))
+    def set_params(self, nbins=None):
+        if nbins is not None:
+            self.den = int(nbins)
 
 
 class LocatorHMS(LocatorBase):
diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py
@@ -928,14 +928,13 @@ class AxisArtist(martist.Artist):
 
     ZORDER=2.5
 
-    # LABELPAD : as property
-    def _set_labelpad(self, v):
-        return self.label.set_pad(v)
-
-    def _get_labelpad(self):
+    @property
+    def LABELPAD(self):
         return self.label.get_pad()
 
-    LABELPAD = property(_get_labelpad, _set_labelpad)
+    @LABELPAD.setter
+    def LABELPAD(self, v):
+        return self.label.set_pad(v)
 
     def __init__(self, axes,
                  helper,
diff --git a/lib/mpl_toolkits/axisartist/axislines.py b/lib/mpl_toolkits/axisartist/axislines.py
@@ -641,11 +641,10 @@ def _init_axis_artists(self, axes=None):
             axisline.major_ticklabels.set_visible(False)
             axisline.minor_ticklabels.set_visible(False)
 
-    def _get_axislines(self):
+    @property
+    def axis(self):
         return self._axislines
 
-    axis = property(_get_axislines)
-
     def new_gridlines(self, grid_helper=None):
         """
         Create and return a new GridlineCollection instance.
