summaryrefslogtreecommitdiff
path: root/troveclient
diff options
context:
space:
mode:
authorDoug Hellmann <doug@doughellmann.com>2015-05-06 19:45:44 +0000
committerDoug Hellmann <doug@doughellmann.com>2015-05-06 19:45:44 +0000
commit8612fd048d18229d2c2d2492f6815c9e5837b8a5 (patch)
tree2e33c35fc13ea45994dad72e5ebf7af0665fe9ae /troveclient
parentf996f5e8ba33a126c37d7d461380fb0e49d188f4 (diff)
downloadpython-troveclient-8612fd048d18229d2c2d2492f6815c9e5837b8a5.tar.gz
Drop use of 'oslo' namespace package
The Oslo libraries have moved all of their code out of the 'oslo' namespace package into per-library packages. The namespace package was retained during kilo for backwards compatibility, but will be removed by the liberty-2 milestone. This change removes the use of the namespace package, replacing it with the new package names. The patches in the libraries will be put on hold until application patches have landed, or L2, whichever comes first. At that point, new versions of the libraries without namespace packages will be released as a major version update. Please merge this patch, or an equivalent, before L2 to avoid problems with those library releases. Blueprint: remove-namespace-packages https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages Change-Id: I2a8caa859830b3416bfe54e4261dd3415ac5a76a
Diffstat (limited to 'troveclient')
-rw-r--r--troveclient/client.py2
-rw-r--r--troveclient/compat/utils.py2
-rw-r--r--troveclient/i18n.py4
-rw-r--r--troveclient/shell.py4
-rw-r--r--troveclient/utils.py4
5 files changed, 8 insertions, 8 deletions
diff --git a/troveclient/client.py b/troveclient/client.py
index e5164bd..1897173 100644
--- a/troveclient/client.py
+++ b/troveclient/client.py
@@ -25,7 +25,7 @@ import logging
import requests
from keystoneclient import adapter
-from oslo.utils import importutils
+from oslo_utils import importutils
from troveclient.openstack.common.apiclient import client
from troveclient.openstack.common.apiclient import exceptions
from troveclient import service_catalog
diff --git a/troveclient/compat/utils.py b/troveclient/compat/utils.py
index f4d4d2c..f81a1b5 100644
--- a/troveclient/compat/utils.py
+++ b/troveclient/compat/utils.py
@@ -14,7 +14,7 @@
import os
-from oslo.utils import strutils
+from oslo_utils import strutils
class HookableMixin(object):
diff --git a/troveclient/i18n.py b/troveclient/i18n.py
index f50ac2d..30c96a1 100644
--- a/troveclient/i18n.py
+++ b/troveclient/i18n.py
@@ -17,7 +17,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
"""
-import oslo.i18n
+import oslo_i18n
# NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
@@ -25,7 +25,7 @@ import oslo.i18n
# 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='python-troveclient')
+_translators = oslo_i18n.TranslatorFactory(domain='python-troveclient')
# The primary translation function using the well-known name "_"
_ = _translators.primary
diff --git a/troveclient/shell.py b/troveclient/shell.py
index 3c7dfd8..abf8430 100644
--- a/troveclient/shell.py
+++ b/troveclient/shell.py
@@ -38,8 +38,8 @@ from keystoneclient.auth.identity.generic import token
from keystoneclient.auth.identity import v3 as identity
from keystoneclient import session as ks_session
-from oslo.utils import encodeutils
-from oslo.utils import importutils
+from oslo_utils import encodeutils
+from oslo_utils import importutils
import troveclient
import troveclient.auth_plugin
diff --git a/troveclient/utils.py b/troveclient/utils.py
index 1ddbc4d..8f1e1f6 100644
--- a/troveclient/utils.py
+++ b/troveclient/utils.py
@@ -24,8 +24,8 @@ import uuid
import prettytable
import six
-from oslo.utils import encodeutils
-from oslo.utils import strutils
+from oslo_utils import encodeutils
+from oslo_utils import strutils
from troveclient.openstack.common.apiclient import exceptions