From ebd55395ceaaf263ded4a5edbaf5eb8a6b2dfb6e Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Wed, 4 Feb 2015 01:42:07 -0500 Subject: Use oslo namespaces Instead of using imports like: import oslo.config we should be using: import oslo_config Change-Id: I11fe1dbb0d638b9cc6d65fcdb1c1482cdf0c40b9 --- pycadf/_i18n.py | 4 ++-- pycadf/audit/api.py | 2 +- pycadf/cadftype.py | 2 +- pycadf/identifier.py | 2 +- pycadf/middleware/notifier.py | 8 ++++---- pycadf/tests/audit/test_api.py | 2 +- pycadf/tests/base.py | 2 +- pycadf/tests/middleware/test_audit.py | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pycadf/_i18n.py b/pycadf/_i18n.py index f3cc295..78ccf2b 100644 --- a/pycadf/_i18n.py +++ b/pycadf/_i18n.py @@ -14,10 +14,10 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html """ -from oslo import i18n +import oslo_i18n -_translators = i18n.TranslatorFactory(domain='pycadf') +_translators = oslo_i18n.TranslatorFactory(domain='pycadf') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/pycadf/audit/api.py b/pycadf/audit/api.py index 909b182..42c2911 100644 --- a/pycadf/audit/api.py +++ b/pycadf/audit/api.py @@ -17,7 +17,7 @@ import collections import os import re -from oslo.config import cfg +from oslo_config import cfg from six.moves import configparser from six.moves.urllib import parse as urlparse diff --git a/pycadf/cadftype.py b/pycadf/cadftype.py index 40950c1..80cec82 100644 --- a/pycadf/cadftype.py +++ b/pycadf/cadftype.py @@ -14,7 +14,7 @@ import abc -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six CADF_SCHEMA_1_0_0 = 'cadf:' diff --git a/pycadf/identifier.py b/pycadf/identifier.py index ddca6b4..8c74fb6 100644 --- a/pycadf/identifier.py +++ b/pycadf/identifier.py @@ -14,7 +14,7 @@ import uuid -from oslo.config import cfg +from oslo_config import cfg import six CONF = cfg.CONF diff --git a/pycadf/middleware/notifier.py b/pycadf/middleware/notifier.py index c94d6dd..175c361 100644 --- a/pycadf/middleware/notifier.py +++ b/pycadf/middleware/notifier.py @@ -18,8 +18,8 @@ import os.path import sys import traceback as tb -from oslo.config import cfg -import oslo.messaging +from oslo_config import cfg +import oslo_messaging import six import webob.dec @@ -76,8 +76,8 @@ class RequestNotifier(base.Middleware): self.service_name = conf.get('service_name') self.ignore_req_list = [x.upper().strip() for x in conf.get('ignore_req_list', '').split(',')] - self.notifier = oslo.messaging.Notifier( - oslo.messaging.get_transport(cfg.CONF, aliases=TRANSPORT_ALIASES), + self.notifier = oslo_messaging.Notifier( + oslo_messaging.get_transport(cfg.CONF, aliases=TRANSPORT_ALIASES), os.path.basename(sys.argv[0])) super(RequestNotifier, self).__init__(app) diff --git a/pycadf/tests/audit/test_api.py b/pycadf/tests/audit/test_api.py index e434253..1b9e30f 100644 --- a/pycadf/tests/audit/test_api.py +++ b/pycadf/tests/audit/test_api.py @@ -14,7 +14,7 @@ import uuid -from oslo.config import cfg +from oslo_config import cfg import webob from pycadf.audit import api diff --git a/pycadf/tests/base.py b/pycadf/tests/base.py index f63578c..d09bdd6 100644 --- a/pycadf/tests/base.py +++ b/pycadf/tests/base.py @@ -17,7 +17,7 @@ import os.path import fixtures -from oslo.config import cfg +from oslo_config import cfg from oslotest import moxstubout import testtools diff --git a/pycadf/tests/middleware/test_audit.py b/pycadf/tests/middleware/test_audit.py index 389f80d..aeb63d7 100644 --- a/pycadf/tests/middleware/test_audit.py +++ b/pycadf/tests/middleware/test_audit.py @@ -35,7 +35,7 @@ class FakeFailingApp(object): raise Exception("It happens!") -@mock.patch('oslo.messaging.get_transport', mock.MagicMock()) +@mock.patch('oslo_messaging.get_transport', mock.MagicMock()) class AuditMiddlewareTest(base.TestCase): ENV_HEADERS = {'HTTP_X_SERVICE_CATALOG': '''[{"endpoints_links": [], @@ -67,7 +67,7 @@ class AuditMiddlewareTest(base.TestCase): self.ENV_HEADERS['REQUEST_METHOD'] = 'GET' req = webob.Request.blank('/foo/bar', environ=self.ENV_HEADERS) - with mock.patch('oslo.messaging.Notifier.info') as notify: + with mock.patch('oslo_messaging.Notifier.info') as notify: middleware(req) # Check first notification with only 'request' call_args = notify.call_args_list[0][0] @@ -101,7 +101,7 @@ class AuditMiddlewareTest(base.TestCase): self.ENV_HEADERS['REQUEST_METHOD'] = 'GET' req = webob.Request.blank('/foo/bar', environ=self.ENV_HEADERS) - with mock.patch('oslo.messaging.Notifier.info') as notify: + with mock.patch('oslo_messaging.Notifier.info') as notify: try: middleware(req) self.fail("Application exception has not been re-raised") -- cgit v1.2.1