Skip to content

Commit ebdce62

Browse files
committed
Remove transform arguments from _iter_collection
They are unused in it.
1 parent 65cbdef commit ebdce62

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

lib/matplotlib/backend_bases.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
251251
paths, all_transforms)
252252

253253
for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
254-
gc, master_transform, all_transforms, list(path_ids), offsets,
255-
offsetTrans, facecolors, edgecolors, linewidths, linestyles,
254+
gc, list(path_ids), offsets, offsetTrans,
255+
facecolors, edgecolors, linewidths, linestyles,
256256
antialiaseds, urls, offset_position):
257257
path, transform = path_id
258258
# Only apply another translation if we have an offset, else we
@@ -367,8 +367,7 @@ def _iter_collection_uses_per_path(self, paths, all_transforms,
367367
N = max(Npath_ids, len(offsets))
368368
return (N + Npath_ids - 1) // Npath_ids
369369

370-
def _iter_collection(self, gc, master_transform, all_transforms,
371-
path_ids, offsets, offsetTrans, facecolors,
370+
def _iter_collection(self, gc, path_ids, offsets, offsetTrans, facecolors,
372371
edgecolors, linewidths, linestyles,
373372
antialiaseds, urls, offset_position):
374373
"""

lib/matplotlib/backends/backend_pdf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2097,8 +2097,8 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
20972097
output(*self.gc.push())
20982098
lastx, lasty = 0, 0
20992099
for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
2100-
gc, master_transform, all_transforms, path_codes, offsets,
2101-
offsetTrans, facecolors, edgecolors, linewidths, linestyles,
2100+
gc, path_codes, offsets, offsetTrans,
2101+
facecolors, edgecolors, linewidths, linestyles,
21022102
antialiaseds, urls, offset_position):
21032103

21042104
self.check_gc(gc0, rgbFace)

lib/matplotlib/backends/backend_ps.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,8 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
567567
path_codes.append(name)
568568

569569
for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
570-
gc, master_transform, all_transforms, path_codes, offsets,
571-
offsetTrans, facecolors, edgecolors, linewidths, linestyles,
570+
gc, path_codes, offsets, offsetTrans,
571+
facecolors, edgecolors, linewidths, linestyles,
572572
antialiaseds, urls, offset_position):
573573
ps = "%g %g %s" % (xo, yo, path_id)
574574
self._draw_ps(ps, gc0, rgbFace)

lib/matplotlib/backends/backend_svg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -753,8 +753,8 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
753753
writer.end('defs')
754754

755755
for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
756-
gc, master_transform, all_transforms, path_codes, offsets,
757-
offsetTrans, facecolors, edgecolors, linewidths, linestyles,
756+
gc, path_codes, offsets, offsetTrans,
757+
facecolors, edgecolors, linewidths, linestyles,
758758
antialiaseds, urls, offset_position):
759759
url = gc0.get_url()
760760
if url is not None:

lib/matplotlib/tests/test_backend_bases.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ def check(master_transform, paths, all_transforms,
2828
gc = rb.new_gc()
2929
ids = [path_id for xo, yo, path_id, gc0, rgbFace in
3030
rb._iter_collection(
31-
gc, master_transform, all_transforms,
32-
range(len(raw_paths)), offsets,
31+
gc, range(len(raw_paths)), offsets,
3332
transforms.AffineDeltaTransform(master_transform),
3433
facecolors, edgecolors, [], [], [False],
3534
[], 'screen')]

0 commit comments

Comments
 (0)