From af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 17 Sep 2012 10:31:16 -0400
Subject: added json, md5 to Bcfg2.Compat

---
 src/lib/Bcfg2/Server/Plugins/Ohai.py | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(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 20f9ba877..35e385a77 100644
--- a/src/lib/Bcfg2/Server/Plugins/Ohai.py
+++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py
@@ -1,22 +1,10 @@
 import lxml.etree
 import os
-
 import logging
-logger = logging.getLogger('Bcfg2.Plugins.Ohai')
-
 import Bcfg2.Server.Plugin
+from Bcfg2.Compat import json
 
-try:
-    import json
-except:
-    # FIXME: can be removed when server prereq is >= python 2.6
-    # necessary for clients without the in-tree json module
-    try:
-        import simplejson as json
-    except:
-        logger.error("Unable to load any json modules. Make sure "
-                     "python-simplejson is installed.")
-        raise ImportError
+logger = logging.getLogger('Bcfg2.Plugins.Ohai')
 
 
 probecode = """#!/bin/sh
-- 
cgit v1.2.3-1-g7c22