Merge branch 'develop' into jtyler/isort-experiment

hug/decorators.py

@@ -157,7 +157,7 @@ def decorator(middleware_method):
         class MiddlewareRouter(object):
             __slots__ = ()
 
-            def process_response(self, request, response, resource, req_succeeded):
+            def process_response(self, request, response, resource, _req_succeeded):
                 return middleware_method(request, response, resource)
 
         apply_to_api.http.add_middleware(MiddlewareRouter())
@@ -179,7 +179,7 @@ def process_request(self, request, response):
                 self.gen = middleware_generator(request)
                 return self.gen.__next__()
 
-            def process_response(self, request, response, resource, req_succeeded):
+            def process_response(self, request, response, resource, _req_succeeded):
                 return self.gen.send((response, resource))
 
         apply_to_api.http.add_middleware(MiddlewareRouter())

hug/middleware.py

@@ -89,7 +89,7 @@ def process_request(self, request, response):
                 data = self.store.get(sid)
         request.context.update({self.context_name: data})
 
-    def process_response(self, request, response, resource, req_succeeded):
+    def process_response(self, request, response, resource, _req_succeeded):
         """Save request context in coupled store object. Set cookie containing a session ID."""
         sid = request.cookies.get(self.cookie_name, None)
         if sid is None or not self.store.exists(sid):
@@ -138,7 +138,7 @@ def process_request(self, request, response):
             )
         )
 
-    def process_response(self, request, response, resource, req_succeeded):
+    def process_response(self, request, response, resource, _req_succeeded):
         """Logs the basic data returned by the API"""
         self.logger.info(self._generate_combined_log(request, response))
 
@@ -176,7 +176,7 @@ def match_route(self, reqpath):
 
         return reqpath
 
-    def process_response(self, request, response, resource, req_succeeded):
+    def process_response(self, request, response, resource, _req_succeeded):
         """Add CORS headers to the response"""
         response.set_header("Access-Control-Allow-Credentials", str(self.allow_credentials).lower())
 

tox.ini

@@ -49,7 +49,7 @@ deps=
     marshmallow >=3.0.0rc5
 
 whitelist_externals=flake8
-commands=isort -c hug/*py
+commands=isort -c --diff --recursive hug
 
 [testenv:pywin]
 deps =-rrequirements/build_windows.txt