diff options
Diffstat (limited to 'amqp_codegen.py')
| -rw-r--r-- | amqp_codegen.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/amqp_codegen.py b/amqp_codegen.py index 3d5e1e7..a10cc6d 100644 --- a/amqp_codegen.py +++ b/amqp_codegen.py @@ -76,8 +76,8 @@ def extension_info_merger(key, acc, new, ignore_conflicts): return acc + [new] def domains_merger(key, acc, new, ignore_conflicts): - merged = dict((k, v) for [k, v] in new) - for [k, v] in acc: + merged = dict((k, v) for [k, v] in acc) + for [k, v] in new: if merged.has_key(k): if not ignore_conflicts: raise AmqpSpecFileMergeConflict(key, acc, new) |