fedora-python
diff --git a/‎lib/matplotlib/legend.py‎
Lines changed: 11 additions & 3 deletions b/‎lib/matplotlib/legend.py‎
Lines changed: 11 additions & 3 deletions
diff --git a/‎lib/matplotlib/tests/test_legend.py‎
Lines changed: 6 additions & 3 deletions b/‎lib/matplotlib/tests/test_legend.py‎
Lines changed: 6 additions & 3 deletions
@@ -485,9 +485,12 @@ def __init__(self, parent, handles, labels,
         self.parent = parent
 
         if loc is None:
+            self._loc_used_default = True
             loc = rcParams["legend.loc"]
             if not self.isaxes and loc in [0, 'best']:
                 loc = 'upper right'
+        else:
+            self._loc_used_default = False
         if isinstance(loc, str):
             if loc not in self.codes:
                 if self.isaxes:
@@ -568,7 +571,8 @@ def __init__(self, parent, handles, labels,
         else:
             self.get_frame().set_alpha(framealpha)
 
-        self._loc = loc
+        self._set_loc(loc, is_initial_setting=True)
+
         # figure out title fontsize:
         if title_fontsize is None:
             title_fontsize = rcParams['legend.title_fontsize']
@@ -588,10 +592,13 @@ def _set_artist_props(self, a):
 
         a.set_transform(self.get_transform())
 
-    def _set_loc(self, loc):
+    def _set_loc(self, loc, is_initial_setting=False):
         # find_offset function will be provided to _legend_box and
         # _legend_box will draw itself at the location of the return
         # value of the find_offset.
+        if not is_initial_setting:
+            # User manually changed self._loc
+            self._loc_used_default = False
         self._loc_real = loc
         self.stale = True
         self._legend_box.set_offset(self._findoffset)
@@ -1108,7 +1115,8 @@ def _find_best_position(self, width, height, renderer, consider=None):
         assert self.isaxes
 
         verts, bboxes, lines, offsets = self._auto_legend_data()
-        if len(verts) + len(bboxes) + len(lines) + len(offsets) > 500000:
+        if self._loc_used_default and verts.shape[0] > 200000:
+            # this size results in a 3+ second render time on a good machine
             warnings.warn(
                 'Creating legend with loc="best" can be slow with large'
                 ' amounts of data.'
 
@@ -567,10 +567,13 @@ def test_alpha_handles():
 
 def test_warn_big_data_best_loc():
     fig, ax = plt.subplots()
-    ax.plot(np.arange(500001), label='Is this big data?')
+    ax.plot(np.arange(200001), label='Is this big data?')
     with pytest.warns(UserWarning) as records:
-        l = ax.legend(loc='best')
-        l.draw(fig.canvas.get_renderer())
+        l = ax.legend()
+        # We need to call an internal set method tricking it into thinking
+        # 'best' location was default.
+        l._set_loc(l.codes['best'], is_initial_setting=True)
+        fig.canvas.draw()
     # The _find_best_position method of Legend is called twice, duplicating
     # the warning message.
     assert len(records) == 2