Merge pull request #5 from ekohl/master

Prefer simplejson over json
gescheit · Nov 23, 2011 · 551529b · 551529b
2 parents aac81e4 + 19f1834
commit 551529b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/zabbix/zabbix_api.py b/zabbix/zabbix_api.py
@@ -43,13 +43,13 @@
 __logger.log(10,"Starting logging")
 
 try:
-    # Python 2.5+
-    import json
-    __logger.log(15,"Using native json library")
-except ImportError:
-    # Python 2.4
+    # Separate module or Python <2.6
     import simplejson as json
     __logger.log(15,"Using simplejson library")
+except ImportError:
+    # Python >=2.6
+    import json
+    __logger.log(15,"Using native json library")
 
 class ZabbixAPIException(Exception):
     """ generic zabbix api exception