Merge "Drop use of 'oslo' namespace package"

manilaclient/client.py

@@ -20,7 +20,7 @@
 OpenStack Client interface. Handles the REST calls and responses.
 """
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 from manilaclient import exceptions
 

manilaclient/config.py

@@ -16,7 +16,7 @@
 import copy
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 import oslo_log._options as log_options
 
 # 1. Define opts

manilaclient/httpclient.py

@@ -19,7 +19,7 @@
 import copy
 import logging
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import requests
 import six

manilaclient/openstack/common/_i18n.py

@@ -16,7 +16,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
 
 """
 
-import oslo.i18n
+import oslo_i18n
 
 
 # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
@@ -24,7 +24,7 @@ import oslo.i18n
 # 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='manilaclient')
+_translators = oslo_i18n.TranslatorFactory(domain='manilaclient')
 
 # The primary translation function using the well-known name "_"
 _ = _translators.primary

manilaclient/openstack/common/apiclient/base.py

@@ -26,7 +26,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
 

manilaclient/openstack/common/apiclient/client.py

@@ -33,7 +33,7 @@ try:
 except ImportError:
     import json
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 import requests
 
 from manilaclient.openstack.common._i18n import _

manilaclient/openstack/common/apiclient/utils.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 import six
 
 from manilaclient.openstack.common._i18n import _

manilaclient/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

manilaclient/shell.py

@@ -29,7 +29,7 @@ import os
 import pkgutil
 import sys
 
-from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 import six
 
 from manilaclient import client