Namespace updates for _i18n and imageutils & fileutils

The _i18n and imageutils modules only have changes
to move oslo.utils to the oslo_utils namespace and
oslo.i18n to oslo_i18n.  So, I have lumped these
two small changes into this one patch.

Current HEAD in OSLO:
---------------------
commit e589dde0721a0a67e4030813e582afec6e70d042
Date:  Wed Feb 18 03:08:12 2015 +0000
Merge "Have a little fun with release notes"

Changes merged with this patch:
---------------------
_i18n.py
  0cc741a9 - switch to oslo_i18n
imageutils.py
  ac17de97 - Use oslo_utils instead of deprecated oslo.utils
fileutils.py
  ac17de97 - Use oslo_utils instead of deprecated oslo.utils

Change-Id: I749dd8869bbc07d980300e0acbf3903ff7b297cd

diff --git a/cinder/openstack/common/_i18n.py b/cinder/openstack/common/_i18n.py
index 20f9b3ce888a2d6107a6825d9fda65a189a467cf..46eb21446a827b697cc22e716073740ff9509e69 100644 (file)
--- a/cinder/openstack/common/_i18n.py
+++ b/cinder/openstack/common/_i18n.py
@@ -17,14 +17,14 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
 """
 
 try:
-    import oslo.i18n
+    import oslo_i18n
 
     # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
     # application name when this module is synced into the separate
     # repository. It is OK to have more than one translation function
     # using the same domain, since there will still only be one message
     # catalog.
-    _translators = oslo.i18n.TranslatorFactory(domain='cinder')
+    _translators = oslo_i18n.TranslatorFactory(domain='cinder')
 
     # The primary translation function using the well-known name "_"
     _ = _translators.primary
@@ -40,6 +40,6 @@ try:
     _LC = _translators.log_critical
 except ImportError:
     # NOTE(dims): Support for cases where a project wants to use
-    # code from cinder-incubator, but is not ready to be internationalized
+    # code from oslo-incubator, but is not ready to be internationalized
     # (like tempest)
     _ = _LI = _LW = _LE = _LC = lambda x: x

diff --git a/cinder/openstack/common/fileutils.py b/cinder/openstack/common/fileutils.py
index 6cacf22b2418a609ed516638bf9a0803e1c5c9e7..9097c35d4595c79071dd65e056000c640952479e 100644 (file)
--- a/cinder/openstack/common/fileutils.py
+++ b/cinder/openstack/common/fileutils.py
@@ -20,7 +20,7 @@ import os
 import stat
 import tempfile
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 LOG = logging.getLogger(__name__)
 

diff --git a/cinder/openstack/common/imageutils.py b/cinder/openstack/common/imageutils.py
index bdb8263d041fb7817e9576959bd32bbb8750802b..9a85e8512106776489eb40d25c0a95a4c8524ab1 100644 (file)
--- a/cinder/openstack/common/imageutils.py
+++ b/cinder/openstack/common/imageutils.py
@@ -21,7 +21,7 @@ Helper methods to deal with images.
 
 import re
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 
 from cinder.openstack.common._i18n import _