summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Wilde <dwilde@redhat.com>2022-12-06 14:59:48 -0600
committercdw from scratch <dwilde@redhat.com>2022-12-09 10:28:06 -0600
commitdc0b79649506a520463622c6ff0e0383a2dea6a0 (patch)
treea6e7e5237bab2c387c23757646930ab6df3759bb
parentaeeb64d349524433dda05cf12994ea4f8676c098 (diff)
downloadkeystonemiddleware-dc0b79649506a520463622c6ff0e0383a2dea6a0.tar.gz
Fix pep8 gate
This updates the test-requirements to more recent flake8-docstrings and pep8 versions. I also added some more ignores that would take significant work to update and fixed some minor linting issues. Change-Id: Ia416658b8a4bfb8f43f8df170053abb3ae958d44
-rw-r--r--keystonemiddleware/oauth2_token.py5
-rw-r--r--test-requirements.txt6
-rw-r--r--tox.ini5
3 files changed, 8 insertions, 8 deletions
diff --git a/keystonemiddleware/oauth2_token.py b/keystonemiddleware/oauth2_token.py
index 4dd5a6d..692b0b4 100644
--- a/keystonemiddleware/oauth2_token.py
+++ b/keystonemiddleware/oauth2_token.py
@@ -35,12 +35,11 @@ class OAuth2Protocol(AuthProtocol):
super(OAuth2Protocol, self).__init__(app, conf)
def _is_valid_access_token(self, request):
- """Check if the request contains an OAuth2.0 access token
+ """Check if the request contains an OAuth2.0 access token.
:param request: Incoming request
:type request: _request.AuthTokenRequest
"""
-
access_token = None
if (request.authorization and
request.authorization.authtype == 'Bearer'):
@@ -69,7 +68,6 @@ class OAuth2Protocol(AuthProtocol):
:param request: Incoming request
:type request: _request.AuthTokenRequest
"""
-
request.remove_auth_headers()
self._token_cache.initialize(request.environ)
if (not self._is_valid_access_token(request)
@@ -96,7 +94,6 @@ class OAuth2Protocol(AuthProtocol):
def filter_factory(global_conf, **local_conf):
"""Return a WSGI filter app for use with paste.deploy."""
-
conf = global_conf.copy()
conf.update(local_conf)
diff --git a/test-requirements.txt b/test-requirements.txt
index cd0bfc9..b539b01 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,14 +3,16 @@
# process, which may cause wedges in the gate later.
hacking>=3.0,<4.0.0 # Apache-2.0
-flake8-docstrings==0.2.1.post1 # MIT
+flake8-docstrings==1.6.0 # MIT
+pep8==1.7.1 # MIT
+
coverage!=4.4,>=4.0 # Apache-2.0
cryptography>=3.0 # BSD/Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0
-requests-mock>=1.2.0 # Apache-2.0
stevedore>=1.20.0 # Apache-2.0
+requests-mock>=1.2.0 # Apache-2.0
stestr>=2.0.0 # Apache-2.0
testresources>=2.0.0 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
diff --git a/tox.ini b/tox.ini
index 5c148aa..ab4bee0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,10 +49,11 @@ commands = oslo_debug_helper -t keystonemiddleware/tests {posargs}
# D102: Missing docstring in public method
# D103: Missing docstring in public function
# D104: Missing docstring in public package
-# D203: 1 blank line required before class docstring (deprecated in pep257)
+# D107: Missing docstring in __init__
+# D401: First line should be in imperative mood
# W503 line break before binary operator
# W504 line break after binary operator
-ignore = D100,D101,D102,D103,D104,D203,W503,W504
+ignore = D100,D101,D102,D103,D104,D107,D401,W503,W504
show-source = True
exclude = .venv,.tox,dist,doc,*egg,build