Skip to content

Commit ed98ff0

Browse files
ShaharNavehWillAyd
authored andcommitted
STY: x.__class__ to type(x) #batch-3 (#29894)
1 parent eaf4860 commit ed98ff0

File tree

9 files changed

+26
-29
lines changed

9 files changed

+26
-29
lines changed

pandas/core/indexing.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class _NDFrameIndexer(_NDFrameIndexerBase):
105105

106106
def __call__(self, axis=None):
107107
# we need to return a copy of ourselves
108-
new_self = self.__class__(self.name, self.obj)
108+
new_self = type(self)(self.name, self.obj)
109109

110110
if axis is not None:
111111
axis = self.obj._get_axis_number(axis)
@@ -228,7 +228,9 @@ def _validate_key(self, key, axis: int):
228228
raise AbstractMethodError(self)
229229

230230
def _has_valid_tuple(self, key: Tuple):
231-
""" check the key for valid keys across my indexer """
231+
"""
232+
Check the key for valid keys across my indexer.
233+
"""
232234
for i, k in enumerate(key):
233235
if i >= self.ndim:
234236
raise IndexingError("Too many indexers")

pandas/core/internals/blocks.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,11 @@ def make_block_same_class(self, values, placement=None, ndim=None):
257257
placement = self.mgr_locs
258258
if ndim is None:
259259
ndim = self.ndim
260-
return make_block(values, placement=placement, ndim=ndim, klass=self.__class__)
260+
return make_block(values, placement=placement, ndim=ndim, klass=type(self))
261261

262262
def __repr__(self) -> str:
263263
# don't want to print out all of the items here
264-
name = pprint_thing(self.__class__.__name__)
264+
name = type(self).__name__
265265
if self._is_single_block:
266266

267267
result = "{name}: {len} dtype: {dtype}".format(

pandas/core/internals/concat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def __init__(self, block, shape, indexers=None):
122122

123123
def __repr__(self) -> str:
124124
return "{name}({block!r}, {indexers})".format(
125-
name=self.__class__.__name__, block=self.block, indexers=self.indexers
125+
name=type(self).__name__, block=self.block, indexers=self.indexers
126126
)
127127

128128
@cache_readonly

pandas/core/internals/managers.py

+10-12
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def make_empty(self, axes=None):
153153
blocks = np.array([], dtype=self.array_dtype)
154154
else:
155155
blocks = []
156-
return self.__class__(blocks, axes)
156+
return type(self)(blocks, axes)
157157

158158
def __nonzero__(self):
159159
return True
@@ -316,7 +316,7 @@ def __len__(self) -> int:
316316
return len(self.items)
317317

318318
def __repr__(self) -> str:
319-
output = pprint_thing(self.__class__.__name__)
319+
output = type(self).__name__
320320
for i, ax in enumerate(self.axes):
321321
if i == 0:
322322
output += "\nItems: {ax}".format(ax=ax)
@@ -430,7 +430,7 @@ def apply(
430430

431431
if len(result_blocks) == 0:
432432
return self.make_empty(axes or self.axes)
433-
bm = self.__class__(
433+
bm = type(self)(
434434
result_blocks, axes or self.axes, do_integrity_check=do_integrity_check
435435
)
436436
bm._consolidate_inplace()
@@ -519,7 +519,7 @@ def get_axe(block, qs, axes):
519519
for b in blocks
520520
]
521521

522-
return self.__class__(blocks, new_axes)
522+
return type(self)(blocks, new_axes)
523523

524524
# single block, i.e. ndim == {1}
525525
values = concat_compat([b.values for b in blocks])
@@ -629,7 +629,7 @@ def comp(s, regex=False):
629629
rb = new_rb
630630
result_blocks.extend(rb)
631631

632-
bm = self.__class__(result_blocks, self.axes)
632+
bm = type(self)(result_blocks, self.axes)
633633
bm._consolidate_inplace()
634634
return bm
635635

@@ -724,7 +724,7 @@ def combine(self, blocks, copy=True):
724724
axes = list(self.axes)
725725
axes[0] = self.items.take(indexer)
726726

727-
return self.__class__(new_blocks, axes, do_integrity_check=False)
727+
return type(self)(new_blocks, axes, do_integrity_check=False)
728728

729729
def get_slice(self, slobj, axis=0):
730730
if axis >= self.ndim:
@@ -741,7 +741,7 @@ def get_slice(self, slobj, axis=0):
741741
new_axes = list(self.axes)
742742
new_axes[axis] = new_axes[axis][slobj]
743743

744-
bm = self.__class__(new_blocks, new_axes, do_integrity_check=False)
744+
bm = type(self)(new_blocks, new_axes, do_integrity_check=False)
745745
bm._consolidate_inplace()
746746
return bm
747747

@@ -917,7 +917,7 @@ def consolidate(self):
917917
if self.is_consolidated():
918918
return self
919919

920-
bm = self.__class__(self.blocks, self.axes)
920+
bm = type(self)(self.blocks, self.axes)
921921
bm._is_consolidated = False
922922
bm._consolidate_inplace()
923923
return bm
@@ -1251,7 +1251,7 @@ def reindex_indexer(
12511251

12521252
new_axes = list(self.axes)
12531253
new_axes[axis] = new_axis
1254-
return self.__class__(new_blocks, new_axes)
1254+
return type(self)(new_blocks, new_axes)
12551255

12561256
def _slice_take_blocks_ax0(self, slice_or_indexer, fill_tuple=None):
12571257
"""
@@ -1521,9 +1521,7 @@ def get_slice(self, slobj, axis=0):
15211521
if axis >= self.ndim:
15221522
raise IndexError("Requested axis not found in manager")
15231523

1524-
return self.__class__(
1525-
self._block._slice(slobj), self.index[slobj], fastpath=True
1526-
)
1524+
return type(self)(self._block._slice(slobj), self.index[slobj], fastpath=True)
15271525

15281526
@property
15291527
def index(self):

pandas/core/resample.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def __str__(self) -> str:
9696
if getattr(self.groupby, k, None) is not None
9797
)
9898
return "{klass} [{attrs}]".format(
99-
klass=self.__class__.__name__, attrs=", ".join(attrs)
99+
klass=type(self).__name__, attrs=", ".join(attrs)
100100
)
101101

102102
def __getattr__(self, attr):
@@ -885,7 +885,7 @@ def count(self):
885885
result = self._downsample("count")
886886
if not len(self.ax):
887887
if self._selected_obj.ndim == 1:
888-
result = self._selected_obj.__class__(
888+
result = type(self._selected_obj)(
889889
[], index=result.index, dtype="int64", name=self._selected_obj.name
890890
)
891891
else:

pandas/core/series.py

+3-6
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,7 @@ def __init__(
256256
elif is_extension_array_dtype(data):
257257
pass
258258
elif isinstance(data, (set, frozenset)):
259-
raise TypeError(
260-
"{0!r} type is unordered".format(data.__class__.__name__)
261-
)
259+
raise TypeError(f"{repr(type(data).__name__)} type is unordered")
262260
elif isinstance(data, ABCSparseArray):
263261
# handle sparse passed here (and force conversion)
264262
data = data.to_dense()
@@ -1535,9 +1533,8 @@ def to_string(
15351533
# catch contract violations
15361534
if not isinstance(result, str):
15371535
raise AssertionError(
1538-
"result must be of type unicode, type"
1539-
" of result is {0!r}"
1540-
"".format(result.__class__.__name__)
1536+
"result must be of type str, type"
1537+
f" of result is {repr(type(result).__name__)}"
15411538
)
15421539

15431540
if buf is None:

pandas/core/window/rolling.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def _get_window(self, other=None, win_type: Optional[str] = None) -> int:
204204

205205
@property
206206
def _window_type(self) -> str:
207-
return self.__class__.__name__
207+
return type(self).__name__
208208

209209
def __repr__(self) -> str:
210210
"""

pandas/errors/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,6 @@ def __str__(self) -> str:
178178
if self.methodtype == "classmethod":
179179
name = self.class_instance.__name__
180180
else:
181-
name = self.class_instance.__class__.__name__
181+
name = type(self.class_instance).__name__
182182
msg = "This {methodtype} must be defined in the concrete class {name}"
183183
return msg.format(methodtype=self.methodtype, name=name)

pandas/io/clipboard/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ def _stringifyText(text) -> str:
9595
acceptedTypes = (str, int, float, bool)
9696
if not isinstance(text, acceptedTypes):
9797
raise PyperclipException(
98-
f"only str, int, float, and bool values"
99-
f"can be copied to the clipboard, not {text.__class__.__name__}"
98+
f"only str, int, float, and bool values "
99+
f"can be copied to the clipboard, not {type(text).__name__}"
100100
)
101101
return str(text)
102102

0 commit comments

Comments
 (0)