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/Admin/Reports.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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

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
 
-- 
cgit v1.2.3-1-g7c22