From 16ae93ea2168b19edf7c50997a6b9e6ab9008096 Mon Sep 17 00:00:00 2001 From: Sergey Vilgelm Date: Thu, 9 Jul 2015 17:08:09 +0300 Subject: [PATCH] Remove openstack.common package Clean up the unused modules from the openstack.common package Closes-Bug: #1476407 Change-Id: I5697f761c310dd8e13b7219b2968c3e6f4cfb299 --- sahara/openstack/common/__init__.py | 0 sahara/openstack/common/_i18n.py | 45 ----------------------------- setup.cfg | 2 -- 3 files changed, 47 deletions(-) delete mode 100644 sahara/openstack/common/__init__.py delete mode 100644 sahara/openstack/common/_i18n.py diff --git a/sahara/openstack/common/__init__.py b/sahara/openstack/common/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/sahara/openstack/common/_i18n.py b/sahara/openstack/common/_i18n.py deleted file mode 100644 index eaea2239..00000000 --- a/sahara/openstack/common/_i18n.py +++ /dev/null @@ -1,45 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -"""oslo.i18n integration module. - -See http://docs.openstack.org/developer/oslo.i18n/usage.html - -""" - -try: - 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='sahara') - - # The primary translation function using the well-known name "_" - _ = _translators.primary - - # Translators for log levels. - # - # The abbreviated names are meant to reflect the usual use of a short - # name like '_'. The "L" is for "log" and the other letter comes from - # the level. - _LI = _translators.log_info - _LW = _translators.log_warning - _LE = _translators.log_error - _LC = _translators.log_critical -except ImportError: - # NOTE(dims): Support for cases where a project wants to use - # code from oslo-incubator, but is not ready to be internationalized - # (like tempest) - _ = _LI = _LW = _LE = _LC = lambda x: x diff --git a/setup.cfg b/setup.cfg index fe69be6b..33ca7134 100644 --- a/setup.cfg +++ b/setup.cfg @@ -59,8 +59,6 @@ sahara.run.mode = oslo.config.opts = sahara.config = sahara.config:list_opts - periodic.config = sahara.openstack.common.periodic_task:list_opts - ssl.config = sahara.openstack.common.sslutils:list_opts [build_sphinx] all_files = 1