summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-10-04 15:23:54 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-10-04 15:23:54 +0100
commit946350a5d16e3294dd3e1cd7220912573b6589b2 (patch)
tree3c242d2fe11a3f50bfa0e9fc0bdf89f8016054f8
parent7dd235cd818316c0f554c0891032b6bbbe41dfc3 (diff)
parentdd673ebcbe884fa2b8fe77ee6dfde6a4541f382f (diff)
downloadrabbitmq-codegen-946350a5d16e3294dd3e1cd7220912573b6589b2.tar.gz
Merge bug25209rabbitmq_v3_0_0
-rw-r--r--amqp_codegen.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/amqp_codegen.py b/amqp_codegen.py
index 5423350..ad57a9f 100644
--- a/amqp_codegen.py
+++ b/amqp_codegen.py
@@ -119,7 +119,7 @@ mergers = {
}
def merge_load_specs(filenames, ignore_conflicts):
- handles = [file(filename) for filename in filenames]
+ handles = [open(filename) for filename in filenames]
docs = [json.load(handle) for handle in handles]
spec = {}
for doc in docs: