summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Hostbase/settings.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-06-15 15:04:53 -0500
committerSol Jerome <sol.jerome@gmail.com>2011-06-15 15:04:53 -0500
commitf4307fd49519f4f086a5674c255174880a8b2b18 (patch)
tree84683bf22dc6b5e7c8f1eda1c6e10a5360f70f9b /src/lib/Server/Hostbase/settings.py
parent707a17cf8bcf0e91a2c74f671f0d3fffff3c294e (diff)
parente145b148dacc9420b2e4253310a0b2f0b07cbada (diff)
downloadbcfg2-f4307fd49519f4f086a5674c255174880a8b2b18.tar.gz
bcfg2-f4307fd49519f4f086a5674c255174880a8b2b18.tar.bz2
bcfg2-f4307fd49519f4f086a5674c255174880a8b2b18.zip
Merge branch 'py3k'
Diffstat (limited to 'src/lib/Server/Hostbase/settings.py')
-rw-r--r--src/lib/Server/Hostbase/settings.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Server/Hostbase/settings.py b/src/lib/Server/Hostbase/settings.py
index c44c7bf16..4e641f13c 100644
--- a/src/lib/Server/Hostbase/settings.py
+++ b/src/lib/Server/Hostbase/settings.py
@@ -1,9 +1,10 @@
-from ConfigParser import ConfigParser, NoSectionError, NoOptionError
import os.path
+# Compatibility import
+from Bcfg2.Bcfg2Py3k import ConfigParser
PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__))
-c = ConfigParser()
+c = ConfigParser.ConfigParser()
#This needs to be configurable one day somehow
c.read(['./bcfg2.conf'])