Remove unused modules copied from oslo-incubator

No longer needed since we moved to oslo.utils and
oslo.serialization and updated to latest oslo-incubator.
As part of the cleanup removed the hack for gettextutils
since the oslo-incubator code no longer uses it

Change-Id: Ib020cd4c3464f1c994a6d77f4b894f41b99e6d02

nova/api/openstack/compute/plugins/v3/cloudpipe.py

@@ -15,6 +15,7 @@
 """Connect your vlan to the world."""
 
 from oslo.config import cfg
+from oslo.utils import timeutils
 from webob import exc
 
 from nova.api.openstack import extensions
@@ -27,7 +28,6 @@
 from nova.i18n import _
 from nova import network
 from nova.openstack.common import fileutils
-from nova.openstack.common import timeutils
 from nova import utils
 
 CONF = cfg.CONF

nova/api/openstack/compute/plugins/v3/disk_config.py

@@ -14,12 +14,12 @@
 
 """Disk Config extension."""
 
+from oslo.utils import strutils
 from webob import exc
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.i18n import _
-from nova.openstack.common import strutils
 
 ALIAS = 'os-disk-config'
 API_DISK_CONFIG = "OS-DCF:diskConfig"

nova/i18n.py

@@ -20,8 +20,6 @@
 
 from oslo import i18n
 
-from nova.openstack.common import gettextutils
-
 DOMAIN = 'nova'
 
 _translators = i18n.TranslatorFactory(domain=DOMAIN)
@@ -46,21 +44,3 @@ def translate(value, user_locale):
 
 def get_available_languages():
     return i18n.get_available_languages(DOMAIN)
-
-
-# Parts in oslo-incubator are still using gettextutils._(), _LI(), etc., from
-# oslo-incubator. Until these parts are changed to use oslo.i18n, Keystone
-# needs to do something to allow them to work. One option is to continue to
-# initialize gettextutils, but with the way that Nova has initialization
-# spread out over mutltiple entry points, we'll monkey-patch
-# gettextutils._(), _LI(), etc., to use our oslo.i18n versions.
-
-# FIXME(dims): Remove the monkey-patching and update openstack-common.conf and
-# do a sync with oslo-incubator to remove gettextutils once oslo-incubator
-# isn't using oslo-incubator gettextutils any more.
-
-gettextutils._ = _
-gettextutils._LI = _LI
-gettextutils._LW = _LW
-gettextutils._LE = _LE
-gettextutils._LC = _LC

nova/openstack/common/config/generator.py

@@ -31,11 +31,8 @@
 import six
 import stevedore.named
 
-from nova.openstack.common import gettextutils
 from nova.openstack.common import importutils
 
-gettextutils.install('nova')
-
 STROPT = "StrOpt"
 BOOLOPT = "BoolOpt"
 INTOPT = "IntOpt"