BackTrackZ/scrapy
BackTrackZ/scrapy
1
0
Fork 0
mirror of https://github.com/scrapy/scrapy.git synced 2025-02-23 13:04:20 +00:00
Code Releases Wiki Activity

do not return applied arguments on partial functions

Browse Source
This commit is contained in:
Daniel Graña 2013-12-30 09:25:11 -02:00
parent 09c3f53693
commit 589fd037d9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scrapy/tests/test_utils_python.py
View File

@ -65,7 +65,7 @@ class UtilsPythonTestCase(unittest.TestCase):
assert not isbinarytext("hello")
# utf-16 strings contain null bytes
assert not isbinarytext(u"hello".encode('utf-16'))
assert not isbinarytext(u"hello".encode('utf-16'))
# one with encoding
assert not isbinarytext("<div>Price \xa3</div>")
@ -175,14 +175,18 @@ class UtilsPythonTestCase(unittest.TestCase):
pass
a = A(1, 2, 3)
partial_f1 = functools.partial(f1, None)
cal = Callable()
partial_f1 = functools.partial(f1, None)
partial_f2 = functools.partial(f1, b=None)
partial_f3 = functools.partial(partial_f2, None)
self.assertEqual(get_func_args(f1), ['a', 'b', 'c'])
self.assertEqual(get_func_args(f2), ['a', 'b', 'c'])
self.assertEqual(get_func_args(A), ['a', 'b', 'c'])
self.assertEqual(get_func_args(a.method), ['a', 'b', 'c'])
self.assertEqual(get_func_args(partial_f1), ['a', 'b', 'c'])
self.assertEqual(get_func_args(partial_f1), ['b', 'c'])
self.assertEqual(get_func_args(partial_f2), ['a', 'c'])
self.assertEqual(get_func_args(partial_f3), ['c'])
self.assertEqual(get_func_args(cal), ['a', 'b', 'c'])
self.assertEqual(get_func_args(object), [])

3
scrapy/utils/python.py
View File

@ -157,7 +157,8 @@ def get_func_args(func, stripself=False):
elif inspect.ismethoddescriptor(func):
return []
elif isinstance(func, partial):
return get_func_args(func.func)
return [x for x in get_func_args(func.func)[len(func.args):]
if not (func.keywords and x in func.keywords)]
elif hasattr(func, '__call__'):
if inspect.isroutine(func):
return []