RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #809 from nramirezuy/get_func_args-728 

get_func_args maximum recursion fix #728
This commit is contained in:
Daniel Graña 2014-07-21 13:41:03 -03:00
parent e748ca50ca 86f61a9906
commit dd3b77ea2e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scrapy/tests/test_utils_python.py
View File

@ -193,6 +193,7 @@ class UtilsPythonTestCase(unittest.TestCase):
# TODO: how do we fix this to return the actual argument names?
self.assertEqual(get_func_args(unicode.split), [])
self.assertEqual(get_func_args(" ".join), [])
self.assertEqual(get_func_args(operator.itemgetter(2)), [])
if __name__ == "__main__":
unittest.main()

2
scrapy/utils/python.py
View File

@ -147,6 +147,8 @@ def get_func_args(func, stripself=False):
elif hasattr(func, '__call__'):
if inspect.isroutine(func):
return []
elif getattr(func, '__name__', None) == '__call__':
return []
else:
return get_func_args(func.__call__, True)
else: