small changes to make code 3.0 compatible :)

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40968
This commit is contained in:
Ismael Carnales 2009-03-04 17:11:20 +00:00
parent ec22373b5a
commit 8ad4211e26
1 changed files with 3 additions and 3 deletions

View File

@ -2,7 +2,7 @@ from scrapy.contrib_exp.newitem.declarative import Declarative
from scrapy.utils.python import get_func_args
def is_adaptor(func):
return callable(func) and 'adaptor_args' in get_func_args(func)
return hasattr(func, '__call__') and 'adaptor_args' in get_func_args(func)
class ItemAdaptor(Declarative):
@ -77,8 +77,8 @@ def adaptor(*funcs, **adaptor_args):
def _adaptor(value, adaptor_args=None):
values = value if isinstance(value, (list, tuple)) else [value]
aargs = dict(t for d in [pipe_adaptor_args, adaptor_args or {}] for t in d.iteritems())
pipe_kwargs = { 'adaptor_args': aargs }
aargs = dict(t for d in [pipe_adaptor_args, adaptor_args or {}] for t in d.items())
pipe_kwargs = {'adaptor_args': aargs}
for func, takes_args in _funcs:
next = []