diff --git a/oslo_messaging/openstack/__init__.py b/oslo_messaging/openstack/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/oslo_messaging/openstack/common/__init__.py b/oslo_messaging/openstack/common/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/oslo_messaging/openstack/common/_i18n.py b/oslo_messaging/openstack/common/_i18n.py deleted file mode 100644 index d9fcf9d50..000000000 --- a/oslo_messaging/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='oslo_messaging') - - # 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/tox.ini b/tox.ini index 7c30bd226..b0d346351 100644 --- a/tox.ini +++ b/tox.ini @@ -46,7 +46,6 @@ exclude = .tox,dist,doc,*.egg,build,__init__.py,tests [hacking] import_exceptions = - oslo_messaging.openstack.common._i18n oslo_messaging._i18n six.moves local-check-factory = oslo_messaging.hacking.checks.factory