Merge "Drop use of 'oslo' namespace package"

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

openstack_dashboard/openstack/common/log.py

@@ -37,8 +37,8 @@ import socket
 import sys
 import traceback
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
 from oslo_utils import importutils
 import six
 from six import moves

openstack_dashboard/openstack/common/policy.py

@@ -80,8 +80,8 @@ import ast
 import os
 import re
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
 import six
 import six.moves.urllib.parse as urlparse
 import six.moves.urllib.request as urlrequest