Skip to content

Commit 878d319

Browse files
ShaharNavehWillAyd
authored andcommitted
STY: x.__class__ to type(x) #batch-6 (#29905)
1 parent dbae240 commit 878d319

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

pandas/tseries/offsets.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,8 @@ def apply_index(self, i):
309309

310310
if type(self) is not DateOffset:
311311
raise NotImplementedError(
312-
"DateOffset subclass {name} "
313-
"does not have a vectorized "
314-
"implementation".format(name=self.__class__.__name__)
312+
f"DateOffset subclass {type(self).__name__} "
313+
"does not have a vectorized implementation"
315314
)
316315
kwds = self.kwds
317316
relativedelta_fast = {
@@ -402,7 +401,7 @@ def rollback(self, dt):
402401
"""
403402
dt = as_timestamp(dt)
404403
if not self.onOffset(dt):
405-
dt = dt - self.__class__(1, normalize=self.normalize, **self.kwds)
404+
dt = dt - type(self)(1, normalize=self.normalize, **self.kwds)
406405
return dt
407406

408407
def rollforward(self, dt):
@@ -416,7 +415,7 @@ def rollforward(self, dt):
416415
"""
417416
dt = as_timestamp(dt)
418417
if not self.onOffset(dt):
419-
dt = dt + self.__class__(1, normalize=self.normalize, **self.kwds)
418+
dt = dt + type(self)(1, normalize=self.normalize, **self.kwds)
420419
return dt
421420

422421
def onOffset(self, dt):

pandas/util/_depr_module.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def __init__(self, deprmod, deprmodto=None, removals=None, moved=None):
3232
self.moved = moved
3333

3434
# For introspection purposes.
35-
self.self_dir = frozenset(dir(self.__class__))
35+
self.self_dir = frozenset(dir(type(self)))
3636

3737
def __dir__(self):
3838
deprmodule = self._import_deprmod()

pandas/util/testing.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ def repr_class(x):
713713
return x
714714

715715
try:
716-
return x.__class__.__name__
716+
return type(x).__name__
717717
except AttributeError:
718718
return repr(type(x))
719719

@@ -780,17 +780,17 @@ def assert_is_valid_plot_return_object(objs):
780780
if isinstance(objs, (pd.Series, np.ndarray)):
781781
for el in objs.ravel():
782782
msg = (
783-
"one of 'objs' is not a matplotlib Axes instance, type "
784-
"encountered {name!r}"
785-
).format(name=el.__class__.__name__)
783+
"one of 'objs' is not a matplotlib Axes instance, "
784+
f"type encountered {repr(type(el).__name__)}"
785+
)
786786
assert isinstance(el, (plt.Axes, dict)), msg
787787
else:
788-
assert isinstance(objs, (plt.Artist, tuple, dict)), (
789-
"objs is neither an ndarray of Artist instances nor a "
790-
'single Artist instance, tuple, or dict, "objs" is a {name!r}'.format(
791-
name=objs.__class__.__name__
792-
)
788+
msg = (
789+
"objs is neither an ndarray of Artist instances nor a single "
790+
"ArtistArtist instance, tuple, or dict, 'objs' is a "
791+
f"{repr(type(objs).__name__)}"
793792
)
793+
assert isinstance(objs, (plt.Artist, tuple, dict)), msg
794794

795795

796796
def isiterable(obj):

0 commit comments

Comments
 (0)