Add properties in addition to get/set

mdboom · mdboom · commit b68950c6076b · 2015-12-05T06:48:16.000-08:00
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -914,6 +914,8 @@ def set_top_margin(self, margin):
             self.stale = True
         self._margins['top'] = margin
 
+    top_margin = property(get_top_margin, set_top_margin)
+
     def get_bottom_margin(self):
         """
         Get whether a margin should be applied to the bottom of the Artist.
@@ -928,6 +930,8 @@ def set_bottom_margin(self, margin):
             self.stale = True
         self._margins['bottom'] = margin
 
+    bottom_margin = property(get_bottom_margin, set_bottom_margin)
+
     def get_left_margin(self):
         """
         Get whether a margin should be applied to the left of the Artist.
@@ -942,6 +946,8 @@ def set_left_margin(self, margin):
             self.stale = True
         self._margins['left'] = margin
 
+    left_margin = property(get_left_margin, set_left_margin)
+
     def get_right_margin(self):
         """
         Get whether a margin should be applied to the right of the Artist.
@@ -956,6 +962,8 @@ def set_right_margin(self, margin):
             self.stale = True
         self._margins['right'] = margin
 
+    right_margin = property(get_right_margin, set_right_margin)
+
     def get_margins(self):
         """
         Returns a dictionary describing whether a margin should be applied on
@@ -983,6 +991,8 @@ def set_margins(self, margins):
 
         self._margins = margins
 
+    margins = property(get_margins, set_margins)
+
     def update_from(self, other):
         'Copy properties from *other* to *self*.'
         self._transform = other._transform
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2155,7 +2155,7 @@ def autoscale_view(self, tight=None, scalex=True, scaley=True):
             for artist_set in [self.collections, self.patches, self.lines,
                                self.artists, self.images]:
                 for artist in artist_set:
-                    artist_margins = artist.get_margins()
+                    artist_margins = artist.margins
                     for key in ['left', 'right', 'top', 'bottom']:
                         margins[key] &= artist_margins.get(key, True)
 
@@ -2164,7 +2164,7 @@ def autoscale_view(self, tight=None, scalex=True, scaley=True):
                     for artist_set in [axes.collections, axes.patches,
                                        axes.lines, axes.artists, axes.images]:
                         for artist in artist_set:
-                            artist_margins = artist.get_margins()
+                            artist_margins = artist.margins
                             for key in ['left', 'right']:
                                 margins[key] &= artist_margins.get(key, True)
 
@@ -2173,7 +2173,7 @@ def autoscale_view(self, tight=None, scalex=True, scaley=True):
                     for artist_set in [axes.collections, axes.patches,
                                        axes.lines, axes.artists, axes.images]:
                         for artist in artist_set:
-                            artist_margins = artist.get_margins()
+                            artist_margins = artist.margins
                             for key in ['top', 'bottom']:
                                 margins[key] &= artist_margins.get(key, True)
         else:
