Merge "Fix and enable gating on F841"

keystoneclient/middleware/auth_token.py

@@ -789,11 +789,11 @@ class AuthProtocol(object):
             expires = self._confirm_token_not_expired(data)
             self._cache_put(token_id, data, expires)
             return data
-        except NetworkError as e:
+        except NetworkError:
             self.LOG.debug('Token validation failure.', exc_info=True)
             self.LOG.warn("Authorization failed for token %s", token_id)
             raise InvalidUserToken('Token authorization failed')
-        except Exception as e:
+        except Exception:
             self.LOG.debug('Token validation failure.', exc_info=True)
             if token_id:
                 self._cache_store_invalid(token_id)

tests/test_auth_token_middleware.py

@@ -1192,7 +1192,7 @@ class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
         # lower, v2, api version
         req = webob.Request.blank('/')
         req.headers['X-Auth-Token'] = client_fixtures.UUID_TOKEN_DEFAULT
-        body = self.middleware(req.environ, self.start_fake_response)
+        self.middleware(req.environ, self.start_fake_response)
         self.assertEqual(self.response_status, 200)
         self.assertEqual("/testadmin/v2.0/tokens/%s" %
                          client_fixtures.UUID_TOKEN_DEFAULT,

tests/test_http.py

@@ -144,7 +144,7 @@ class ClientTest(utils.TestCase):
                                    original_ip=ORIGINAL_IP)
 
         with mock.patch.object(requests, "request", MOCK_REQUEST):
-            res = cl.request('/', 'GET')
+            cl.request('/', 'GET')
 
             args, kwargs = MOCK_REQUEST.call_args
             self.assertIn(
@@ -198,7 +198,7 @@ class BasicRequestTests(testtools.TestCase):
         response = 'Test Response'
         status = 200
 
-        resp = self.request(method=method, status=status, response=response)
+        self.request(method=method, status=status, response=response)
 
         self.assertEqual(self.last_request.method, method)
 
@@ -224,6 +224,6 @@ class BasicRequestTests(testtools.TestCase):
 
     def test_body(self):
         data = "BODY DATA"
-        resp = self.request(response=data)
+        self.request(response=data)
         self.assertThat(self.logger.debug_log, matchers.Contains('BODY:'))
         self.assertThat(self.logger.debug_log, matchers.Contains(data))

tests/v2_0/test_users.py

@@ -277,12 +277,12 @@ class UserTests(utils.TestCase):
             **kwargs).AndReturn((resp_4))
         self.mox.ReplayAll()
 
-        user = self.client.users.update(2,
-                                        name='gabriel',
-                                        email='gabriel@example.com')
-        user = self.client.users.update_password(2, 'swordfish')
-        user = self.client.users.update_tenant(2, 1)
-        user = self.client.users.update_enabled(2, False)
+        self.client.users.update(2,
+                                 name='gabriel',
+                                 email='gabriel@example.com')
+        self.client.users.update_password(2, 'swordfish')
+        self.client.users.update_tenant(2, 1)
+        self.client.users.update_enabled(2, False)
 
     def test_update_own_password(self):
         req_body = {

tox.ini

@@ -29,8 +29,7 @@ downloadcache = ~/cache/pip
 [flake8]
 # F811: redefinition of unused 'client' from line 81
 # F821: undefined name
-# F841: local variable is assigned to but never used
 # H304: no relative imports
-ignore = F811,F821,F841,H304
+ignore = F811,F821,H304
 show-source = True
 exclude = .venv,.tox,dist,doc,*egg,build