attempt to django 4.2
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
from django.utils.encoding import force_bytes, force_text
|
||||
from django.utils.encoding import force_bytes, force_str
|
||||
from rowers.tokens import account_activation_token
|
||||
from django.contrib.sites.shortcuts import get_current_site
|
||||
from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
|
||||
@@ -782,7 +782,7 @@ def downgrade_completed_view(request):
|
||||
|
||||
def useractivate(request, uidb64, token): # pragma: no cover
|
||||
try:
|
||||
uid = force_text(urlsafe_base64_decode(uidb64))
|
||||
uid = force_str(urlsafe_base64_decode(uidb64))
|
||||
user = User.objects.get(id=uid)
|
||||
except(TypeError, ValueError, OverflowError, User.DoesNotExist):
|
||||
user = None
|
||||
|
||||
@@ -298,7 +298,7 @@ import stravalib
|
||||
from stravalib.exc import ActivityUploadFailed, TimeoutExceeded
|
||||
from rowers.weather import get_wind_data, get_airport_code, get_metar_data
|
||||
|
||||
from oauth2_provider.models import Application, Grant, AccessToken
|
||||
# from oauth2_provider.models import Application, Grant, AccessToken
|
||||
|
||||
import django_rq
|
||||
queue = django_rq.get_queue('default')
|
||||
|
||||
Reference in New Issue
Block a user