Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5d89f35

Browse files
authored
Merge pull request #30475 from brchristian/fix_method_name_typo
Fix spelling error in `contains_branch_separately` method name
2 parents 0394f4e + a6267f7 commit 5d89f35

File tree

7 files changed

+27
-21
lines changed

7 files changed

+27
-21
lines changed

lib/matplotlib/axes/_axes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ def hlines(self, y, xmin, xmax, colors=None, linestyles='solid',
11831183
if self.name == "rectilinear":
11841184
datalim = lines.get_datalim(self.transData)
11851185
t = lines.get_transform()
1186-
updatex, updatey = t.contains_branch_seperately(self.transData)
1186+
updatex, updatey = t.contains_branch_separately(self.transData)
11871187
minx = np.nanmin(datalim.xmin)
11881188
maxx = np.nanmax(datalim.xmax)
11891189
miny = np.nanmin(datalim.ymin)
@@ -1275,7 +1275,7 @@ def vlines(self, x, ymin, ymax, colors=None, linestyles='solid',
12751275
if self.name == "rectilinear":
12761276
datalim = lines.get_datalim(self.transData)
12771277
t = lines.get_transform()
1278-
updatex, updatey = t.contains_branch_seperately(self.transData)
1278+
updatex, updatey = t.contains_branch_separately(self.transData)
12791279
minx = np.nanmin(datalim.xmin)
12801280
maxx = np.nanmax(datalim.xmax)
12811281
miny = np.nanmin(datalim.ymin)
@@ -6809,7 +6809,7 @@ def _update_pcolor_lims(self, collection, coords):
68096809
hasattr(t, '_as_mpl_transform')):
68106810
t = t._as_mpl_transform(self.axes)
68116811

6812-
if t and any(t.contains_branch_seperately(self.transData)):
6812+
if t and any(t.contains_branch_separately(self.transData)):
68136813
trans_to_data = t - self.transData
68146814
coords = trans_to_data.transform(coords)
68156815

lib/matplotlib/axes/_base.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2380,9 +2380,9 @@ def add_collection(self, collection, autolim=True):
23802380
# only update the dataLim for x/y if the collection uses transData
23812381
# in this direction.
23822382
x_is_data, y_is_data = (collection.get_transform()
2383-
.contains_branch_seperately(self.transData))
2383+
.contains_branch_separately(self.transData))
23842384
ox_is_data, oy_is_data = (collection.get_offset_transform()
2385-
.contains_branch_seperately(self.transData))
2385+
.contains_branch_separately(self.transData))
23862386
self.update_datalim(
23872387
points,
23882388
updatex=x_is_data or ox_is_data,
@@ -2451,7 +2451,7 @@ def _update_line_limits(self, line):
24512451

24522452
if line_trf == self.transData:
24532453
data_path = path
2454-
elif any(line_trf.contains_branch_seperately(self.transData)):
2454+
elif any(line_trf.contains_branch_separately(self.transData)):
24552455
# Compute the transform from line coordinates to data coordinates.
24562456
trf_to_data = line_trf - self.transData
24572457
# If transData is affine we can use the cached non-affine component
@@ -2474,7 +2474,7 @@ def _update_line_limits(self, line):
24742474
if not data_path.vertices.size:
24752475
return
24762476

2477-
updatex, updatey = line_trf.contains_branch_seperately(self.transData)
2477+
updatex, updatey = line_trf.contains_branch_separately(self.transData)
24782478
if self.name != "rectilinear":
24792479
# This block is mostly intended to handle axvline in polar plots,
24802480
# for which updatey would otherwise be True.
@@ -2527,7 +2527,7 @@ def _update_patch_limits(self, patch):
25272527
vertices = np.vstack(vertices)
25282528

25292529
patch_trf = patch.get_transform()
2530-
updatex, updatey = patch_trf.contains_branch_seperately(self.transData)
2530+
updatex, updatey = patch_trf.contains_branch_separately(self.transData)
25312531
if not (updatex or updatey):
25322532
return
25332533
if self.name != "rectilinear":

lib/matplotlib/collections.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def get_datalim(self, transData):
283283

284284
offsets = self.get_offsets()
285285

286-
if any(transform.contains_branch_seperately(transData)):
286+
if any(transform.contains_branch_separately(transData)):
287287
# collections that are just in data units (like quiver)
288288
# can properly have the axes limits set by their shape +
289289
# offset. LineCollections that have no offsets can

lib/matplotlib/contour.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ def _process_args(self, *args, corner_mask=None, algorithm=None, **kwargs):
13331333
# if the transform is not trans data, and some part of it
13341334
# contains transData, transform the xs and ys to data coordinates
13351335
if (t != self.axes.transData and
1336-
any(t.contains_branch_seperately(self.axes.transData))):
1336+
any(t.contains_branch_separately(self.axes.transData))):
13371337
trans_to_data = t - self.axes.transData
13381338
pts = np.vstack([x.flat, y.flat]).T
13391339
transformed_pts = trans_to_data.transform(pts)

lib/matplotlib/tests/test_transforms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,9 +694,9 @@ def test_contains_branch(self):
694694
assert not self.stack1.contains_branch(self.tn1 + self.ta2)
695695

696696
blend = mtransforms.BlendedGenericTransform(self.tn2, self.stack2)
697-
x, y = blend.contains_branch_seperately(self.stack2_subset)
697+
x, y = blend.contains_branch_separately(self.stack2_subset)
698698
stack_blend = self.tn3 + blend
699-
sx, sy = stack_blend.contains_branch_seperately(self.stack2_subset)
699+
sx, sy = stack_blend.contains_branch_separately(self.stack2_subset)
700700
assert x is sx is False
701701
assert y is sy is True
702702

lib/matplotlib/transforms.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1418,24 +1418,29 @@ def contains_branch(self, other):
14181418
return True
14191419
return False
14201420

1421-
def contains_branch_seperately(self, other_transform):
1421+
def contains_branch_separately(self, other_transform):
14221422
"""
14231423
Return whether the given branch is a sub-tree of this transform on
14241424
each separate dimension.
14251425
14261426
A common use for this method is to identify if a transform is a blended
14271427
transform containing an Axes' data transform. e.g.::
14281428
1429-
x_isdata, y_isdata = trans.contains_branch_seperately(ax.transData)
1429+
x_isdata, y_isdata = trans.contains_branch_separately(ax.transData)
14301430
14311431
"""
14321432
if self.output_dims != 2:
1433-
raise ValueError('contains_branch_seperately only supports '
1433+
raise ValueError('contains_branch_separately only supports '
14341434
'transforms with 2 output dimensions')
14351435
# for a non-blended transform each separate dimension is the same, so
14361436
# just return the appropriate shape.
14371437
return (self.contains_branch(other_transform), ) * 2
14381438

1439+
# Permanent alias for backwards compatibility (historical typo)
1440+
def contains_branch_seperately(self, other_transform):
1441+
""":meta private:"""
1442+
return self.contains_branch_separately(other_transform)
1443+
14391444
def __sub__(self, other):
14401445
"""
14411446
Compose *self* with the inverse of *other*, cancelling identical terms
@@ -2185,7 +2190,7 @@ def __eq__(self, other):
21852190
else:
21862191
return NotImplemented
21872192

2188-
def contains_branch_seperately(self, transform):
2193+
def contains_branch_separately(self, transform):
21892194
return (self._x.contains_branch(transform),
21902195
self._y.contains_branch(transform))
21912196

@@ -2411,14 +2416,14 @@ def _iter_break_from_left_to_right(self):
24112416
for left, right in self._b._iter_break_from_left_to_right():
24122417
yield self._a + left, right
24132418

2414-
def contains_branch_seperately(self, other_transform):
2419+
def contains_branch_separately(self, other_transform):
24152420
# docstring inherited
24162421
if self.output_dims != 2:
2417-
raise ValueError('contains_branch_seperately only supports '
2422+
raise ValueError('contains_branch_separately only supports '
24182423
'transforms with 2 output dimensions')
24192424
if self == other_transform:
24202425
return (True, True)
2421-
return self._b.contains_branch_seperately(other_transform)
2426+
return self._b.contains_branch_separately(other_transform)
24222427

24232428
depth = property(lambda self: self._a.depth + self._b.depth)
24242429
is_affine = property(lambda self: self._a.is_affine and self._b.is_affine)

lib/matplotlib/transforms.pyi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,10 @@ class Transform(TransformNode):
189189
@property
190190
def depth(self) -> int: ...
191191
def contains_branch(self, other: Transform) -> bool: ...
192-
def contains_branch_seperately(
192+
def contains_branch_separately(
193193
self, other_transform: Transform
194194
) -> Sequence[bool]: ...
195+
contains_branch_seperately = contains_branch_separately # Alias (historical typo)
195196
def __sub__(self, other: Transform) -> Transform: ...
196197
def __array__(self, *args, **kwargs) -> np.ndarray: ...
197198
def transform(self, values: ArrayLike) -> np.ndarray: ...
@@ -252,7 +253,7 @@ class IdentityTransform(Affine2DBase): ...
252253

253254
class _BlendedMixin:
254255
def __eq__(self, other: object) -> bool: ...
255-
def contains_branch_seperately(self, transform: Transform) -> Sequence[bool]: ...
256+
def contains_branch_separately(self, transform: Transform) -> Sequence[bool]: ...
256257

257258
class BlendedGenericTransform(_BlendedMixin, Transform):
258259
input_dims: Literal[2]

0 commit comments

Comments
 (0)