diff options
| author | Jack Neely <jjneely@ncsu.edu> | 2011-06-10 13:29:23 -0400 |
|---|---|---|
| committer | Jack Neely <jjneely@ncsu.edu> | 2011-06-10 13:29:23 -0400 |
| commit | 90c85147bacea14771abf8faa1fc5f185418d14b (patch) | |
| tree | b10e06fc80ed714f5376b169e32b8953479211f1 /src/lib/Server/Snapshots/__init__.py | |
| parent | 4f3da4543ec4e8c3c4776ae2ee3611e47ce78525 (diff) | |
| parent | ce6a228d33ace4136dc2b5388c64795dfbd26ffb (diff) | |
| download | bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.tar.gz bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.tar.bz2 bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.zip | |
Merge branch 'master' of github.com:solj/bcfg2
Diffstat (limited to 'src/lib/Server/Snapshots/__init__.py')
| -rw-r--r-- | src/lib/Server/Snapshots/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Server/Snapshots/__init__.py b/src/lib/Server/Snapshots/__init__.py index 6018377cb..7c901adb2 100644 --- a/src/lib/Server/Snapshots/__init__.py +++ b/src/lib/Server/Snapshots/__init__.py @@ -2,7 +2,8 @@ __all__ = ['models', 'db_from_config', 'setup_session'] import sqlalchemy import sqlalchemy.orm -import ConfigParser +# Compatibility import +from Bcfg2.Bcfg2Py3k import ConfigParser def db_from_config(cfile): @@ -19,7 +20,7 @@ def db_from_config(cfile): db = cp.get('snapshots', 'database') return '%s://%s:%s@%s/%s' % (driver, user, password, host, db) else: - raise Exception, "unsupported db driver %s" % driver + raise Exception("unsupported db driver %s" % driver) def setup_session(cfile, debug=False): |