Merge "Hacking version update and pep8 issues fix"

manilaclient/common/httpclient.py

@@ -199,4 +199,4 @@ class HTTPClient(object):
                 'code': resp.status_code,
                 'headers': resp.headers,
                 'body': resp.text
-            })
+            })

manilaclient/tests/unit/v2/test_shell.py

@@ -869,7 +869,7 @@ class ShellTest(test_utils.TestCase):
 
     def test_extract_metadata(self):
         # mimic the result of argparse's parse_args() method
-        class Arguments:
+        class Arguments(object):
             def __init__(self, metadata=None):
                 if metadata is None:
                     metadata = []
@@ -1371,7 +1371,7 @@ class ShellTest(test_utils.TestCase):
     @mock.patch.object(cliutils, 'print_list', mock.Mock())
     @mock.patch.object(shell_v2, '_find_share_network', mock.Mock())
     def test_security_service_list_filter_share_network(self):
-        class FakeShareNetwork:
+        class FakeShareNetwork(object):
             id = 'fake-sn-id'
         sn = FakeShareNetwork()
         shell_v2._find_share_network.return_value = sn

test-requirements.txt

@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 # hacking should be first
-hacking<0.10,>=0.9.2
+hacking>=0.10.2,<0.11 # Apache-2.0
 
 coverage>=3.6 # Apache-2.0
 ddt>=1.0.1 # MIT