summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-03-16 14:35:38 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-03-16 14:35:38 (GMT)
commitde394543b4d31c0226fd8700475adccf6a3eb934 (patch)
tree07bd78cd2fa7643f72b20f7fededc6da15ee45f3 /Lib
parent6e335250987a1b200c4d68979586677fbcd00f4e (diff)
parent16d84ac355c532a1e7d25cf75e0b577923de2856 (diff)
downloadcpython-de394543b4d31c0226fd8700475adccf6a3eb934.zip
cpython-de394543b4d31c0226fd8700475adccf6a3eb934.tar.gz
cpython-de394543b4d31c0226fd8700475adccf6a3eb934.tar.bz2
merge 3.2 (#14334)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_descr.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index f405fbb..bf82a88 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4400,6 +4400,9 @@ order (MRO) for bases """
self.assertRaises(AttributeError, getattr, EvilGetattribute(), "attr")
+ def test_type___getattribute__(self):
+ self.assertRaises(TypeError, type.__getattribute__, list, type)
+
def test_abstractmethods(self):
# type pretends not to have __abstractmethods__.
self.assertRaises(AttributeError, getattr, type, "__abstractmethods__")