summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-09-11 20:42:30 (GMT)
committerGuido van Rossum <guido@python.org>2007-09-11 20:42:30 (GMT)
commit894d35ea61c24c09f5d8d15683904d6aba27fab4 (patch)
treed9e0eab97d665641d033be88d5cc7cfe5112d6c0
parent1ba3114fdb5adb5e6852c85e1d3caccba3395471 (diff)
downloadcpython-894d35ea61c24c09f5d8d15683904d6aba27fab4.zip
cpython-894d35ea61c24c09f5d8d15683904d6aba27fab4.tar.gz
cpython-894d35ea61c24c09f5d8d15683904d6aba27fab4.tar.bz2
Thomas Wouters pointed out that _Abstract.__new__ should use super().__new__()
instead of going straight to object.__new__().
-rw-r--r--Lib/abc.py4
-rw-r--r--Lib/test/test_abc.py14
2 files changed, 15 insertions, 3 deletions
diff --git a/Lib/abc.py b/Lib/abc.py
index ad5a523..f8e0230 100644
--- a/Lib/abc.py
+++ b/Lib/abc.py
@@ -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 @@ class _Abstract(object):
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):
diff --git a/Lib/test/test_abc.py b/Lib/test/test_abc.py
index f93f3d3..008d839 100644
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -130,6 +130,20 @@ class TestABC(unittest.TestCase):
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)