diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-17 10:31:16 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-20 11:37:55 -0400 |
| commit | af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56 (patch) | |
| tree | 47a532ae4d72eef2068a1bf8260eafabeafdef2e /src/lib/Bcfg2/Server/Admin | |
| parent | 3ea977825739b1c15c04ca053cc44bcfacf9cfb9 (diff) | |
| download | bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.tar.gz bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.tar.bz2 bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.zip | |
added json, md5 to Bcfg2.Compat
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin')
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Reports.py | 9 |
1 files changed, 1 insertions, 8 deletions
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 |