diff options
| -rw-r--r-- | quantumclient/common/serializer.py | 1 | ||||
| -rw-r--r-- | quantumclient/quantum/v2_0/__init__.py | 1 | ||||
| -rw-r--r-- | quantumclient/quantum/v2_0/agentscheduler.py | 1 | ||||
| -rw-r--r-- | quantumclient/quantum/v2_0/floatingip.py | 1 | ||||
| -rw-r--r-- | quantumclient/quantum/v2_0/lb/healthmonitor.py | 1 | ||||
| -rw-r--r-- | quantumclient/quantum/v2_0/nvpnetworkgateway.py | 1 | ||||
| -rw-r--r-- | quantumclient/quantum/v2_0/quota.py | 1 | ||||
| -rw-r--r-- | quantumclient/quantum/v2_0/router.py | 1 | ||||
| -rw-r--r-- | quantumclient/shell.py | 2 | ||||
| -rw-r--r-- | tests/unit/__init__.py | 6 | ||||
| -rw-r--r-- | tox.ini | 1 |
11 files changed, 8 insertions, 9 deletions
diff --git a/quantumclient/common/serializer.py b/quantumclient/common/serializer.py index fa3a891..9c595e4 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 11bdc2e..1be1d29 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 3e8e8e2..8e41376 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 7bce710..1d82444 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 diff --git a/quantumclient/quantum/v2_0/lb/healthmonitor.py b/quantumclient/quantum/v2_0/lb/healthmonitor.py index 3ecdd56..f0a828b 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 72a83b3..1823b6f 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 1213002..1c15192 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 diff --git a/quantumclient/quantum/v2_0/router.py b/quantumclient/quantum/v2_0/router.py index e0387fb..c5b1570 100644 --- a/quantumclient/quantum/v2_0/router.py +++ b/quantumclient/quantum/v2_0/router.py @@ -20,6 +20,7 @@ import logging from quantumclient.common import exceptions from quantumclient.common import utils +from quantumclient.openstack.common.gettextutils import _ from quantumclient.quantum import v2_0 as quantumv20 diff --git a/quantumclient/shell.py b/quantumclient/shell.py index bf992f3..29c56f0 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 @@ -642,7 +641,6 @@ class QuantumShell(app.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 353303f..1668497 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) @@ -28,5 +28,4 @@ downloadcache = ~/cache/pip # H302 import only modules ignore = E125,H302 show-source = true -builtins = _ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools |