added json, md5 to Bcfg2.Compat

6 files changed, 19 insertions, 46 deletions

diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py
index a045929bb..a31bcab1a 100644
--- a/src/lib/Bcfg2/Compat.py
+++ b/src/lib/Bcfg2/Compat.py
@@ -235,3 +235,15 @@ except NameError:
             if element:
                 return True
         return False
+
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
+
+
+try:
+    import json
+except ImportError:
+    import simplejson as json
+
diff --git a/src/lib/Bcfg2/Encryption.py b/src/lib/Bcfg2/Encryption.py
index 0a2d486bf..5e70a1d10 100755
--- a/src/lib/Bcfg2/Encryption.py
+++ b/src/lib/Bcfg2/Encryption.py
@@ -4,12 +4,7 @@ import os
 import base64
 from M2Crypto import Rand
 from M2Crypto.EVP import Cipher, EVPError
-from Bcfg2.Compat import StringIO
-
-try:
-    from hashlib import md5
-except ImportError:
-    from md5 import md5
+from Bcfg2.Compat import StringIO, md5
 
 ENCRYPT = 1
 DECRYPT = 0
diff --git a/src/lib/Bcfg2/Server/Admin/Reports.py b/src/lib/Bcfg2/Server/Admin/Reports.py
index 7d78c3dc1..63a0092d5 100644
--- a/src/lib/Bcfg2/Server/Admin/Reports.py
+++ b/src/lib/Bcfg2/Server/Admin/Reports.py
@@ -10,14 +10,7 @@ import sys
 import traceback
 from lxml.etree import XML, XMLSyntaxError
 
-# Compatibility import
-from Bcfg2.Compat import ConfigParser
-
-# FIXME: Remove when server python dep is 2.5 or greater
-if sys.version_info >= (2, 5):
-    from hashlib import md5
-else:
-    from md5 import md5
+from Bcfg2.Compat import ConfigParser, md5
 
 import Bcfg2.settings
 
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
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
@@ -16,16 +16,6 @@ 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
     yaml_error = yaml.error
@@ -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:
diff --git a/src/lib/Bcfg2/Server/Plugins/SSLCA.py b/src/lib/Bcfg2/Server/Plugins/SSLCA.py
index b02802ac8..8ca95ff62 100644
--- a/src/lib/Bcfg2/Server/Plugins/SSLCA.py
+++ b/src/lib/Bcfg2/Server/Plugins/SSLCA.py
@@ -5,13 +5,8 @@ import posixpath
 import tempfile
 import os
 from subprocess import Popen, PIPE, STDOUT
-# Compatibility import
-from Bcfg2.Compat import ConfigParser
+from Bcfg2.Compat import ConfigParser, md5
 
-try:
-    from hashlib import md5
-except ImportError:
-    from md5 import md5
 
 class SSLCA(Bcfg2.Server.Plugin.GroupSpool):
     """