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/Encryption.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/lib/Bcfg2/Encryption.py')

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