summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Compat.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-17 10:31:16 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-20 11:37:55 -0400
commitaf07f60e2e5c9c26ab1ef1d0ecc0565672a85f56 (patch)
tree47a532ae4d72eef2068a1bf8260eafabeafdef2e /src/lib/Bcfg2/Compat.py
parent3ea977825739b1c15c04ca053cc44bcfacf9cfb9 (diff)
downloadbcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.tar.gz
bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.tar.bz2
bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.zip
added json, md5 to Bcfg2.Compat
Diffstat (limited to 'src/lib/Bcfg2/Compat.py')
-rw-r--r--src/lib/Bcfg2/Compat.py12
1 files changed, 12 insertions, 0 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
+