Run flake8 also on cinder/*/openstack

exclude=openstack also matches cinder/api/openstack,
which is however not merged from oslo-incubator.
Exclude=common instead, and explicitely include
cinder/common

Change-Id: I331d8c0d17e519386ae72caeca8a336eecde3ad3

diff --git a/cinder/api/openstack/wsgi.py b/cinder/api/openstack/wsgi.py
index 34118ac66e06c17b6d56ecd2ab563ffd2975dacb..a2101c1961b707013f6d1f26fe144aaf703e68fe 100644 (file)
--- a/cinder/api/openstack/wsgi.py
+++ b/cinder/api/openstack/wsgi.py
@@ -183,12 +183,11 @@ class XMLDeserializer(TextDeserializer):
         """Search a nodes children for the first child with a given name."""
         for node in parent.childNodes:
             if (node.localName == name and
-                node.namespaceURI and
-                node.namespaceURI == namespace):
+                    node.namespaceURI and
+                    node.namespaceURI == namespace):
                 return node
         return None
 
-
     def find_first_child_named(self, parent, name):
         """Search a nodes children for the first child with a given name"""
         for node in parent.childNodes:

diff --git a/tox.ini b/tox.ini
index c55515da9cf9ded0d48b64da62d47c6307a8d6d4..cac92ed0cb516885c376263e70ed8dd8671ace97 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ downloadcache = ~/cache/pip
 [testenv:pep8]
 sitepackages = False
 commands =
-  flake8 {posargs}
+  flake8 {posargs} . cinder/common
   flake8 --filename=cinder* bin
 
 [testenv:pylint]
@@ -45,4 +45,4 @@ commands = {posargs}
 [flake8]
 ignore = E711,E712,F401,F403,F811,F841,H302,H303,H304,H402,H404
 builtins = _
-exclude = .venv,.tox,dist,doc,openstack,*egg,build
+exclude = .git,.venv,.tox,dist,doc,common,*egg,build