Merge "Drop use of 'oslo' namespace package"

tuskarclient/common/utils.py

@@ -17,7 +17,7 @@ from __future__ import print_function
 
 import uuid
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 from tuskarclient.openstack.common.apiclient import exceptions as exc
 from tuskarclient.openstack.common import cliutils

tuskarclient/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='tuskarclient')
+    _translators = oslo_i18n.TranslatorFactory(domain='tuskarclient')
 
     # The primary translation function using the well-known name "_"
     _ = _translators.primary

tuskarclient/openstack/common/apiclient/base.py

@@ -40,7 +40,7 @@ Base utilities to build API operation managers and objects on top of.
 import abc
 import copy
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import six
 from six.moves.urllib import parse
 

tuskarclient/openstack/common/apiclient/client.py

@@ -34,8 +34,8 @@ try:
 except ImportError:
     import json
 
-from oslo.utils import encodeutils
-from oslo.utils import importutils
+from oslo_utils import encodeutils
+from oslo_utils import importutils
 import requests
 
 from tuskarclient.openstack.common._i18n import _

tuskarclient/openstack/common/apiclient/utils.py

@@ -24,7 +24,7 @@
 #
 ########################################################################
 
-from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 import six
 
 from tuskarclient.openstack.common._i18n import _

tuskarclient/openstack/common/cliutils.py

@@ -24,8 +24,8 @@ import os
 import sys
 import textwrap
 
-from oslo.utils import encodeutils
-from oslo.utils import strutils
+from oslo_utils import encodeutils
+from oslo_utils import strutils
 import prettytable
 import six
 from six import moves