From 2a5fd7e54775897719ef78fd5ec8756bc5172733 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 14 Jun 2013 10:44:23 -0700 Subject: [PATCH] Remove the monkey patching of _ into the builtins. Previous _ was monkey patched into builtins whenever certain modules were imported. This removes that and simply imports it when it is needed. Change-Id: I8b7cdc7a8da21ed3e8bc69b18414dfc89e8935b8 --- quantumclient/common/serializer.py | 1 + quantumclient/quantum/v2_0/__init__.py | 1 + quantumclient/quantum/v2_0/agentscheduler.py | 1 + quantumclient/quantum/v2_0/floatingip.py | 1 + quantumclient/quantum/v2_0/lb/healthmonitor.py | 1 + quantumclient/quantum/v2_0/nvpnetworkgateway.py | 1 + quantumclient/quantum/v2_0/quota.py | 1 + quantumclient/quantum/v2_0/router.py | 1 + quantumclient/shell.py | 2 -- tests/unit/__init__.py | 6 ------ tox.ini | 1 - 11 files changed, 8 insertions(+), 9 deletions(-) diff --git a/quantumclient/common/serializer.py b/quantumclient/common/serializer.py index a9d8db0a5..d7e5c95a9 100644 --- a/quantumclient/common/serializer.py +++ b/quantumclient/common/serializer.py @@ -26,6 +26,7 @@ from xml.parsers import expat from quantumclient.common import constants from quantumclient.common import exceptions as exception +from quantumclient.openstack.common.gettextutils import _ from quantumclient.openstack.common import jsonutils LOG = logging.getLogger(__name__) diff --git a/quantumclient/quantum/v2_0/__init__.py b/quantumclient/quantum/v2_0/__init__.py index 11bdc2e11..1be1d294f 100644 --- a/quantumclient/quantum/v2_0/__init__.py +++ b/quantumclient/quantum/v2_0/__init__.py @@ -26,6 +26,7 @@ from cliff import show from quantumclient.common import command from quantumclient.common import exceptions from quantumclient.common import utils +from quantumclient.openstack.common.gettextutils import _ HEX_ELEM = '[0-9A-Fa-f]' UUID_PATTERN = '-'.join([HEX_ELEM + '{8}', HEX_ELEM + '{4}', diff --git a/quantumclient/quantum/v2_0/agentscheduler.py b/quantumclient/quantum/v2_0/agentscheduler.py index 3e8e8e2d7..8e4137637 100644 --- a/quantumclient/quantum/v2_0/agentscheduler.py +++ b/quantumclient/quantum/v2_0/agentscheduler.py @@ -17,6 +17,7 @@ import logging +from quantumclient.openstack.common.gettextutils import _ from quantumclient.quantum import v2_0 as quantumV20 from quantumclient.quantum.v2_0 import network from quantumclient.quantum.v2_0 import router diff --git a/quantumclient/quantum/v2_0/floatingip.py b/quantumclient/quantum/v2_0/floatingip.py index 3a4982ab5..98401df17 100644 --- a/quantumclient/quantum/v2_0/floatingip.py +++ b/quantumclient/quantum/v2_0/floatingip.py @@ -18,6 +18,7 @@ import argparse import logging +from quantumclient.openstack.common.gettextutils import _ from quantumclient.quantum import v2_0 as quantumv20 from quantumclient.quantum.v2_0 import CreateCommand from quantumclient.quantum.v2_0 import DeleteCommand diff --git a/quantumclient/quantum/v2_0/lb/healthmonitor.py b/quantumclient/quantum/v2_0/lb/healthmonitor.py index 3ecdd5665..f0a828b07 100644 --- a/quantumclient/quantum/v2_0/lb/healthmonitor.py +++ b/quantumclient/quantum/v2_0/lb/healthmonitor.py @@ -19,6 +19,7 @@ import logging +from quantumclient.openstack.common.gettextutils import _ from quantumclient.quantum import v2_0 as quantumv20 diff --git a/quantumclient/quantum/v2_0/nvpnetworkgateway.py b/quantumclient/quantum/v2_0/nvpnetworkgateway.py index 72a83b347..1823b6fe1 100644 --- a/quantumclient/quantum/v2_0/nvpnetworkgateway.py +++ b/quantumclient/quantum/v2_0/nvpnetworkgateway.py @@ -18,6 +18,7 @@ import logging from quantumclient.common import utils +from quantumclient.openstack.common.gettextutils import _ from quantumclient.quantum import v2_0 as quantumv20 RESOURCE = 'network_gateway' diff --git a/quantumclient/quantum/v2_0/quota.py b/quantumclient/quantum/v2_0/quota.py index 2b1752fc3..089c12d11 100644 --- a/quantumclient/quantum/v2_0/quota.py +++ b/quantumclient/quantum/v2_0/quota.py @@ -23,6 +23,7 @@ from cliff import show from quantumclient.common import exceptions from quantumclient.common import utils +from quantumclient.openstack.common.gettextutils import _ from quantumclient.quantum import v2_0 as quantumv20 from quantumclient.quantum.v2_0 import QuantumCommand diff --git a/quantumclient/quantum/v2_0/router.py b/quantumclient/quantum/v2_0/router.py index cff4ace0c..b9ccfdcc5 100644 --- a/quantumclient/quantum/v2_0/router.py +++ b/quantumclient/quantum/v2_0/router.py @@ -19,6 +19,7 @@ import argparse import logging from quantumclient.common import utils +from quantumclient.openstack.common.gettextutils import _ from quantumclient.quantum import v2_0 as quantumv20 from quantumclient.quantum.v2_0 import CreateCommand from quantumclient.quantum.v2_0 import DeleteCommand diff --git a/quantumclient/shell.py b/quantumclient/shell.py index afcabb7a0..402c8bf48 100644 --- a/quantumclient/shell.py +++ b/quantumclient/shell.py @@ -20,7 +20,6 @@ Command-line interface to the Quantum APIs """ import argparse -import gettext import logging import os import sys @@ -644,7 +643,6 @@ class QuantumShell(App): def main(argv=sys.argv[1:]): - gettext.install('quantumclient', unicode=1) try: return QuantumShell(QUANTUM_API_VERSION).run(map(strutils.safe_decode, argv)) diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index 353303fb4..1668497e7 100644 --- a/tests/unit/__init__.py +++ b/tests/unit/__init__.py @@ -14,9 +14,3 @@ # under the License. # # vim: tabstop=4 shiftwidth=4 softtabstop=4 - -import gettext - -# Because we installed '_' for quantum cli in shell.py, this help unittest -# have definition of '_' -gettext.install('quantumclient', unicode=1) diff --git a/tox.ini b/tox.ini index fb9729e4b..08dc3055f 100644 --- a/tox.ini +++ b/tox.ini @@ -30,5 +30,4 @@ downloadcache = ~/cache/pip # TODO(marun) H404 multi line docstring should start with a summary ignore = E125,H301,H302,H404 show-source = true -builtins = _ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools