Merge "Remove openstack.common.importutils"

glanceclient/common/http.py

@@ -17,6 +17,7 @@ import copy
 import logging
 import socket
 
+from oslo.utils import importutils
 from oslo.utils import netutils
 import requests
 try:
@@ -41,7 +42,6 @@ from oslo.utils import encodeutils
 from glanceclient.common import https
 from glanceclient.common.utils import safe_header
 from glanceclient import exc
-from glanceclient.openstack.common import importutils
 
 osprofiler_web = importutils.try_import("osprofiler.web")
 

glanceclient/common/utils.py

@@ -24,6 +24,7 @@ import sys
 import threading
 import uuid
 
+from oslo.utils import importutils
 import six
 
 if os.name == 'nt':
@@ -36,7 +37,6 @@ from oslo.utils import strutils
 import prettytable
 
 from glanceclient import exc
-from glanceclient.openstack.common import importutils
 
 _memoized_property_lock = threading.Lock()
 

glanceclient/openstack/common/importutils.py

@@ -1,73 +0,0 @@
-# Copyright 2011 OpenStack Foundation.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-Import related utilities and helper functions.
-"""
-
-import sys
-import traceback
-
-
-def import_class(import_str):
-    """Returns a class from a string including module and class."""
-    mod_str, _sep, class_str = import_str.rpartition('.')
-    try:
-        __import__(mod_str)
-        return getattr(sys.modules[mod_str], class_str)
-    except (ValueError, AttributeError):
-        raise ImportError('Class %s cannot be found (%s)' %
-                          (class_str,
-                           traceback.format_exception(*sys.exc_info())))
-
-
-def import_object(import_str, *args, **kwargs):
-    """Import a class and return an instance of it."""
-    return import_class(import_str)(*args, **kwargs)
-
-
-def import_object_ns(name_space, import_str, *args, **kwargs):
-    """Tries to import object from default namespace.
-
-    Imports a class and return an instance of it, first by trying
-    to find the class in a default namespace, then failing back to
-    a full path if not found in the default namespace.
-    """
-    import_value = "%s.%s" % (name_space, import_str)
-    try:
-        return import_class(import_value)(*args, **kwargs)
-    except ImportError:
-        return import_class(import_str)(*args, **kwargs)
-
-
-def import_module(import_str):
-    """Import a module."""
-    __import__(import_str)
-    return sys.modules[import_str]
-
-
-def import_versioned_module(version, submodule=None):
-    module = 'glanceclient.v%s' % version
-    if submodule:
-        module = '.'.join((module, submodule))
-    return import_module(module)
-
-
-def try_import(import_str, default=None):
-    """Try to import a module and if it fails return default."""
-    try:
-        return import_module(import_str)
-    except ImportError:
-        return default

glanceclient/shell.py

@@ -30,13 +30,13 @@ import sys
 import traceback
 
 from oslo.utils import encodeutils
+from oslo.utils import importutils
 import six.moves.urllib.parse as urlparse
 
 import glanceclient
 from glanceclient.common import utils
 from glanceclient import exc
 from glanceclient.openstack.common.gettextutils import _
-from glanceclient.openstack.common import importutils
 
 from keystoneclient.auth.identity import v2 as v2_auth
 from keystoneclient.auth.identity import v3 as v3_auth

openstack-common.conf

@@ -3,7 +3,6 @@
 # The list of modules to copy from openstack-common
 module=apiclient
 module=gettextutils
-module=importutils
 module=uuidutils
 
 # The base module to hold the copy of openstack.common