Merge "Defaults are ignored with flake8"

Jenkins · openstack-gerrit · commit 277c16c8b74e · 2016-02-26T01:59:47.000Z
diff --git a/functional/tests/compute/v2/test_server.py b/functional/tests/compute/v2/test_server.py
@@ -32,14 +32,14 @@ class ServerTests(test.TestCase):
     def get_flavor(cls):
         raw_output = cls.openstack('flavor list -f value -c ID')
         ray = raw_output.split('\n')
-        idx = int(len(ray)/2)
+        idx = int(len(ray) / 2)
         return ray[idx]
 
     @classmethod
     def get_image(cls):
         raw_output = cls.openstack('image list -f value -c ID')
         ray = raw_output.split('\n')
-        idx = int(len(ray)/2)
+        idx = int(len(ray) / 2)
         return ray[idx]
 
     @classmethod
@@ -49,7 +49,7 @@ def get_network(cls):
         except exceptions.CommandFailed:
             return ''
         ray = raw_output.split('\n')
-        idx = int(len(ray)/2)
+        idx = int(len(ray) / 2)
         return ' --nic net-id=' + ray[idx]
 
     @classmethod
diff --git a/functional/tests/identity/v3/test_group.py b/functional/tests/identity/v3/test_group.py
@@ -131,7 +131,7 @@ def test_group_contains_user(self):
             '%(group)s %(user)s' % {'group_domain': self.domain_name,
                                     'user_domain': self.domain_name,
                                     'group': group_name,
-                                    'user':  username})
+                                    'user': username})
         self.assertOutput(
             '%(user)s in group %(group)s\n' % {'user': username,
                                                'group': group_name},
diff --git a/openstackclient/common/timing.py b/openstackclient/common/timing.py
@@ -30,7 +30,8 @@ def take_action(self, parsed_args):
         for url, td in self.app.timing_data:
             # NOTE(dtroyer): Take the long way here because total_seconds()
             #                was added in py27.
-            sec = (td.microseconds + (td.seconds + td.days*86400) * 1e6) / 1e6
+            sec = (td.microseconds + (td.seconds + td.days *
+                                      86400) * 1e6) / 1e6
             total += sec
             results.append((url, sec))
         results.append(('Total', total))
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
@@ -1206,7 +1206,7 @@ def take_action(self, parsed_args):
         _, body = utils.find_resource(
             compute_client.servers,
             parsed_args.server,
-            ).rescue()
+        ).rescue()
         return zip(*sorted(six.iteritems(body)))
 
 
diff --git a/tox.ini b/tox.ini
@@ -38,3 +38,6 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 [flake8]
 show-source = True
 exclude = .git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools
+# If 'ignore' is not set there are default errors and warnings that are set
+# Doc: http://flake8.readthedocs.org/en/latest/config.html#default
+ignore = __
