p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge py-trunk tip 

--HG--
branch : trunk
This commit is contained in:
Floris Bruynooghe 2010-09-07 22:45:19 +01:00
parent f194b16a09 c17bb32f70
commit 2b3ac35780
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/_test/pluginmanager.py
View File

@ -259,6 +259,8 @@ class MultiCall:
return kwargs return kwargs
def varnames(func): def varnames(func):
if not inspect.isfunction(func) and not inspect.ismethod(func):
func = getattr(func, '__call__', func)
ismethod = inspect.ismethod(func) ismethod = inspect.ismethod(func)
rawcode = py.code.getrawcode(func) rawcode = py.code.getrawcode(func)
try: try:

4
testing/test_pluginmanager.py
View File

@ -340,8 +340,12 @@ def test_varnames():
class A: class A:
def f(self, y): def f(self, y):
pass pass
class B(object):
def __call__(self, z):
pass
assert varnames(f) == ("x",) assert varnames(f) == ("x",)
assert varnames(A().f) == ('y',) assert varnames(A().f) == ('y',)
assert varnames(B()) == ('z',)
class TestMultiCall: class TestMultiCall:
def test_uses_copy_of_methods(self): def test_uses_copy_of_methods(self):