[Python-checkins] r72475 - in python/branches/py3k: Lib/test/test_descr.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri May  8 20:18:45 2009
New Revision: 72475

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_descr.py

Modified: python/branches/py3k/Lib/test/test_descr.py
==============================================================================
--- python/branches/py3k/Lib/test/test_descr.py	(original)
+++ python/branches/py3k/Lib/test/test_descr.py	Fri May  8 20:18:45 2009
@@ -1572,15 +1572,13 @@
                 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 = []