From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 8 May 2009 18:18:45 +0000 (+0000)
Subject: Merged revisions 72474 via svnmerge from
X-Git-Tag: v3.1rc1~211
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a282d175b5a9f1cd48c5de506fb02d60b20d6d5;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 72474 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72474 | benjamin.peterson | 2009-05-08 12:59:29 -0500 (Fri, 08 May 2009) | 1 line

  fix this test
........
---

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 7137095774da..ba0e0b8193ff 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1572,15 +1572,13 @@ order (MRO) for bases """
                 self.impl = impl
             def __get__(self, obj, owner):
                 record.append(1)
-                return self
-            def __call__(self, *args):
-                return self.impl(*args)
+                return self.impl.__get__(obj, owner)
 
 
         for name, runner, meth_impl in specials:
             class X(Checker):
                 pass
-            setattr(X, name, staticmethod(meth_impl))
+            setattr(X, name, meth_impl)
             runner(X())
 
             record = []