From 0059f045a9958b1748fcec51799d8cffc0831440 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 13 Jun 2014 16:56:32 -0500
Subject: [PATCH] Ignore most of the new hacking 0.9.2 rules

So we can update requriements.txt.  But fix a couple of easy ones:
* Fix E251 (1 occurrance)
* Fix E131 (1 occurrance)

Change-Id: I62aaa423aa6da9e9f0ca026ec586b51cc6a6df03
---
 openstackclient/compute/v2/usage.py        | 2 +-
 openstackclient/tests/common/test_utils.py | 5 +++--
 tox.ini                                    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/openstackclient/compute/v2/usage.py b/openstackclient/compute/v2/usage.py
index f7e11bcaca..ed98af2672 100644
--- a/openstackclient/compute/v2/usage.py
+++ b/openstackclient/compute/v2/usage.py
@@ -36,7 +36,7 @@ class ListUsage(lister.Lister):
             metavar="<start>",
             default=None,
             help="Usage range start date, ex 2012-01-20"
-                " (default: 4 weeks ago)."
+                 " (default: 4 weeks ago)."
         )
         parser.add_argument(
             "--end",
diff --git a/openstackclient/tests/common/test_utils.py b/openstackclient/tests/common/test_utils.py
index 3650746bc0..fbc1a926eb 100644
--- a/openstackclient/tests/common/test_utils.py
+++ b/openstackclient/tests/common/test_utils.py
@@ -107,8 +107,9 @@ class TestFindResource(test_utils.TestCase):
 
     def test_find_resource_find_not_found(self):
         self.manager.get = mock.Mock(side_effect=Exception('Boom!'))
-        self.manager.find = mock.Mock(side_effect=
-                                      exceptions.NotFound(404, "2"))
+        self.manager.find = mock.Mock(
+            side_effect=exceptions.NotFound(404, "2")
+        )
         result = self.assertRaises(exceptions.CommandError,
                                    utils.find_resource,
                                    self.manager,
diff --git a/tox.ini b/tox.ini
index 751cbd6820..cb95893591 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,6 +24,6 @@ commands = python setup.py test --coverage --testr-args='{posargs}'
 downloadcache = ~/cache/pip
 
 [flake8]
-ignore = E126,E202,W602,H302,H402
+ignore = E126,E202,W602,H302,H402,E265,H305,H307,H405,H904
 show-source = True
 exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools