From fd4e08d07ff67eeb980af4a2f06637a80dfc7575 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Tue, 20 Jan 2015 13:48:19 +0300 Subject: [PATCH] Using oslo_* instead of oslo.* Changes: * using oslo_config instead of oslo.config * using oslo_concurrency instead of oslo.concurrency * using oslo_db instead of oslo.db * using oslo_i18n instead of oslo.i18n * using oslo_messaging instead of oslo.messaging * using oslo_middleware instead of oslo.middleware * using oslo_serialization instead of oslo.serialization * using oslo_utils instead of oslo.utils Change-Id: Ib0f18603ca5b0885256a39a96a3620d05260a272 Closes-bug: #1414587 --- sahara/i18n.py | 4 ++-- sahara/plugins/mapr/util/config.py | 2 +- sahara/tests/__init__.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sahara/i18n.py b/sahara/i18n.py index 037d76c..fa7774a 100644 --- a/sahara/i18n.py +++ b/sahara/i18n.py @@ -16,10 +16,10 @@ # It's based on oslo.i18n usage in OpenStack Keystone project and # recommendations from http://docs.openstack.org/developer/oslo.i18n/usage.html -from oslo import i18n +import oslo_i18n -_translators = i18n.TranslatorFactory(domain='sahara') +_translators = oslo_i18n.TranslatorFactory(domain='sahara') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/sahara/plugins/mapr/util/config.py b/sahara/plugins/mapr/util/config.py index 04b0d42..babfc7d 100644 --- a/sahara/plugins/mapr/util/config.py +++ b/sahara/plugins/mapr/util/config.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging from sahara import exceptions as ex diff --git a/sahara/tests/__init__.py b/sahara/tests/__init__.py index d2316ab..fb9483b 100644 --- a/sahara/tests/__init__.py +++ b/sahara/tests/__init__.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo import i18n +import oslo_i18n # NOTE(slukjanov): i18n.enable_lazy() must be called before # sahara.utils.i18n._() is called to ensure it has the desired # lazy lookup behavior. -i18n.enable_lazy() +oslo_i18n.enable_lazy()