Skip to content

Commit

Permalink
CLN: assorted cleanups (#31056)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbrockmendel authored and jorisvandenbossche committed Jan 16, 2020
1 parent 2ba6be7 commit 5d49730
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pandas/core/indexes/interval.py
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@ def equals(self, other) -> bool:
if not isinstance(other, IntervalIndex):
if not is_interval_dtype(other):
return False
other = Index(getattr(other, ".values", other))
other = Index(other)

return (
self.left.equals(other.left)
Expand Down
6 changes: 0 additions & 6 deletions pandas/core/internals/managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -669,12 +669,6 @@ def is_numeric_mixed_type(self):
self._consolidate_inplace()
return all(block.is_numeric for block in self.blocks)

@property
def is_datelike_mixed_type(self):
# Warning, consolidation needs to get checked upstairs
self._consolidate_inplace()
return any(block.is_datelike for block in self.blocks)

@property
def any_extension_types(self):
"""Whether any of the blocks in this manager are extension blocks"""
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/series.py
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ def __array__(self, dtype=None) -> np.ndarray:
Returns
-------
numpy.ndarray
The values in the series converted to a :class:`numpy.ndarary`
The values in the series converted to a :class:`numpy.ndarray`
with the specified `dtype`.
See Also
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/frame/indexing/test_indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -2179,7 +2179,7 @@ def test_type_error_multiindex(self):
dg = df.pivot_table(index="i", columns="c", values=["x", "y"])

with pytest.raises(TypeError, match="is an invalid key"):
str(dg[:, 0])
dg[:, 0]

index = Index(range(2), name="i")
columns = MultiIndex(
Expand Down

0 comments on commit 5d49730

Please sign in to comment.