Tivix/django-rest-auth
1
1
Fork 0
mirror of https://github.com/Tivix/django-rest-auth.git synced 2024-11-25 10:33:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

make compatible with django 1.5

Browse Source
This commit is contained in:
Mateusz Sikora 2014-05-03 00:42:29 +02:00
parent 7e24165c82
commit 11cca48391
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest_auth/views.py
View File

@ -1,7 +1,11 @@
from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm
from django.contrib.auth import authenticate, login, logout, get_user_model from django.contrib.auth import authenticate, login, logout, get_user_model
from django.contrib.auth.tokens import default_token_generator from django.contrib.auth.tokens import default_token_generator
from django.utils.http import urlsafe_base64_decode try:
from django.utils.http import urlsafe_base64_decode as uid_decoder
except:
# make compatible with django 1.5
from django.utils.http import base36_to_int as uid_decoder
from django.conf import settings from django.conf import settings
from rest_framework import status from rest_framework import status
@ -261,7 +265,7 @@ class PasswordResetConfirm(LoggedOutRESTAPIView, GenericAPIView):
# Decode the uidb64 to uid to get User object # Decode the uidb64 to uid to get User object
try: try:
uid = urlsafe_base64_decode(uidb64) uid = uid_decoder(uidb64)
user = UserModel._default_manager.get(pk=uid) user = UserModel._default_manager.get(pk=uid)
except (TypeError, ValueError, OverflowError, UserModel.DoesNotExist): except (TypeError, ValueError, OverflowError, UserModel.DoesNotExist):
user = None user = None