In python 2.6 and later, simplejson is built-in as json.

git-svn-id: file:///home/or/svnrepo/updater/trunk@17112 55e972cd-5a19-0410-ae62-a4d7a52db4cd

1 files changed, 11 insertions, 4 deletions

diff --git a/setup.py b/setup.py
index f8622b7..39df8ed 100644
--- a/setup.py
+++ b/setup.py
@@ -11,12 +11,19 @@ VERSION = '0.0.1-alpha'
 # System: 0==alpha, 50==beta, 98=pre, 99==release candidate, 100==release
 VERSION_INFO = (0,0,1)
 
-for name in [ "simplejson", "Crypto" ]:
+try:
+    import Crypto
+except ImportError:
+    print "Missing support for module Crypto"
+    sys.exit(1)
+
+try:
+    import json
+except ImportError:
     try:
-        __import__(name)
+        import simplejson
     except ImportError:
-        print "Missing support for module %s"%name
-        sys.exit(1)
+        print "Missing support for module simplejson"
 
 import os, re, shutil, string, struct, sys