Merge py-trunk tip

--HG-- branch : trunk
2010-09-07 22:45:19 +01:00
parent f194b16a09 c17bb32f70
commit 2b3ac35780
2 changed files with 6 additions and 0 deletions
--- a/testing/test_pluginmanager.py
+++ b/testing/test_pluginmanager.py
@@ -340,8 +340,12 @@ def test_varnames():
    class A:
        def f(self, y):
            pass
+    class B(object):
+        def __call__(self, z):
+            pass
    assert varnames(f) == ("x",)
    assert varnames(A().f) == ('y',)
+    assert varnames(B()) == ('z',)

 class TestMultiCall:
    def test_uses_copy_of_methods(self):