diff options
author | Tony Garnock-Jones <tonyg@lshift.net> | 2008-12-02 16:43:50 +0000 |
---|---|---|
committer | Tony Garnock-Jones <tonyg@lshift.net> | 2008-12-02 16:43:50 +0000 |
commit | 8514a74ad6a16647d48e75e29acbeecb0eb11116 (patch) | |
tree | c51608957bff11f99d52f114dd7b776fbeb339f9 /amqp_codegen.py | |
parent | ccd49ae517a3b5cb0a284a03553e64b0f0447fa9 (diff) | |
parent | 5fa62d01ab71f4fb4b0cd611ec7107e3d10180f1 (diff) | |
download | rabbitmq-codegen-git-8514a74ad6a16647d48e75e29acbeecb0eb11116.tar.gz |
merged bug19841 into default
Diffstat (limited to 'amqp_codegen.py')
-rw-r--r-- | amqp_codegen.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/amqp_codegen.py b/amqp_codegen.py index a2f920fc..c4a38461 100644 --- a/amqp_codegen.py +++ b/amqp_codegen.py @@ -28,14 +28,21 @@ import re import sys try: - import json + try: + import simplejson as json + except ImportError, e: + if sys.hexversion >= 0x20600f0: + import json + else: + raise e except ImportError: - print >> sys.stderr , " You don't appear to have json.py installed" + print >> sys.stderr , " You don't appear to have simplejson.py installed" print >> sys.stderr , " (an implementation of a JSON reader and writer in Python)." print >> sys.stderr , " You can install it:" - print >> sys.stderr , " - by running 'apt-get install python-json' on Debian-based systems," - print >> sys.stderr , " - by running 'yum install python-json' on Fedora/Red Hat system," - print >> sys.stderr , " - from sources from 'http://sourceforge.net/projects/json-py'" + print >> sys.stderr , " - by running 'apt-get install python-simplejson' on Debian-based systems," + print >> sys.stderr , " - by running 'yum install python-simplejson' on Fedora/Red Hat system," + print >> sys.stderr , " - from sources from 'http://pypi.python.org/pypi/simplejson'" + print >> sys.stderr , " - simplejson is a standard json library in the Python core since 2.6" sys.exit(1) def insert_base_types(d): @@ -45,7 +52,7 @@ def insert_base_types(d): class AmqpSpec: def __init__(self, filename): - self.spec = json.read(file(filename).read()) + self.spec = json.load(file(filename)) self.major = self.spec['major-version'] self.minor = self.spec['minor-version'] |