Python 3 compat

This commit is contained in:
Christophe de Vienne 2012-11-07 21:56:27 +01:00
parent 74bb6b0bc3
commit c5d74a3353

View File

@ -168,7 +168,7 @@ def combine_args(funcdef, *akw):
for args, kwargs in akw: for args, kwargs in akw:
for i, arg in enumerate(args): for i, arg in enumerate(args):
newkwargs[funcdef.arguments[i].name] = arg newkwargs[funcdef.arguments[i].name] = arg
for name, value in kwargs.iteritems(): for name, value in kwargs.items():
newkwargs[name] = value newkwargs[name] = value
return newargs, newkwargs return newargs, newkwargs