Fix oslo package deprecation warnings

Change-Id: Idacc7991f97eecd18be00fd179061691bc67da2b

castellan/keymgr/__init__.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 keymgr_opts = [
     cfg.StrOpt('api_class',

castellan/openstack/common/_i18n.py

@@ -10,21 +10,21 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""oslo.i18n integration module.
+"""oslo_i18n integration module.
 
 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='castellan')
+    _translators = oslo_i18n.TranslatorFactory(domain='castellan')
 
     # The primary translation function using the well-known name "_"
     _ = _translators.primary

castellan/openstack/common/log.py

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

castellan/openstack/common/policy.py

@@ -94,8 +94,8 @@ import copy
 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