From ff20b3faf418d65051f92d7792842243c3e35615 Mon Sep 17 00:00:00 2001
From: Dong Jun <dongj@dtdream.com>
Date: Fri, 13 Oct 2017 18:17:01 +0800
Subject: [PATCH] import _ from octavia.i18n

builtin _ is deprecated and pylint will throw an error for it.

Change-Id: Ia5599dd2c65455eae13fadfac277f590dcaa2df5
---
 octavia/amphorae/backends/utils/haproxy_query.py         | 1 +
 octavia/amphorae/driver_exceptions/exceptions.py         | 2 ++
 octavia/certificates/generator/anchor.py                 | 1 +
 octavia/common/config.py                                 | 1 +
 octavia/common/exceptions.py                             | 2 ++
 octavia/common/validate.py                               | 2 +-
 octavia/db/migration/cli.py                              | 2 ++
 octavia/db/models.py                                     | 1 +
 octavia/network/drivers/neutron/allowed_address_pairs.py | 1 +
 octavia/network/drivers/neutron/base.py                  | 1 +
 10 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/octavia/amphorae/backends/utils/haproxy_query.py b/octavia/amphorae/backends/utils/haproxy_query.py
index 44605eb9ad..442c72d6d2 100644
--- a/octavia/amphorae/backends/utils/haproxy_query.py
+++ b/octavia/amphorae/backends/utils/haproxy_query.py
@@ -18,6 +18,7 @@ import socket
 import six
 
 from octavia.common import constants as consts
+from octavia.i18n import _
 
 
 class HAProxyQuery(object):
diff --git a/octavia/amphorae/driver_exceptions/exceptions.py b/octavia/amphorae/driver_exceptions/exceptions.py
index 2c54234f27..76008446bf 100644
--- a/octavia/amphorae/driver_exceptions/exceptions.py
+++ b/octavia/amphorae/driver_exceptions/exceptions.py
@@ -16,6 +16,8 @@ import six
 
 from oslo_utils import excutils
 
+from octavia.i18n import _
+
 
 class AmphoraDriverError(Exception):
 
diff --git a/octavia/certificates/generator/anchor.py b/octavia/certificates/generator/anchor.py
index e9a5afd136..54f1eb148a 100644
--- a/octavia/certificates/generator/anchor.py
+++ b/octavia/certificates/generator/anchor.py
@@ -19,6 +19,7 @@ import requests
 
 from octavia.certificates.generator import local
 from octavia.common import exceptions
+from octavia.i18n import _
 
 LOG = logging.getLogger(__name__)
 
diff --git a/octavia/common/config.py b/octavia/common/config.py
index 5d3567ae03..267daf99ca 100644
--- a/octavia/common/config.py
+++ b/octavia/common/config.py
@@ -27,6 +27,7 @@ import oslo_messaging as messaging
 
 from octavia.common import constants
 from octavia.common import utils
+from octavia.i18n import _
 from octavia import version
 
 LOG = logging.getLogger(__name__)
diff --git a/octavia/common/exceptions.py b/octavia/common/exceptions.py
index fccd7b4adf..20f0976f26 100644
--- a/octavia/common/exceptions.py
+++ b/octavia/common/exceptions.py
@@ -22,6 +22,8 @@ import six
 from oslo_utils import excutils
 from webob import exc
 
+from octavia.i18n import _
+
 
 class OctaviaException(Exception):
     """Base Octavia Exception.
diff --git a/octavia/common/validate.py b/octavia/common/validate.py
index 77e57fa21a..ba83b316d2 100644
--- a/octavia/common/validate.py
+++ b/octavia/common/validate.py
@@ -28,7 +28,7 @@ import rfc3986
 from octavia.common import constants
 from octavia.common import exceptions
 from octavia.common import utils
-
+from octavia.i18n import _
 
 CONF = cfg.CONF
 
diff --git a/octavia/db/migration/cli.py b/octavia/db/migration/cli.py
index 608e23b64d..b6e8b6daa1 100644
--- a/octavia/db/migration/cli.py
+++ b/octavia/db/migration/cli.py
@@ -21,6 +21,8 @@ from alembic import util as alembic_u
 from oslo_config import cfg
 from oslo_db import options
 
+from octavia.i18n import _
+
 CONF = cfg.CONF
 options.set_defaults(CONF)
 
diff --git a/octavia/db/models.py b/octavia/db/models.py
index 5bcb100326..b86072e25a 100644
--- a/octavia/db/models.py
+++ b/octavia/db/models.py
@@ -31,6 +31,7 @@ from octavia.api.v2.types import pool
 from octavia.api.v2.types import quotas
 from octavia.common import data_models
 from octavia.db import base_models
+from octavia.i18n import _
 
 
 class ProvisioningStatus(base_models.BASE, base_models.LookupTableMixin):
diff --git a/octavia/network/drivers/neutron/allowed_address_pairs.py b/octavia/network/drivers/neutron/allowed_address_pairs.py
index c4e3d237aa..db71001ed0 100644
--- a/octavia/network/drivers/neutron/allowed_address_pairs.py
+++ b/octavia/network/drivers/neutron/allowed_address_pairs.py
@@ -24,6 +24,7 @@ import six
 from octavia.common import clients
 from octavia.common import constants
 from octavia.common import data_models
+from octavia.i18n import _
 from octavia.network import base
 from octavia.network import data_models as n_data_models
 from octavia.network.drivers.neutron import base as neutron_base
diff --git a/octavia/network/drivers/neutron/base.py b/octavia/network/drivers/neutron/base.py
index c50bdb13a8..7902092573 100644
--- a/octavia/network/drivers/neutron/base.py
+++ b/octavia/network/drivers/neutron/base.py
@@ -18,6 +18,7 @@ from oslo_log import log as logging
 
 from octavia.common import clients
 from octavia.common import data_models
+from octavia.i18n import _
 from octavia.network import base
 from octavia.network import data_models as network_models
 from octavia.network.drivers.neutron import utils