Merge pull request #7557 from efiring/scatter-no-expansion

tacaswell · web-flow · commit 79122a440ca0 · 2016-12-04T17:30:54.000-05:00
API: disable the margin override except in classic mode
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4038,16 +4038,16 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
             else:
                 collection.autoscale_None()
 
-        # The margin adjustment is a hack to deal with the fact that we don't
-        # want to transform all the symbols whose scales are in points
-        # to data coords to get the exact bounding box for efficiency
-        # reasons.  It can be done right if this is deemed important.
-        # Also, only bother with this padding if there is anything to draw.
-        if self._xmargin < 0.05 and x.size > 0:
-            self.set_xmargin(0.05)
-
-        if self._ymargin < 0.05 and x.size > 0:
-            self.set_ymargin(0.05)
+        # Classic mode only:
+        # ensure there are margins to allow for the
+        # finite size of the symbols.  In v2.x, margins
+        # are present by default, so we disable this
+        # scatter-specific override.
+        if rcParams['_internal.classic_mode']:
+            if self._xmargin < 0.05 and x.size > 0:
+                self.set_xmargin(0.05)
+            if self._ymargin < 0.05 and x.size > 0:
+                self.set_ymargin(0.05)
 
         self.add_collection(collection)
         self.autoscale_view()
