From 2defc9cf5155f21a988855c31049fad3e40ecdd1 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 29 Jan 2014 07:43:06 -0500
Subject: load correct JSON library on py2.4

---
 src/lib/Bcfg2/Server/Plugins/Properties.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/lib/Bcfg2/Server/Plugins/Properties.py')

diff --git a/src/lib/Bcfg2/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py
index 89f2d21ff..b6090c4d1 100644
--- a/src/lib/Bcfg2/Server/Plugins/Properties.py
+++ b/src/lib/Bcfg2/Server/Plugins/Properties.py
@@ -17,8 +17,9 @@ except ImportError:
 
 try:
     import json
+    json.loads  # py2.4 json library is structured differently
     HAS_JSON = True
-except ImportError:
+except (ImportError, AttributeError):
     try:
         import simplejson as json
         HAS_JSON = True
-- 
cgit v1.2.3-1-g7c22