summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-04-28 01:00:25 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2011-04-28 01:00:25 +0300
commit3c1d067ef909db55b3df8fc5fbdba0bc60abeaeb (patch)
tree389c1767c522b2f52d4a1ccf03276982679cb3fe
parent98be2b72c6dc968b792e5172eaad53e96f7ba859 (diff)
parent75cbd73666ce2a616454cdfed91314145eaa04f4 (diff)
downloadcpython-git-3c1d067ef909db55b3df8fc5fbdba0bc60abeaeb.tar.gz
#11938: merge with 3.2.
-rw-r--r--Lib/test/test_inspect.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 7d7e16e0e1..f5dff1e543 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -801,7 +801,7 @@ class TestGetattrStatic(unittest.TestCase):
thing = Thing()
self.assertEqual(inspect.getattr_static(thing, 'x'), Thing.x)
- def test_descriptor(self):
+ def test_descriptor_raises_AttributeError(self):
class descriptor(object):
def __get__(*_):
raise AttributeError("I'm pretending not to exist")