fixed bug in merge_arg_... when there is no 'args' at all, which is also valid as args beeing an empty tuple

This commit is contained in:
cimatosa 2015-01-23 15:11:38 +01:00
parent 7f3411b4ea
commit 01e589bd02

View file

@ -53,7 +53,8 @@ def merge_arg_and_const_arg(arg, const_arg):
kwargs.update(const_arg) kwargs.update(const_arg)
kwargs.update(arg) kwargs.update(arg)
# remove args as they have been constructed explicitly # remove args as they have been constructed explicitly
kwargs.pop('args') if 'args' in kwargs:
kwargs.pop('args')
return args_dgl, kwargs return args_dgl, kwargs