diff options
author | Petri Lehtinen <petri@digip.org> | 2009-09-11 22:22:34 +0300 |
---|---|---|
committer | Petri Lehtinen <petri@digip.org> | 2009-09-14 10:27:51 +0300 |
commit | ab3764ed0a376633037599773010feeba64ec1a3 (patch) | |
tree | 2977041b28dc13f71f3d29712d903a9c9ec1fc82 | |
parent | 9cc6fbe58024d63473846ddb424a69b7efc03b90 (diff) | |
download | jansson-ab3764ed0a376633037599773010feeba64ec1a3.zip jansson-ab3764ed0a376633037599773010feeba64ec1a3.tar.gz jansson-ab3764ed0a376633037599773010feeba64ec1a3.tar.bz2 |
test/json-compare.py: Use json module from Python >=2.6 or simplejson
Backported from master, commit 9d16ec755c9754fe1f79fe55ab719a7f8578ce37
-rwxr-xr-x | test/json-compare.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/json-compare.py b/test/json-compare.py index 1db93da..f91530e 100755 --- a/test/json-compare.py +++ b/test/json-compare.py @@ -5,8 +5,11 @@ # Jansson is free software; you can redistribute it and/or modify # it under the terms of the MIT license. See LICENSE for details. -import simplejson import sys +try: + import json +except ImportError: + import simplejson as json def load(filename): try: @@ -17,14 +20,14 @@ def load(filename): sys.exit(1) try: - json = simplejson.load(jsonfile) + jsondata = json.load(jsonfile) except ValueError, err: print "%s is malformed: %s" % (filename, err) sys.exit(1) finally: jsonfile.close() - return json + return jsondata def main(): if len(sys.argv) != 3: |