diff --git a/muranoclient/common/http.py b/muranoclient/common/http.py index b2dc4ee5..8c492437 100644 --- a/muranoclient/common/http.py +++ b/muranoclient/common/http.py @@ -18,8 +18,8 @@ import logging import os import socket -from oslo.serialization import jsonutils -from oslo.utils import encodeutils +from oslo_serialization import jsonutils +from oslo_utils import encodeutils import requests import six from six.moves.urllib import parse diff --git a/muranoclient/common/utils.py b/muranoclient/common/utils.py index 15177600..7a765ea2 100644 --- a/muranoclient/common/utils.py +++ b/muranoclient/common/utils.py @@ -28,9 +28,9 @@ import uuid import warnings import zipfile -from oslo.serialization import jsonutils -from oslo.utils import encodeutils -from oslo.utils import importutils +from oslo_serialization import jsonutils +from oslo_utils import encodeutils +from oslo_utils import importutils import prettytable import requests import six diff --git a/muranoclient/openstack/common/apiclient/base.py b/muranoclient/openstack/common/apiclient/base.py index e0c7071d..1dc3397d 100644 --- a/muranoclient/openstack/common/apiclient/base.py +++ b/muranoclient/openstack/common/apiclient/base.py @@ -26,8 +26,8 @@ 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 uuidutils +from oslo_utils import strutils +from oslo_utils import uuidutils import six from six.moves.urllib import parse diff --git a/muranoclient/openstack/common/apiclient/client.py b/muranoclient/openstack/common/apiclient/client.py index 5968d71a..a574813c 100644 --- a/muranoclient/openstack/common/apiclient/client.py +++ b/muranoclient/openstack/common/apiclient/client.py @@ -35,7 +35,7 @@ except ImportError: import requests -from oslo.utils import importutils +from oslo_utils import importutils from muranoclient.openstack.common.apiclient import exceptions from muranoclient.openstack.common.gettextutils import _ diff --git a/muranoclient/openstack/common/cliutils.py b/muranoclient/openstack/common/cliutils.py index 34a85820..dfab04b4 100644 --- a/muranoclient/openstack/common/cliutils.py +++ b/muranoclient/openstack/common/cliutils.py @@ -28,9 +28,9 @@ import prettytable import six from six import moves -from oslo.utils import encodeutils -from oslo.utils import strutils -from oslo.utils import uuidutils +from oslo_utils import encodeutils +from oslo_utils import strutils +from oslo_utils import uuidutils from muranoclient.openstack.common.apiclient import exceptions from muranoclient.openstack.common.gettextutils import _ diff --git a/muranoclient/shell.py b/muranoclient/shell.py index 4bbfe1a4..373b0997 100644 --- a/muranoclient/shell.py +++ b/muranoclient/shell.py @@ -24,7 +24,7 @@ import sys import glanceclient from keystoneclient.v2_0 import client as ksclient -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six from muranoclient import client as apiclient diff --git a/muranoclient/tests/fakes.py b/muranoclient/tests/fakes.py index 7ce13df4..b4b96e88 100644 --- a/muranoclient/tests/fakes.py +++ b/muranoclient/tests/fakes.py @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils class FakeHTTPResponse(): diff --git a/muranoclient/v1/packages.py b/muranoclient/v1/packages.py index 90180606..6e42d810 100644 --- a/muranoclient/v1/packages.py +++ b/muranoclient/v1/packages.py @@ -15,7 +15,7 @@ import logging import urllib -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import yaml from muranoclient.common import base