Merge "Update hacking for Python3"

keystonemiddleware/auth_token/__init__.py

@@ -822,7 +822,7 @@ class AuthProtocol(BaseAuthProtocol):
         plugin_opts = loading.get_auth_plugin_conf_options(plugin_loader)
 
         self._conf.oslo_conf_obj.register_opts(plugin_opts, group=group)
-        getter = lambda opt: self._conf.get(opt.dest, group=group)
+        getter = lambda opt: self._conf.get(opt.dest, group=group)  # noqa
         return plugin_loader.load_from_options_getter(getter)
 
     def _create_session(self, **kwargs):

keystonemiddleware/tests/unit/utils.py

@@ -82,7 +82,7 @@ if tuple(sys.version_info)[0:2] < (2, 7):
 class MiddlewareTestCase(BaseTestCase):
 
     def create_middleware(self, cb, **kwargs):
-        raise NotImplemented("implement this in your tests")
+        raise NotImplementedError("implement this in your tests")
 
     def create_simple_middleware(self,
                                  status='200 OK',

test-requirements.txt

@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking<0.11,>=0.10.0
+hacking>=3.0,<4.0.0 # Apache-2.0
 flake8-docstrings==0.2.1.post1 # MIT
 
 coverage!=4.4,>=4.0 # Apache-2.0

tox.ini

@@ -50,7 +50,9 @@ commands = oslo_debug_helper -t keystonemiddleware/tests {posargs}
 # D103: Missing docstring in public function
 # D104: Missing docstring in public package
 # D203: 1 blank line required before class docstring (deprecated in pep257)
-ignore = D100,D101,D102,D103,D104,D203
+# W503 line break before binary operator
+# W504 line break after binary operator
+ignore = D100,D101,D102,D103,D104,D203,W503,W504
 show-source = True
 exclude = .venv,.tox,dist,doc,*egg,build