diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-03 18:49:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-03 18:49:06 +0000 |
| commit | 7ba8aa333bbd66e57f407a1f36d1e6e9d78b1e2c (patch) | |
| tree | 37c5bc3b33c9d42ccfcf83c81cb1f164168e78a0 | |
| parent | b0916890a2019369b24469f4c6336f949bf9802b (diff) | |
| parent | 1212640c86015b777a2d4f4fb2b5f4007ee750f9 (diff) | |
| download | python-ceilometerclient-7ba8aa333bbd66e57f407a1f36d1e6e9d78b1e2c.tar.gz | |
Merge "Drop use of 'oslo' namespace package"
| -rw-r--r-- | ceilometerclient/common/utils.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/openstack/common/_i18n.py | 4 | ||||
| -rw-r--r-- | ceilometerclient/openstack/common/apiclient/base.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/openstack/common/apiclient/client.py | 4 | ||||
| -rw-r--r-- | ceilometerclient/openstack/common/apiclient/utils.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/openstack/common/cliutils.py | 4 | ||||
| -rw-r--r-- | ceilometerclient/v2/shell.py | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/ceilometerclient/common/utils.py b/ceilometerclient/common/utils.py index 998ada8..d1ac720 100644 --- a/ceilometerclient/common/utils.py +++ b/ceilometerclient/common/utils.py @@ -19,7 +19,7 @@ import sys import textwrap import uuid -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import encodeutils from oslo_utils import importutils import prettytable diff --git a/ceilometerclient/openstack/common/_i18n.py b/ceilometerclient/openstack/common/_i18n.py index 4b0745f..907ab4f 100644 --- a/ceilometerclient/openstack/common/_i18n.py +++ b/ceilometerclient/openstack/common/_i18n.py @@ -17,14 +17,14 @@ 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='ceilometerclient') + _translators = oslo_i18n.TranslatorFactory(domain='ceilometerclient') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/ceilometerclient/openstack/common/apiclient/base.py b/ceilometerclient/openstack/common/apiclient/base.py index 4462e43..53aad2a 100644 --- a/ceilometerclient/openstack/common/apiclient/base.py +++ b/ceilometerclient/openstack/common/apiclient/base.py @@ -40,7 +40,7 @@ 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 strutils import six from six.moves.urllib import parse diff --git a/ceilometerclient/openstack/common/apiclient/client.py b/ceilometerclient/openstack/common/apiclient/client.py index c5d6528..5a13753 100644 --- a/ceilometerclient/openstack/common/apiclient/client.py +++ b/ceilometerclient/openstack/common/apiclient/client.py @@ -34,8 +34,8 @@ try: except ImportError: import json -from oslo.utils import encodeutils -from oslo.utils import importutils +from oslo_utils import encodeutils +from oslo_utils import importutils import requests from ceilometerclient.openstack.common._i18n import _ diff --git a/ceilometerclient/openstack/common/apiclient/utils.py b/ceilometerclient/openstack/common/apiclient/utils.py index 6d94759..7b9d56b 100644 --- a/ceilometerclient/openstack/common/apiclient/utils.py +++ b/ceilometerclient/openstack/common/apiclient/utils.py @@ -24,7 +24,7 @@ # ######################################################################## -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six from ceilometerclient.openstack.common._i18n import _ diff --git a/ceilometerclient/openstack/common/cliutils.py b/ceilometerclient/openstack/common/cliutils.py index 341cd01..326aab5 100644 --- a/ceilometerclient/openstack/common/cliutils.py +++ b/ceilometerclient/openstack/common/cliutils.py @@ -24,8 +24,8 @@ import os import sys import textwrap -from oslo.utils import encodeutils -from oslo.utils import strutils +from oslo_utils import encodeutils +from oslo_utils import strutils import prettytable import six from six import moves diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index bb09e18..a02ae1d 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -22,7 +22,7 @@ import argparse import functools import json -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import strutils import six |