summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_descr.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-10-18 15:49:21 (GMT)
committerGuido van Rossum <guido@python.org>2001-10-18 15:49:21 (GMT)
commitf76de62f7d48a25d5f67357ae7b2f487904a5fcc (patch)
treefbdeb2efbe6d67caa25a5cb03163af7b573f29b5 /Lib/test/test_descr.py
parentb7da67a873595f022c890783856f7ee764a00c3a (diff)
downloadcpython-f76de62f7d48a25d5f67357ae7b2f487904a5fcc.zip
cpython-f76de62f7d48a25d5f67357ae7b2f487904a5fcc.tar.gz
cpython-f76de62f7d48a25d5f67357ae7b2f487904a5fcc.tar.bz2
Fix SF bug #472234: type(obj) calls type->tp_init (Roeland Rengelink)
The fix is a band-aid: type_call() now makes the same exception for a single-argument call to type() as type_new() was already making.
Diffstat (limited to 'Lib/test/test_descr.py')
-rw-r--r--Lib/test/test_descr.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index c9235c8..962c1cc 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -716,6 +716,18 @@ def metaclass():
return "D" + self.__super._get_x()
vereq(D().x, "DCBA")
+ # Make sure type(x) doesn't call x.__class__.__init__
+ class T(type):
+ counter = 0
+ def __init__(self, *args):
+ T.counter += 1
+ class C:
+ __metaclass__ = T
+ vereq(T.counter, 1)
+ a = C()
+ vereq(type(a), C)
+ vereq(T.counter, 1)
+
def pymods():
if verbose: print "Testing Python subclass of module..."
log = []