summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-12 16:08:39 +0000
committerGerrit Code Review <review@openstack.org>2015-05-12 16:08:39 +0000
commit06c44a87103377d10d929254ad115039290f977a (patch)
tree790827e57161da5dbe044a49a6847aa7ebd94fac
parent44a7b7de424e194df54cc3a2159dbcdbc1c9467b (diff)
parent4586979d8476ad2d9331a3c68b63b97f1fddbd12 (diff)
downloadoslo-middleware-06c44a87103377d10d929254ad115039290f977a.tar.gz
Merge "Drop use of 'oslo' namespace package"
-rw-r--r--oslo_middleware/cors.py2
-rw-r--r--oslo_middleware/tests/test_cors.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/oslo_middleware/cors.py b/oslo_middleware/cors.py
index 49e3301..8eb88d3 100644
--- a/oslo_middleware/cors.py
+++ b/oslo_middleware/cors.py
@@ -15,7 +15,7 @@
# Default allowed headers
import copy
import logging
-from oslo.config import cfg
+from oslo_config import cfg
from oslo_middleware import base
import webob.dec
import webob.exc
diff --git a/oslo_middleware/tests/test_cors.py b/oslo_middleware/tests/test_cors.py
index bd696a5..458800e 100644
--- a/oslo_middleware/tests/test_cors.py
+++ b/oslo_middleware/tests/test_cors.py
@@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-from oslo.config import cfg
-from oslo.config import fixture
+from oslo_config import cfg
+from oslo_config import fixture
from oslotest import base as test_base
import webob
import webob.dec