diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-02-10 18:50:40 -0500 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-02-18 12:16:47 +0000 |
| commit | 909c44a0fb80a3b4bafb82b0b3b8de7b7bd29826 (patch) | |
| tree | 84c5511f66e39aea370b279bd518a8ed2e997f14 /keystone/config.py | |
| parent | 5a8682ddc233b80faf82f4327a8e5d0658a872ef (diff) | |
| download | keystone-909c44a0fb80a3b4bafb82b0b3b8de7b7bd29826.tar.gz keystone-909c44a0fb80a3b4bafb82b0b3b8de7b7bd29826.tar.xz keystone-909c44a0fb80a3b4bafb82b0b3b8de7b7bd29826.zip | |
Use oslo-config-2013.1b3
The cfg API is now available via the oslo-config library, so switch to
it and remove the copied-and-pasted version.
Add the 2013.1b3 tarball to tools/pip-requires - this will be changed
to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
will happen in time for grizzly final.
Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other
deps get installed with easy_install which can't install oslo-config
from the URL.
Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
Diffstat (limited to 'keystone/config.py')
| -rw-r--r-- | keystone/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/config.py b/keystone/config.py index b604db43..fc2ce743 100644 --- a/keystone/config.py +++ b/keystone/config.py @@ -18,9 +18,9 @@ import gettext import os import sys -from keystone.common import logging -from keystone.openstack.common import cfg +from oslo.config import cfg +from keystone.common import logging gettext.install('keystone', unicode=1) |