diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-01-23 21:07:48 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-01-23 21:07:48 +0000 |
commit | d01274bd71310f6f187ca93e9d006508371e0656 (patch) | |
tree | bd1cebb608a75770aaead8500a2706f3860517bd | |
parent | 88c69a0fc7efcc78dd7ba12eaf142d8cc8945c8a (diff) | |
parent | c46b2c684ef487fe0544f978eff7380ef42a40ba (diff) | |
download | oslo-middleware-d01274bd71310f6f187ca93e9d006508371e0656.tar.gz |
Merge "Update Oslo imports to remove namespace package"
-rw-r--r-- | oslo_middleware/i18n.py | 4 | ||||
-rw-r--r-- | oslo_middleware/sizelimit.py | 4 | ||||
-rw-r--r-- | oslo_middleware/tests/test_sizelimit.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/oslo_middleware/i18n.py b/oslo_middleware/i18n.py index 307c8f5..2025741 100644 --- a/oslo_middleware/i18n.py +++ b/oslo_middleware/i18n.py @@ -16,10 +16,10 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html """ -from oslo import i18n +import oslo_i18n -_translators = i18n.TranslatorFactory(domain='oslo.middleware') +_translators = oslo_i18n.TranslatorFactory(domain='oslo.middleware') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/oslo_middleware/sizelimit.py b/oslo_middleware/sizelimit.py index 42b0fd1..d3f3039 100644 --- a/oslo_middleware/sizelimit.py +++ b/oslo_middleware/sizelimit.py @@ -17,8 +17,8 @@ Request Body limiting middleware. """ -from oslo.config import cfg -from oslo.config import cfgfilter +from oslo_config import cfg +from oslo_config import cfgfilter import webob.dec import webob.exc diff --git a/oslo_middleware/tests/test_sizelimit.py b/oslo_middleware/tests/test_sizelimit.py index 4611758..2a24659 100644 --- a/oslo_middleware/tests/test_sizelimit.py +++ b/oslo_middleware/tests/test_sizelimit.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_config import fixture as config from oslotest import base as test_base import six import webob -from oslo.config import fixture as config from oslo_middleware import sizelimit |