[Python-checkins] cpython (merge 3.2 -> default): #11938: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/bdd6d8631994
changeset:   69644:bdd6d8631994
parent:      69642:1cdcd1a25025
parent:      69643:ef35dae58077
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Apr 28 01:00:25 2011 +0300
summary:
  #11938: merge with 3.2.

files:
  Lib/test/test_inspect.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -801,7 +801,7 @@
         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")

-- 
Repository URL: http://hg.python.org/cpython