Update hacking for Python33.3.1

The repo is Python 3 now, so update hacking to version 3.0 which
supports Python 3.

Fix problems found.

Change-Id: I5da442bb2f1e634e6b3fe37a6ea3820cea1db96f

8 files changed, 25 insertions, 24 deletions

diff --git a/test-requirements.txt b/test-requirements.txt
index a39ef08..fa47e50 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking>=1.1.0,<1.2.0 # Apache-2.0
+hacking>=3.0,<3.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index f31d0cc..ac73528 100644
--- a/tox.ini
+++ b/tox.ini
@@ -63,7 +63,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 
 [flake8]
 enable-extensions = H106,H203,H904
-ignore = H202,H405,H501
+ignore = H202,H405,H501,W504
 show-source = True
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,releasenotes
 
diff --git a/troveclient/_i18n.py b/troveclient/_i18n.py
index 1e4c949..afad668 100644
--- a/troveclient/_i18n.py
+++ b/troveclient/_i18n.py
@@ -37,4 +37,4 @@ _P = _translators.plural_form
 
 
 def get_available_languages():
-        return oslo_i18n.get_available_languages(DOMAIN)
+    return oslo_i18n.get_available_languages(DOMAIN)
diff --git a/troveclient/compat/tests/test_auth.py b/troveclient/compat/tests/test_auth.py
index 2b718c0..134da92 100644
--- a/troveclient/compat/tests/test_auth.py
+++ b/troveclient/compat/tests/test_auth.py
@@ -107,8 +107,8 @@ class AuthenticatorTest(testtools.TestCase):
         body = "test_body"
         authObj.client._time_request = mock.Mock(return_value=(resp, body))
 
-        l = authObj._authenticate(mock.Mock(), mock.Mock())
-        self.assertEqual('loc', l)
+        lo = authObj._authenticate(mock.Mock(), mock.Mock())
+        self.assertEqual('loc', lo)
 
         # test any response code other than 200 and 305
         resp.status = 404
diff --git a/troveclient/tests/test_base.py b/troveclient/tests/test_base.py
index bc409c2..cd8affa 100644
--- a/troveclient/tests/test_base.py
+++ b/troveclient/tests/test_base.py
@@ -212,38 +212,38 @@ class ManagerListTest(ManagerTest):
 
     def test_list_with_body_none(self):
         body = None
-        l = self.manager._list("url", self.response_key, obj_class, body)
-        self.assertEqual(len(self.data_g), len(l))
-        for i in range(0, len(l)):
-            self.assertEqual(self.data_g[i], l[i])
+        li = self.manager._list("url", self.response_key, obj_class, body)
+        self.assertEqual(len(self.data_g), len(li))
+        for i in range(0, len(li)):
+            self.assertEqual(self.data_g[i], li[i])
 
     def test_list_body_not_none(self):
         body = "something"
-        l = self.manager._list("url", self.response_key, obj_class, body)
-        self.assertEqual(len(self.data_p), len(l))
-        for i in range(0, len(l)):
-            self.assertEqual(self.data_p[i], l[i])
+        li = self.manager._list("url", self.response_key, obj_class, body)
+        self.assertEqual(len(self.data_p), len(li))
+        for i in range(0, len(li)):
+            self.assertEqual(self.data_p[i], li[i])
 
     def test_list_key_mapping(self):
         data_ = {"values": ["p1", "p2"]}
         body_ = {self.response_key: data_}
         url_ = "test_url_post"
         self.manager.api.client.post = mock.Mock(return_value=(url_, body_))
-        l = self.manager._list("url", self.response_key,
-                               obj_class, "something")
+        li = self.manager._list("url", self.response_key,
+                                obj_class, "something")
         data = data_["values"]
-        self.assertEqual(len(data), len(l))
-        for i in range(0, len(l)):
-            self.assertEqual(data[i], l[i])
+        self.assertEqual(len(data), len(li))
+        for i in range(0, len(li)):
+            self.assertEqual(data[i], li[i])
 
     def test_list_without_key_mapping(self):
         data_ = {"v1": "1", "v2": "2"}
         body_ = {self.response_key: data_}
         url_ = "test_url_post"
         self.manager.api.client.post = mock.Mock(return_value=(url_, body_))
-        l = self.manager._list("url", self.response_key,
-                               obj_class, "something")
-        self.assertEqual(len(data_), len(l))
+        li = self.manager._list("url", self.response_key,
+                                obj_class, "something")
+        self.assertEqual(len(data_), len(li))
 
 
 class MangerPaginationTests(ManagerTest):
diff --git a/troveclient/tests/test_v1_shell.py b/troveclient/tests/test_v1_shell.py
index e6adb83..07b709e 100644
--- a/troveclient/tests/test_v1_shell.py
+++ b/troveclient/tests/test_v1_shell.py
@@ -221,7 +221,7 @@ class ShellTest(utils.TestCase):
 
     def test_flavor_list_error(self):
         cmd = 'flavor-list --datastore_type mysql'
-        exepcted_error_msg = ('Missing argument\(s\): '
+        exepcted_error_msg = (r'Missing argument\(s\): '
                               'datastore_type, datastore_version_id')
         self.assertRaisesRegex(
             exceptions.MissingArgs, exepcted_error_msg, self.run_command,
@@ -256,7 +256,7 @@ class ShellTest(utils.TestCase):
 
     def test_volume_type_list_error(self):
         cmd = 'volume-type-list --datastore_type mysql'
-        exepcted_error_msg = ('Missing argument\(s\): '
+        exepcted_error_msg = (r'Missing argument\(s\): '
                               'datastore_type, datastore_version_id')
         self.assertRaisesRegex(
             exceptions.MissingArgs, exepcted_error_msg, self.run_command,
diff --git a/troveclient/tests/utils.py b/troveclient/tests/utils.py
index 77d8506..b24358b 100644
--- a/troveclient/tests/utils.py
+++ b/troveclient/tests/utils.py
@@ -58,6 +58,7 @@ def _patch_mock_to_raise_for_invalid_assert_calls():
     mock.Mock.__getattr__ = raise_for_invalid_assert_calls(
         mock.Mock.__getattr__)
 
+
 # NOTE(gibi): needs to be called only once at import time
 # to patch the mock lib
 _patch_mock_to_raise_for_invalid_assert_calls()
diff --git a/troveclient/v1/metadata.py b/troveclient/v1/metadata.py
index 8288a5b..9672714 100644
--- a/troveclient/v1/metadata.py
+++ b/troveclient/v1/metadata.py
@@ -23,7 +23,7 @@ class MetadataResource(base.Resource):
 
     def __contains__(self, item):
         if item in self.__dict__:
-                return True
+            return True
         else:
             return False