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/Lint/ValidateJSON.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/lib/Bcfg2/Server/Lint')

diff --git a/src/lib/Bcfg2/Server/Lint/ValidateJSON.py b/src/lib/Bcfg2/Server/Lint/ValidateJSON.py
index c4a82a5d2..31bbadeb2 100644
--- a/src/lib/Bcfg2/Server/Lint/ValidateJSON.py
+++ b/src/lib/Bcfg2/Server/Lint/ValidateJSON.py
@@ -10,7 +10,8 @@ import Bcfg2.Server.Lint
 
 try:
     import json
-except ImportError:
+    json.loads  # py2.4 json library is structured differently
+except (ImportError, AttributeError):
     import simplejson as json
 
 
-- 
cgit v1.2.3-1-g7c22