From 865e55a2928582948fb6eb8d8d84922c5f9d9ae9 Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Fri, 16 Jul 2021 12:05:06 -0400
Subject: [PATCH] Remove openstack.common.importutils.py

Remove the deprecated openstack.common.importutils
in favor or oslo_utils.importutils

Story: 2006796
Task: 42848

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: I9220e22b8db6c6330ca26ba9bb7a8569527826e0
(cherry picked from commit 8655ae2aa1fdc9d92d7afad0e1c58d6971e47661)
---
 .../sm-client/sm_client/common/utils.py       |  2 +-
 .../openstack/common/config/generator.py      |  2 +-
 .../sm_client/openstack/common/importutils.py | 71 -------------------
 3 files changed, 2 insertions(+), 73 deletions(-)
 delete mode 100644 service-mgmt-client/sm-client/sm_client/openstack/common/importutils.py

diff --git a/service-mgmt-client/sm-client/sm_client/common/utils.py b/service-mgmt-client/sm-client/sm_client/common/utils.py
index 08b776a3..cba2470f 100644
--- a/service-mgmt-client/sm-client/sm_client/common/utils.py
+++ b/service-mgmt-client/sm-client/sm_client/common/utils.py
@@ -26,8 +26,8 @@ import uuid
 import prettytable
 import six
 
+from oslo_utils import importutils
 from sm_client import exc
-from sm_client.openstack.common import importutils
 from six.moves import zip
 
 
diff --git a/service-mgmt-client/sm-client/sm_client/openstack/common/config/generator.py b/service-mgmt-client/sm-client/sm_client/openstack/common/config/generator.py
index 47035ed2..9197bcc2 100644
--- a/service-mgmt-client/sm-client/sm_client/openstack/common/config/generator.py
+++ b/service-mgmt-client/sm-client/sm_client/openstack/common/config/generator.py
@@ -31,9 +31,9 @@ import sys
 import textwrap
 import six
 from oslo_config import cfg
+from oslo_utils import importutils
 
 from sm_client.openstack.common import gettextutils
-from sm_client.openstack.common import importutils
 
 gettextutils.install('python-sm_client')
 
diff --git a/service-mgmt-client/sm-client/sm_client/openstack/common/importutils.py b/service-mgmt-client/sm-client/sm_client/openstack/common/importutils.py
deleted file mode 100644
index 9ee48932..00000000
--- a/service-mgmt-client/sm-client/sm_client/openstack/common/importutils.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# 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.
-#
-# Copyright (c) 2013-2014 Wind River Systems, Inc.
-#
-
-
-"""
-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):
-    """
-    Import 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 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