From 3428eab79ab21d1ecee6d2f8edff083a2cccdf79 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 24 Sep 2012 13:25:01 -0400
Subject: made json optional again

---
 src/lib/Bcfg2/Server/Plugins/Ohai.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/src/lib/Bcfg2/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py
index 35e385a77..052597f84 100644
--- a/src/lib/Bcfg2/Server/Plugins/Ohai.py
+++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py
@@ -2,7 +2,13 @@ import lxml.etree
 import os
 import logging
 import Bcfg2.Server.Plugin
-from Bcfg2.Compat import json
+
+# pylint: disable=F0401
+try:
+    import json
+except ImportError:
+    import simplejson as json
+# pylint: enable=F0401
 
 logger = logging.getLogger('Bcfg2.Plugins.Ohai')
 
@@ -19,6 +25,7 @@ else
 fi
 """
 
+
 class OhaiCache(object):
     def __init__(self, dirname):
         self.dirname = dirname
-- 
cgit v1.2.3-1-g7c22