diff options
| author | Sergey Vilgelm <sergey@vilgelm.info> | 2015-08-01 11:50:58 +0300 |
|---|---|---|
| committer | Sergey Vilgelm <sergey@vilgelm.info> | 2015-08-03 18:39:13 +0300 |
| commit | d5b7eb08719a6af01f2b9e9546607ebbe9a74663 (patch) | |
| tree | 7fdf562f97b38a271f5f02da4683c3374809df39 /ironic_python_agent | |
| parent | ae8538b6e53cd754ba0a169785fde649edfc57ec (diff) | |
| download | ironic-python-agent-d5b7eb08719a6af01f2b9e9546607ebbe9a74663.tar.gz | |
Remove openstack.common package
ironic_python_agent contains unused oslo-incubator modules,
so let's remove them.
Change-Id: I2b8f84bf8a68d155fe123487f9b5624bb94e806b
Diffstat (limited to 'ironic_python_agent')
| -rw-r--r-- | ironic_python_agent/openstack/__init__.py | 0 | ||||
| -rw-r--r-- | ironic_python_agent/openstack/common/__init__.py | 0 | ||||
| -rw-r--r-- | ironic_python_agent/openstack/common/_i18n.py | 45 | ||||
| -rw-r--r-- | ironic_python_agent/utils.py | 8 |
4 files changed, 3 insertions, 50 deletions
diff --git a/ironic_python_agent/openstack/__init__.py b/ironic_python_agent/openstack/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/ironic_python_agent/openstack/__init__.py +++ /dev/null diff --git a/ironic_python_agent/openstack/common/__init__.py b/ironic_python_agent/openstack/common/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/ironic_python_agent/openstack/common/__init__.py +++ /dev/null diff --git a/ironic_python_agent/openstack/common/_i18n.py b/ironic_python_agent/openstack/common/_i18n.py deleted file mode 100644 index 6f05d92f..00000000 --- a/ironic_python_agent/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='ironic_python_agent') - - # 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/ironic_python_agent/utils.py b/ironic_python_agent/utils.py index 04854e15..e85f25c0 100644 --- a/ironic_python_agent/utils.py +++ b/ironic_python_agent/utils.py @@ -24,7 +24,6 @@ from oslo_log import log as logging from six.moves.urllib import parse from ironic_python_agent import errors -from ironic_python_agent.openstack.common import _i18n as gtu LOG = logging.getLogger(__name__) @@ -59,10 +58,9 @@ def get_ordereddict(*args, **kwargs): def execute(*cmd, **kwargs): """Convenience wrapper around oslo's execute() method.""" result = processutils.execute(*cmd, **kwargs) - LOG.debug(gtu._('Execution completed, command line is "%s"'), - ' '.join(cmd)) - LOG.debug(gtu._('Command stdout is: "%s"') % result[0]) - LOG.debug(gtu._('Command stderr is: "%s"') % result[1]) + LOG.debug('Execution completed, command line is "%s"', ' '.join(cmd)) + LOG.debug('Command stdout is: "%s"', result[0]) + LOG.debug('Command stderr is: "%s"', result[1]) return result |
