From 9e60e4a592011228bbf4ddacf96afbee2ab63ea6 Mon Sep 17 00:00:00 2001
From: "Chaozhe.Chen" <chaozhe.chen@easystack.cn>
Date: Tue, 9 Feb 2016 17:00:30 +0800
Subject: [PATCH] Fix some flake8 violations

1. Wrong use of 'noqa'. "# flake8: noqa" option disables all checks
for the whole file.
2. Remove exclusion of 'tools' and '*openstack/common*' in flake8 and
fix the violations.

Change-Id: I153e992ffd6a80e70a99d7066c503c34326c93ab
Closes-bug: #1540254
---
 cinderclient/openstack/common/apiclient/base.py        | 2 +-
 cinderclient/openstack/common/apiclient/fake_client.py | 2 +-
 tools/colorizer.py                                     | 4 ++--
 tools/install_venv.py                                  | 4 ++--
 tox.ini                                                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cinderclient/openstack/common/apiclient/base.py b/cinderclient/openstack/common/apiclient/base.py
index 82670aa..f7064a6 100644
--- a/cinderclient/openstack/common/apiclient/base.py
+++ b/cinderclient/openstack/common/apiclient/base.py
@@ -456,7 +456,7 @@ class Resource(object):
 
     def __getattr__(self, k):
         if k not in self.__dict__:
-            #NOTE(bcwaldon): disallow lazy-loading if already loaded once
+            # NOTE(bcwaldon): disallow lazy-loading if already loaded once
             if not self.is_loaded():
                 self.get()
                 return self.__getattr__(k)
diff --git a/cinderclient/openstack/common/apiclient/fake_client.py b/cinderclient/openstack/common/apiclient/fake_client.py
index 8027186..ed04c18 100644
--- a/cinderclient/openstack/common/apiclient/fake_client.py
+++ b/cinderclient/openstack/common/apiclient/fake_client.py
@@ -81,7 +81,7 @@ class FakeHTTPClient(client.HTTPClient):
     def __init__(self, *args, **kwargs):
         self.callstack = []
         self.fixtures = kwargs.pop("fixtures", None) or {}
-        if not args and not "auth_plugin" in kwargs:
+        if not args and "auth_plugin" not in kwargs:
             args = (None, )
         super(FakeHTTPClient, self).__init__(*args, **kwargs)
 
diff --git a/tools/colorizer.py b/tools/colorizer.py
index ebdd236..7824b8c 100755
--- a/tools/colorizer.py
+++ b/tools/colorizer.py
@@ -110,7 +110,7 @@ class _Win32Colorizer(object):
                                   win32console.FOREGROUND_INTENSITY)
         self.stream = stream
         self.screenBuffer = win32console.GetStdHandle(
-                win32console.STD_OUT_HANDLE)
+            win32console.STD_OUT_HANDLE)
         self._colors = {
             'normal': red | green | blue,
             'red': red | bold,
@@ -266,7 +266,7 @@ class NovaTestResult(testtools.TestResult):
         if not self.last_written or (self._now() - time).total_seconds() > 2.0:
             diff = 3.0
             while diff > 2.0:
-                classes =list(self.results)
+                classes = list(self.results)
                 oldest = min(classes, key=lambda x: self.last_time[x])
                 diff = (self._now() - self.last_time[oldest]).total_seconds()
                 self.writeTestCase(oldest)
diff --git a/tools/install_venv.py b/tools/install_venv.py
index cc21843..1dab63e 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -22,7 +22,7 @@ import ConfigParser
 import os
 import sys
 
-import install_venv_common as install_venv  # flake8: noqa
+import install_venv_common as install_venv
 
 
 def print_help(project, venv, root):
@@ -42,7 +42,7 @@ def print_help(project, venv, root):
 
     $ %(root)s/tools/with_venv.sh <your command>
     """
-    print help % dict(project=project, venv=venv, root=root)
+    print (help % dict(project=project, venv=venv, root=root))
 
 
 def main(argv):
diff --git a/tox.ini b/tox.ini
index 8b2a1ee..3794b98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,4 +44,4 @@ passenv = OS_*
 [flake8]
 show-source = True
 ignore = F811,F821,H306,H404,H405,E122,E123,E128,E251
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools
+exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build