Commit e610feed authored by Stefan Behnel's avatar Stefan Behnel

fix merging keyword arguments in compiler directive decorators

parent d825ab29
...@@ -485,8 +485,9 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations): ...@@ -485,8 +485,9 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
options.reverse() # Decorators coming first take precedence options.reverse() # Decorators coming first take precedence
for option in options: for option in options:
name, value = option name, value = option
if name in optdict: if name in optdict and isinstance(optdict[name], dict):
# assuming it's a dict ... # only keywords can be merged, everything else
# overrides completely
optdict[name].update(value) optdict[name].update(value)
else: else:
optdict[name] = value optdict[name] = value
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment