summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Jehannet <julien.jehannet@logilab.fr>2010-09-30 19:02:17 +0200
committerJulien Jehannet <julien.jehannet@logilab.fr>2010-09-30 19:02:17 +0200
commite4a3e840d4f054318e90b422cefe53444655502a (patch)
treed16b5247a91fb93ec612a50622d26e6baf39bf85
parent2df1133db1281b1b83685da7f62962961d261071 (diff)
downloadlogilab-common-e4a3e840d4f054318e90b422cefe53444655502a.tar.gz
[pkginfo] fix json import logic (we don't want a new dependency)
-rw-r--r--compat.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/compat.py b/compat.py
index 593ccd0..699fa0d 100644
--- a/compat.py
+++ b/compat.py
@@ -398,8 +398,10 @@ try:
except ImportError:
import ConfigParser as configparser
-# may not be there if cubicweb-web not installed
-if sys.version_info < (2, 6):
- import simplejson as json
-else:
+try:
import json
+except ImportError:
+ try:
+ import simplejson as json
+ except ImportError:
+ json = None