diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-07-05 16:34:01 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-07-05 16:34:01 +0100 |
| commit | 6cda49994675395b25dac5bfccb55cdf07b9fe2b (patch) | |
| tree | 4ea54167a6b275926050d459f97a7fb65877c0b5 /amqp_codegen.py | |
| parent | 42d4ec18b07c4186731cc65f16b89b83b1aec43c (diff) | |
| download | rabbitmq-codegen-6cda49994675395b25dac5bfccb55cdf07b9fe2b.tar.gz | |
Actually, default-value conflicts all over the place.
Diffstat (limited to 'amqp_codegen.py')
| -rw-r--r-- | amqp_codegen.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/amqp_codegen.py b/amqp_codegen.py index 683270c..c1dbfae 100644 --- a/amqp_codegen.py +++ b/amqp_codegen.py @@ -118,7 +118,7 @@ def properties_merger(classname, old, new, allow_overwrite): return merge_dict_lists_by("name", old, new, allow_overwrite, ["type"]) def arguments_merger(classname, old, new, allow_overwrite): - return merge_dict_lists_by("name", old, new, allow_overwrite, ["type", "default-value"]) + return merge_dict_lists_by("name", old, new, allow_overwrite, ["type"]) def class_merger(old, new, allow_overwrite): old["methods"] = methods_merger(old["name"], |