Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Lib/_py_warnings.py
Original file line number Diff line number Diff line change
Expand Up @@ -765,27 +765,27 @@ def __new__(cls, /, *args, **kwargs):

arg.__new__ = staticmethod(__new__)

original_init_subclass = arg.__init_subclass__
# We need slightly different behavior if __init_subclass__
# is a bound method (likely if it was implemented in Python)
if isinstance(original_init_subclass, MethodType):
original_init_subclass = original_init_subclass.__func__
if "__init_subclass__" in arg.__dict__:
# __init_subclass__ is directly present on the decorated class.
# Synthesize a wrapper that calls this method directly.
original_init_subclass = arg.__init_subclass__
# We need slightly different behavior if __init_subclass__
# is a bound method (likely if it was implemented in Python).
# Otherwise, it likely means it's a builtin such as
# object's implementation of __init_subclass__.
if isinstance(original_init_subclass, MethodType):
original_init_subclass = original_init_subclass.__func__

@functools.wraps(original_init_subclass)
def __init_subclass__(*args, **kwargs):
_wm.warn(msg, category=category, stacklevel=stacklevel + 1)
return original_init_subclass(*args, **kwargs)

arg.__init_subclass__ = classmethod(__init_subclass__)
# Or otherwise, which likely means it's a builtin such as
# object's implementation of __init_subclass__.
else:
@functools.wraps(original_init_subclass)
def __init_subclass__(*args, **kwargs):
def __init_subclass__(cls, *args, **kwargs):
_wm.warn(msg, category=category, stacklevel=stacklevel + 1)
return original_init_subclass(*args, **kwargs)
return super(arg, cls).__init_subclass__(*args, **kwargs)

arg.__init_subclass__ = __init_subclass__
arg.__init_subclass__ = classmethod(__init_subclass__)

arg.__deprecated__ = __new__.__deprecated__ = msg
__init_subclass__.__deprecated__ = msg
Expand Down
19 changes: 19 additions & 0 deletions Lib/test/test_warnings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1863,6 +1863,25 @@ class D(C, x=3):

self.assertEqual(D.inited, 3)

def test_existing_init_subclass_in_sibling_base(self):
@deprecated("A will go away soon")
class A:
pass
class B:
def __init_subclass__(cls, x):
super().__init_subclass__()
cls.inited = x

with self.assertWarnsRegex(DeprecationWarning, "A will go away soon"):
class C(A, B, x=42):
pass
self.assertEqual(C.inited, 42)

with self.assertWarnsRegex(DeprecationWarning, "A will go away soon"):
class D(B, A, x=42):
pass
self.assertEqual(D.inited, 42)

def test_init_subclass_has_correct_cls(self):
init_subclass_saw = None

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix an issue where defining a class with an :func:`@warnings.deprecated
<warnings.deprecated>`-decorated base class may not invoke the correct
:meth:`~object.__init_subclass__` method in cases involving multiple
inheritance. Patch by Brian Schubert.
Loading