Change leftover oslo.* to oslo_*

Use oslo_i18n instead of "from oslo import i18n"
Use oslo_messaging instead of "from oslo import messaging"

Partial-Bug: 1409733

Change-Id: If119603e4f89965d0c9e5917b2772ae0e7ddf3d2

diff --git a/cinder/i18n.py b/cinder/i18n.py
index 0f120028a9bb71b41d76cec2fc61352c885ca8f3..1b3965bf0ee95bc56d71fb424bdf6c646ff0250a 100644 (file)
--- a/cinder/i18n.py
+++ b/cinder/i18n.py
@@ -18,7 +18,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html .
 
 """
 
-from oslo import i18n
+import oslo_i18n as i18n
 
 from cinder.openstack.common import gettextutils
 

diff --git a/cinder/objects/base.py b/cinder/objects/base.py
index 22ef47c7bb760bd858b819f5410064c60ee03fd4..38cd679b80d9d334de43d6bf9a975fab467002ae 100644 (file)
--- a/cinder/objects/base.py
+++ b/cinder/objects/base.py
@@ -22,8 +22,8 @@ import functools
 import traceback
 
 import netaddr
-from oslo import messaging
 from oslo_log import log as logging
+import oslo_messaging as messaging
 from oslo_utils import timeutils
 import six