mirror of https://github.com/python/cpython.git
Thomas Wouters pointed out that _Abstract.__new__ should use super().__new__()
instead of going straight to object.__new__().
This commit is contained in:
parent
1ba3114fdb
commit
894d35ea61
|
@ -56,8 +56,6 @@ class _Abstract(object):
|
|||
"""Helper class inserted into the bases by ABCMeta (using _fix_bases()).
|
||||
|
||||
You should never need to explicitly subclass this class.
|
||||
|
||||
There should never be a base class between _Abstract and object.
|
||||
"""
|
||||
|
||||
def __new__(cls, *args, **kwds):
|
||||
|
@ -69,7 +67,7 @@ def __new__(cls, *args, **kwds):
|
|||
if (args or kwds) and cls.__init__ is object.__init__:
|
||||
raise TypeError("Can't pass arguments to __new__ "
|
||||
"without overriding __init__")
|
||||
return object.__new__(cls)
|
||||
return super().__new__(cls)
|
||||
|
||||
@classmethod
|
||||
def __subclasshook__(cls, subclass):
|
||||
|
|
|
@ -130,6 +130,20 @@ class MyInt(int):
|
|||
self.failUnless(issubclass(MyInt, A))
|
||||
self.failUnless(isinstance(42, A))
|
||||
|
||||
def test_all_new_methods_are_called(self):
|
||||
class A(metaclass=abc.ABCMeta):
|
||||
pass
|
||||
class B:
|
||||
counter = 0
|
||||
def __new__(cls):
|
||||
B.counter += 1
|
||||
return super().__new__(cls)
|
||||
class C(A, B):
|
||||
pass
|
||||
self.assertEqual(B.counter, 0)
|
||||
C()
|
||||
self.assertEqual(B.counter, 1)
|
||||
|
||||
|
||||
def test_main():
|
||||
test_support.run_unittest(TestABC)
|
||||
|
|
Loading…
Reference in New Issue