Merge "Drop use of 'oslo' namespace package"

ceilometerclient/common/utils.py

@@ -19,7 +19,7 @@ import sys
 import textwrap
 import uuid
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
 from oslo_utils import importutils
 import prettytable

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

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

ceilometerclient/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 ceilometerclient.openstack.common._i18n import _

ceilometerclient/openstack/common/apiclient/utils.py

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

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

ceilometerclient/v2/shell.py

@@ -22,7 +22,7 @@ import argparse
 import functools
 import json
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import six