Merge pull request #21565 from anntzer/op

greglucas · web-flow · commit 162c0734cb38 · 2021-11-09T07:47:38.000-07:00
Further remove remnants of offset_position.
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -180,7 +180,6 @@ def __init__(self,
         self.set_pickradius(pickradius)
         self.set_urls(urls)
         self.set_hatch(hatch)
-        self._offset_position = "screen"
         self.set_zorder(zorder)
 
         if capstyle:
@@ -417,7 +416,7 @@ def draw(self, renderer):
                 self.get_facecolor(), self.get_edgecolor(),
                 self._linewidths, self._linestyles,
                 self._antialiaseds, self._urls,
-                self._offset_position)
+                "screen")  # offset_position, kept for backcompat.
 
         gc.restore()
         renderer.close_group(self.__class__.__name__)
@@ -470,8 +469,7 @@ def contains(self, mouseevent):
         ind = _path.point_in_path_collection(
             mouseevent.x, mouseevent.y, pickradius,
             transform.frozen(), paths, self.get_transforms(),
-            offsets, transOffset, pickradius <= 0,
-            self._offset_position)
+            offsets, transOffset, pickradius <= 0)
 
         return len(ind) > 0, dict(ind=ind)
 
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -312,7 +312,7 @@ static PyObject *Py_get_path_collection_extents(PyObject *self, PyObject *args,
 const char *Py_point_in_path_collection__doc__ =
     "point_in_path_collection("
     "x, y, radius, master_transform, paths, transforms, offsets, "
-    "offset_trans, filled, offset_position)\n"
+    "offset_trans, filled)\n"
     "--\n\n";
 
 static PyObject *Py_point_in_path_collection(PyObject *self, PyObject *args, PyObject *kwds)
@@ -324,11 +324,10 @@ static PyObject *Py_point_in_path_collection(PyObject *self, PyObject *args, PyO
     numpy::array_view<const double, 2> offsets;
     agg::trans_affine offset_trans;
     bool filled;
-    PyObject *offset_position; // no longer used
     std::vector<int> result;
 
     if (!PyArg_ParseTuple(args,
-                          "dddO&O&O&O&O&O&O:point_in_path_collection",
+                          "dddO&O&O&O&O&O&:point_in_path_collection",
                           &x,
                           &y,
                           &radius,
@@ -343,8 +342,7 @@ static PyObject *Py_point_in_path_collection(PyObject *self, PyObject *args, PyO
                           &convert_trans_affine,
                           &offset_trans,
                           &convert_bool,
-                          &filled,
-                          &offset_position)) {
+                          &filled)) {
         return NULL;
     }
 
