From 19f1834def2d0990c5b7417ac5e4ca5272ad5e45 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <e.kohlvanwijngaarden@oxilion.nl>
Date: Tue, 15 Nov 2011 12:36:42 +0100
Subject: [PATCH] Prefer simplejson over json

Simplejson is faster so it should be prefered.
---
 zabbix/zabbix_api.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/zabbix/zabbix_api.py b/zabbix/zabbix_api.py
index 306ae28..3be67bd 100644
--- 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