From ebcbd6ba7199edd7f659da4dc525c9702919d296 Mon Sep 17 00:00:00 2001
From: Steve Martinelli <s.martinelli@gmail.com>
Date: Fri, 13 May 2016 13:14:02 -0700
Subject: [PATCH] remove #noqa from i18n imports

hacking checks no longer fail on `import _`

Change-Id: Idd60f0a0e71e5081691eacb39e5091ab08fcce6d
---
 openstackclient/common/availability_zone.py | 2 +-
 openstackclient/compute/v2/server.py        | 2 +-
 openstackclient/compute/v2/service.py       | 2 +-
 openstackclient/identity/v2_0/catalog.py    | 2 +-
 openstackclient/identity/v2_0/ec2creds.py   | 2 +-
 openstackclient/identity/v2_0/endpoint.py   | 2 +-
 openstackclient/identity/v2_0/project.py    | 2 +-
 openstackclient/identity/v2_0/role.py       | 2 +-
 openstackclient/identity/v2_0/service.py    | 2 +-
 openstackclient/identity/v2_0/token.py      | 2 +-
 openstackclient/identity/v2_0/user.py       | 2 +-
 openstackclient/identity/v3/catalog.py      | 2 +-
 openstackclient/identity/v3/domain.py       | 2 +-
 openstackclient/identity/v3/ec2creds.py     | 2 +-
 openstackclient/identity/v3/group.py        | 2 +-
 openstackclient/identity/v3/project.py      | 2 +-
 openstackclient/identity/v3/region.py       | 2 +-
 openstackclient/identity/v3/role.py         | 2 +-
 openstackclient/identity/v3/user.py         | 2 +-
 openstackclient/image/v1/image.py           | 2 +-
 openstackclient/image/v2/image.py           | 2 +-
 openstackclient/network/v2/port.py          | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/openstackclient/common/availability_zone.py b/openstackclient/common/availability_zone.py
index a6d11b7849..3b0270ad7f 100644
--- a/openstackclient/common/availability_zone.py
+++ b/openstackclient/common/availability_zone.py
@@ -20,7 +20,7 @@ import six
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 def _xform_common_availability_zone(az, zone_info):
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 40c3c2a279..8f0748e736 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -32,7 +32,7 @@ except ImportError:
 from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
 
diff --git a/openstackclient/compute/v2/service.py b/openstackclient/compute/v2/service.py
index 2b51af3d64..b1ebde4eb2 100644
--- a/openstackclient/compute/v2/service.py
+++ b/openstackclient/compute/v2/service.py
@@ -17,7 +17,7 @@
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 class DeleteService(command.Command):
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index c927943f85..669b04f31a 100644
--- a/openstackclient/identity/v2_0/catalog.py
+++ b/openstackclient/identity/v2_0/catalog.py
@@ -17,7 +17,7 @@ import six
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 def _format_endpoints(eps=None):
diff --git a/openstackclient/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py
index a16b3d9eff..dfd675913d 100644
--- a/openstackclient/identity/v2_0/ec2creds.py
+++ b/openstackclient/identity/v2_0/ec2creds.py
@@ -20,7 +20,7 @@ import six
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 class CreateEC2Creds(command.ShowOne):
diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index e92f54127a..e515fc9b3b 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -19,7 +19,7 @@ import six
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 from openstackclient.identity import common
 
 
diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py
index 71c77623ea..d90162c924 100644
--- a/openstackclient/identity/v2_0/project.py
+++ b/openstackclient/identity/v2_0/project.py
@@ -22,7 +22,7 @@ from keystoneauth1 import exceptions as ks_exc
 from openstackclient.common import command
 from openstackclient.common import parseractions
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 class CreateProject(command.ShowOne):
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 01c340896b..1fcee15f3a 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -22,7 +22,7 @@ from keystoneauth1 import exceptions as ks_exc
 from openstackclient.common import command
 from openstackclient.common import exceptions
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 class AddRole(command.ShowOne):
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 0b1e8dbdae..7fe66d91ee 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -21,7 +21,7 @@ import six
 from openstackclient.common import command
 from openstackclient.common import exceptions
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 from openstackclient.identity import common
 
 
diff --git a/openstackclient/identity/v2_0/token.py b/openstackclient/identity/v2_0/token.py
index 1ccf2f261d..f435d7ce98 100644
--- a/openstackclient/identity/v2_0/token.py
+++ b/openstackclient/identity/v2_0/token.py
@@ -18,7 +18,7 @@
 import six
 
 from openstackclient.common import command
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 class IssueToken(command.ShowOne):
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index fc868bab70..bc9bf83789 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -21,7 +21,7 @@ from keystoneauth1 import exceptions as ks_exc
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 class CreateUser(command.ShowOne):
diff --git a/openstackclient/identity/v3/catalog.py b/openstackclient/identity/v3/catalog.py
index 795f5d5c6d..38a57d900e 100644
--- a/openstackclient/identity/v3/catalog.py
+++ b/openstackclient/identity/v3/catalog.py
@@ -17,7 +17,7 @@ import six
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 def _format_endpoints(eps=None):
diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py
index bf248fab9a..7fcab4f1c1 100644
--- a/openstackclient/identity/v3/domain.py
+++ b/openstackclient/identity/v3/domain.py
@@ -22,7 +22,7 @@ from keystoneauth1 import exceptions as ks_exc
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 class CreateDomain(command.ShowOne):
diff --git a/openstackclient/identity/v3/ec2creds.py b/openstackclient/identity/v3/ec2creds.py
index 777c0430e7..a12b2d3b4e 100644
--- a/openstackclient/identity/v3/ec2creds.py
+++ b/openstackclient/identity/v3/ec2creds.py
@@ -16,7 +16,7 @@ import six
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 from openstackclient.identity import common
 
 
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index a4cdd583e8..3c2435316d 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -22,7 +22,7 @@ from keystoneauth1 import exceptions as ks_exc
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 from openstackclient.identity import common
 
 
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index a379c6fa34..4990b1b9a3 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -22,7 +22,7 @@ from keystoneauth1 import exceptions as ks_exc
 from openstackclient.common import command
 from openstackclient.common import parseractions
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 from openstackclient.identity import common
 
 
diff --git a/openstackclient/identity/v3/region.py b/openstackclient/identity/v3/region.py
index ec5042286b..053e4b31d2 100644
--- a/openstackclient/identity/v3/region.py
+++ b/openstackclient/identity/v3/region.py
@@ -17,7 +17,7 @@ import six
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 class CreateRegion(command.ShowOne):
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index 1195ab21a5..f93c9d804f 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -22,7 +22,7 @@ from keystoneauth1 import exceptions as ks_exc
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 from openstackclient.identity import common
 
 
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index 93b3309077..9a7ced9279 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -23,7 +23,7 @@ from keystoneauth1 import exceptions as ks_exc
 
 from openstackclient.common import command
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 from openstackclient.identity import common
 
 
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index 0d0855974c..14e894b034 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -31,7 +31,7 @@ from openstackclient.api import utils as api_utils
 from openstackclient.common import command
 from openstackclient.common import parseractions
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 DEFAULT_CONTAINER_FORMAT = 'bare'
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 40ddd4b9ce..818f375a0f 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -25,7 +25,7 @@ from openstackclient.common import command
 from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 from openstackclient.identity import common
 
 
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index 9b6161fdd9..3cc76a6e4e 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -20,7 +20,7 @@ from openstackclient.common import command
 from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common