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/Probes.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

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

diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index 79f2ae87e..68cdce6e8 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -7,7 +7,7 @@ import operator
 import lxml.etree
 import Bcfg2.Server
 import Bcfg2.Server.Plugin
-from Bcfg2.Compat import any
+from Bcfg2.Compat import any, json
 
 try:
     from django.db import models
@@ -15,16 +15,6 @@ try:
 except ImportError:
     has_django = False
 
-try:
-    import json
-    has_json = True
-except ImportError:
-    try:
-        import simplejson as json
-        has_json = True
-    except ImportError:
-        has_json = False
-
 try:
     import syck as yaml
     has_yaml = True
@@ -93,7 +83,7 @@ class ProbeData(str):
 
     @property
     def json(self):
-        if self._json is None and has_json:
+        if self._json is None:
             try:
                 self._json = json.loads(self.data)
             except ValueError:
-- 
cgit v1.2.3-1-g7c22