diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-29 22:29:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-29 22:29:11 +0000 |
| commit | 5171a20ab8db1c3ff20afd53217b8c89aaf2f112 (patch) | |
| tree | 92866615e02ad96c8f8102e992f205b493586dd3 | |
| parent | 58c2a2770622c66d0227800632fc8cad599975f6 (diff) | |
| parent | 4aad219818518f1eb5cc0847c9f7e96e7244e149 (diff) | |
| download | python-ceilometerclient-5171a20ab8db1c3ff20afd53217b8c89aaf2f112.tar.gz | |
Merge "Use oslo_utils instead of deprecated oslo.utils"
| -rw-r--r-- | ceilometerclient/client.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/common/utils.py | 4 | ||||
| -rw-r--r-- | ceilometerclient/shell.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/v2/shell.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index 8e78626..a3fbba5 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -15,7 +15,7 @@ from keystoneclient.auth.identity import v3 as v3_auth from keystoneclient import discover from keystoneclient import exceptions as ks_exc from keystoneclient import session -from oslo.utils import strutils +from oslo_utils import strutils import six.moves.urllib.parse as urlparse from ceilometerclient.common import utils diff --git a/ceilometerclient/common/utils.py b/ceilometerclient/common/utils.py index b6408cf..998ada8 100644 --- a/ceilometerclient/common/utils.py +++ b/ceilometerclient/common/utils.py @@ -20,8 +20,8 @@ import textwrap import uuid from oslo.serialization import jsonutils -from oslo.utils import encodeutils -from oslo.utils import importutils +from oslo_utils import encodeutils +from oslo_utils import importutils import prettytable import six diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py index 10a43d5..23a9dc1 100644 --- a/ceilometerclient/shell.py +++ b/ceilometerclient/shell.py @@ -20,7 +20,7 @@ import argparse import logging import sys -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six import ceilometerclient diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index 5e900a8..bb09e18 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -23,7 +23,7 @@ import functools import json from oslo.serialization import jsonutils -from oslo.utils import strutils +from oslo_utils import strutils import six from ceilometerclient.common import utils |