From 64c1ecfed8830244561d87509ac41b3b69577e36 Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Wed, 10 Mar 2021 13:45:21 -0500 Subject: [PATCH 1/3] 1.4.1 release --- CHANGELOG.md | 6 +++--- setup.cfg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adb4eb628..01e45bb33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,14 +16,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] -### Removed -* Remove support for Python 3.5 - ## [1.4.1] ### Changed * #925 OAuth2TokenMiddleware converted to new style middleware, and no longer extends MiddlewareMixin. +### Removed +* #936 Remove support for Python 3.5 + ## [1.4.0] 2021-02-08 ### Added diff --git a/setup.cfg b/setup.cfg index ce656309c..22e81675e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = django-oauth-toolkit -version = 1.4.0 +version = 1.4.1 description = OAuth2 Provider for Django long_description = file: README.rst long_description_content_type = text/x-rst From b5e2cd5ac5645a36819e55055a04ceb8cd7a94b0 Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Thu, 11 Mar 2021 13:30:36 -0500 Subject: [PATCH 2/3] Per #923 `filter()` never returns a NotFound exception. --- oauth2_provider/models.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/oauth2_provider/models.py b/oauth2_provider/models.py index e1644e541..720bd7a4b 100644 --- a/oauth2_provider/models.py +++ b/oauth2_provider/models.py @@ -401,12 +401,9 @@ def revoke(self): access_token_model = get_access_token_model() refresh_token_model = get_refresh_token_model() with transaction.atomic(): - try: - token = refresh_token_model.objects.select_for_update().filter( - pk=self.pk, revoked__isnull=True - ) - except refresh_token_model.DoesNotExist: - return + token = refresh_token_model.objects.select_for_update().filter( + pk=self.pk, revoked__isnull=True + ) if not token: return self = list(token)[0] From a9808aefe242b39409b9b1b4bdc27efad9c5eae5 Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Thu, 11 Mar 2021 16:19:58 -0500 Subject: [PATCH 3/3] black --- oauth2_provider/models.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/oauth2_provider/models.py b/oauth2_provider/models.py index 720bd7a4b..835fe24b2 100644 --- a/oauth2_provider/models.py +++ b/oauth2_provider/models.py @@ -401,9 +401,7 @@ def revoke(self): access_token_model = get_access_token_model() refresh_token_model = get_refresh_token_model() with transaction.atomic(): - token = refresh_token_model.objects.select_for_update().filter( - pk=self.pk, revoked__isnull=True - ) + token = refresh_token_model.objects.select_for_update().filter(pk=self.pk, revoked__isnull=True) if not token: return self = list(token)[0]