MNT: Changed LockableBbox to use properties.

QuLogic · QuLogic · commit 56362fec4582 · 2017-07-27T00:24:26.000-04:00
diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
@@ -612,25 +612,25 @@ def test_lockable_bbox(locked_element):
 
     # LockableBbox should keep its locked element as specified in __init__.
     assert getattr(locked, locked_element) == 2
-    assert getattr(locked, 'get_locked_' + locked_element)() == 2
+    assert getattr(locked, 'locked_' + locked_element) == 2
     for elem in other_elements:
         assert getattr(locked, elem) == getattr(orig, elem)
 
     # Changing underlying Bbox should update everything but locked element.
     orig.set_points(orig.get_points() + 10)
     assert getattr(locked, locked_element) == 2
-    assert getattr(locked, 'get_locked_' + locked_element)() == 2
+    assert getattr(locked, 'locked_' + locked_element) == 2
     for elem in other_elements:
         assert getattr(locked, elem) == getattr(orig, elem)
 
     # Unlocking element should revert values back to the underlying Bbox.
-    getattr(locked, 'set_locked_' + locked_element)(None)
-    assert getattr(locked, 'get_locked_' + locked_element)() is None
+    setattr(locked, 'locked_' + locked_element, None)
+    assert getattr(locked, 'locked_' + locked_element) is None
     assert np.all(orig.get_points() == locked.get_points())
 
     # Relocking an element should change its value, but not others.
-    getattr(locked, 'set_locked_' + locked_element)(3)
+    setattr(locked, 'locked_' + locked_element, 3)
     assert getattr(locked, locked_element) == 3
-    assert getattr(locked, 'get_locked_' + locked_element)() == 3
+    assert getattr(locked, 'locked_' + locked_element) == 3
     for elem in other_elements:
         assert getattr(locked, elem) == getattr(orig, elem)
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -1155,94 +1155,70 @@ def get_points(self):
             self._check(points)
             return points
 
-    def set_locked_x0(self, x0):
-        """
-        Set the value to be used for the locked x0.
-
-        Parameters
-        ----------
-        x0 : float or None
-            The locked value for x0, or None to unlock.
-        """
-        self._locked_points.mask[0, 0] = x0 is None
-        self._locked_points.data[0, 0] = x0
-        self.invalidate()
-
-    def get_locked_x0(self):
+    @property
+    def locked_x0(self):
         """
-        Get the value used for the locked x0.
+        float or None: The value used for the locked x0.
         """
         if self._locked_points.mask[0, 0]:
             return None
         else:
             return self._locked_points[0, 0]
 
-    def set_locked_y0(self, y0):
-        """
-        Set the value to be used for the locked y0.
-
-        Parameters
-        ----------
-        y0 : float or None
-            The locked value for y0, or None to unlock.
-        """
-        self._locked_points.mask[0, 1] = y0 is None
-        self._locked_points.data[0, 1] = y0
+    @locked_x0.setter
+    def locked_x0(self, x0):
+        self._locked_points.mask[0, 0] = x0 is None
+        self._locked_points.data[0, 0] = x0
         self.invalidate()
 
-    def get_locked_y0(self):
+    @property
+    def locked_y0(self):
         """
-        Get the value used for the locked y0.
+        float or None: The value used for the locked y0.
         """
         if self._locked_points.mask[0, 1]:
             return None
         else:
             return self._locked_points[0, 1]
 
-    def set_locked_x1(self, x1):
-        """
-        Set the value to be used for the locked x1.
-
-        Parameters
-        ----------
-        x1 : float or None
-            The locked value for x1, or None to unlock.
-        """
-        self._locked_points.mask[1, 0] = x1 is None
-        self._locked_points.data[1, 0] = x1
+    @locked_y0.setter
+    def locked_y0(self, y0):
+        self._locked_points.mask[0, 1] = y0 is None
+        self._locked_points.data[0, 1] = y0
         self.invalidate()
 
-    def get_locked_x1(self):
+    @property
+    def locked_x1(self):
         """
-        Get the value used for the locked x1.
+        float or None: The value used for the locked x1.
         """
         if self._locked_points.mask[1, 0]:
             return None
         else:
             return self._locked_points[1, 0]
 
-    def set_locked_y1(self, y1):
-        """
-        Set the value to be used for the locked y1.
-
-        Parameters
-        ----------
-        y1 : float or None
-            The locked value for y1, or None to unlock.
-        """
-        self._locked_points.mask[1, 1] = y1 is None
-        self._locked_points.data[1, 1] = y1
+    @locked_x1.setter
+    def locked_x1(self, x1):
+        self._locked_points.mask[1, 0] = x1 is None
+        self._locked_points.data[1, 0] = x1
         self.invalidate()
 
-    def get_locked_y1(self):
+    @property
+    def locked_y1(self):
         """
-        Get the value used for the locked y1.
+        float or None: The value used for the locked y1.
         """
         if self._locked_points.mask[1, 1]:
             return None
         else:
             return self._locked_points[1, 1]
 
+    @locked_y1.setter
+    def locked_y1(self, y1):
+        self._locked_points.mask[1, 1] = y1 is None
+        self._locked_points.data[1, 1] = y1
+        self.invalidate()
+
 
 class Transform(TransformNode):
     """
