summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_descr.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-05-08 18:18:45 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-05-08 18:18:45 (GMT)
commit8a282d175b5a9f1cd48c5de506fb02d60b20d6d5 (patch)
treee6a77e1000e711fee24c0e0238305a71a13b2585 /Lib/test/test_descr.py
parent0a866947c9dc6330a54714ea50fcb55a2ff7dfe4 (diff)
downloadcpython-8a282d175b5a9f1cd48c5de506fb02d60b20d6d5.zip
cpython-8a282d175b5a9f1cd48c5de506fb02d60b20d6d5.tar.gz
cpython-8a282d175b5a9f1cd48c5de506fb02d60b20d6d5.tar.bz2
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 ........
Diffstat (limited to 'Lib/test/test_descr.py')
-rw-r--r--Lib/test/test_descr.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 7137095..ba0e0b8 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 = []