Remove deprecated use of gettextutils import _

The initial hacking check I wrote allowed users to check in code
using 'from cinder.openstack.common.gettextutils import _' or
'from cinder.i18n import _'.  This was to ease the transition for
code that was in flight with the old import.

Now that we have moved Cinder over to using cinder.i18n and most
of the code that was in flight with the old import has been merged
and/or fixed, I am updating the hacking check to enforce the use of
cinder.i18n and fixing the cases that still had the old import.

Change-Id: Iff6ccac1996c06bbc5defd5139113a2baa0b677c

diff --git a/cinder/api/__init__.py b/cinder/api/__init__.py
index 0b9bda0fadc92023d4161773ac6ebb6516315859..bfa5ae02b2b94647046495a20e427fa6cc6512b8 100644 (file)
--- a/cinder/api/__init__.py
+++ b/cinder/api/__init__.py
@@ -18,7 +18,7 @@
 from oslo.config import cfg
 import paste.urlmap
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/hacking/checks.py b/cinder/hacking/checks.py
index 3f6e675ee6bc17ce5f7fb515cc99cd450b20297b..d05ad7efb3d2feb827418c23f7b9ea1691a0dc55 100644 (file)
--- a/cinder/hacking/checks.py
+++ b/cinder/hacking/checks.py
@@ -36,7 +36,7 @@ translated_log = re.compile(
     "\(\s*_\(\s*('|\")")
 string_translation = re.compile(r"(.)*_\(\s*('|\")")
 vi_header_re = re.compile(r"^#\s+vim?:.+")
-underscore_import_check = re.compile(r"(.)*import _(.)*")
+underscore_import_check = re.compile(r"(.)*i18n\s+import\s+_(.)*")
 # We need this for cases where they have created their own _ function.
 custom_underscore_check = re.compile(r"(.)*_\s*=\s*(.)*")
 no_audit_log = re.compile(r"(.)*LOG\.audit(.)*")

diff --git a/cinder/keymgr/barbican.py b/cinder/keymgr/barbican.py
index 1ebcfd321d5395be19ccf521c1791c2845af9e22..3d7e8ac44b28b0fea133a0a2bf5cb9bc2cf953ad 100644 (file)
--- a/cinder/keymgr/barbican.py
+++ b/cinder/keymgr/barbican.py
@@ -27,10 +27,10 @@ from keystoneclient.v2_0 import client as keystone_client
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.keymgr import key as keymgr_key
 from cinder.keymgr import key_mgr
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _    # noqa
 from cinder.openstack.common import log as logging
 
 CONF = cfg.CONF

diff --git a/cinder/volume/drivers/prophetstor/dpl_fc.py b/cinder/volume/drivers/prophetstor/dpl_fc.py
index 88e564ba6f41345eb2797f4b30f998abaae99112..a266f7657200d7a07925c9c2535dd330edad3986 100644 (file)
--- a/cinder/volume/drivers/prophetstor/dpl_fc.py
+++ b/cinder/volume/drivers/prophetstor/dpl_fc.py
@@ -18,7 +18,7 @@ import errno
 import six
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume.drivers.prophetstor import dplcommon

diff --git a/cinder/volume/drivers/prophetstor/dpl_iscsi.py b/cinder/volume/drivers/prophetstor/dpl_iscsi.py
index 4b289be350d6dc5ae8ce930b4001797fe9e9ed67..cd53317c160690a99936d2937076060ea79e4677 100644 (file)
--- a/cinder/volume/drivers/prophetstor/dpl_iscsi.py
+++ b/cinder/volume/drivers/prophetstor/dpl_iscsi.py
@@ -16,7 +16,7 @@
 import errno
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 import cinder.volume.driver
 from cinder.volume.drivers.prophetstor import dplcommon

diff --git a/cinder/volume/drivers/prophetstor/dplcommon.py b/cinder/volume/drivers/prophetstor/dplcommon.py
index a6f02165d1b42f5f71755279411db1e2ba0eea19..d446ce2edc57639c2d6bdcf7af9c37f5c9358f78 100644 (file)
--- a/cinder/volume/drivers/prophetstor/dplcommon.py
+++ b/cinder/volume/drivers/prophetstor/dplcommon.py
@@ -26,7 +26,7 @@ import time
 import six
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py
index abed9c8069ce4631646094ffd076599c360287e0..f0393b460e5efc32326b104369e174ff96faabcb 100644 (file)
--- a/cinder/volume/drivers/remotefs.py
+++ b/cinder/volume/drivers/remotefs.py
@@ -23,8 +23,8 @@ import tempfile
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils as putils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/smbfs.py b/cinder/volume/drivers/smbfs.py
index 2a355a891e2cd0d2140d507b2f70c0a1a143005d..d824e8127eed1ce503b07772b7d6f69595509ee0 100644 (file)
--- a/cinder/volume/drivers/smbfs.py
+++ b/cinder/volume/drivers/smbfs.py
@@ -20,8 +20,8 @@ from oslo.config import cfg
 
 from cinder.brick.remotefs import remotefs
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils as putils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/vmware/datastore.py b/cinder/volume/drivers/vmware/datastore.py
index a44baefa7fd7cc2a24a380dc0ba8608370bd1335..ce29acd16017833284529a2f8021f09f731f1621 100644 (file)
--- a/cinder/volume/drivers/vmware/datastore.py
+++ b/cinder/volume/drivers/vmware/datastore.py
@@ -17,8 +17,8 @@
 Classes and utility methods for datastore selection.
 """
 
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.vmware import error_util
 from cinder.volume.drivers.vmware import vim_util

diff --git a/cinder/volume/drivers/windows/remotefs.py b/cinder/volume/drivers/windows/remotefs.py
index ff22214fc9c4ee76d7c66e6911b314f20c4250bd..0d9482e8ae076eb8e711fdc80271d2e7e5c88eec 100644 (file)
--- a/cinder/volume/drivers/windows/remotefs.py
+++ b/cinder/volume/drivers/windows/remotefs.py
@@ -21,7 +21,7 @@ if sys.platform == 'win32':
 
 from cinder.brick.remotefs import remotefs
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/volume/drivers/windows/smbfs.py b/cinder/volume/drivers/windows/smbfs.py
index c2c07985b2dc23786b71313d14c1b9b61e523a93..c7e26eff447a4182cdff533f99e695d157376a7b 100644 (file)
--- a/cinder/volume/drivers/windows/smbfs.py
+++ b/cinder/volume/drivers/windows/smbfs.py
@@ -21,9 +21,9 @@ import sys
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
 from cinder.openstack.common import fileutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder import utils