expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 15:21:52 +00:00
Code Issues 19 Projects 3 Activity

[svn] Use the django compatability thing - webserver might have old python on it....

Browse Source
This commit is contained in:
pjrharley 2009-05-23 21:13:53 +01:00
parent 4ba77b9c2f
commit 18e080418f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
registration/models.py
View File

@ -1,7 +1,7 @@
import datetime
import random
import re
import hashlib
from django.utils.hashcompat import sha_constructor
from django.conf import settings
from django.contrib.auth.models import User
@ -152,8 +152,8 @@ class RegistrationManager(models.Manager):
username and a random salt.
"""
salt = hashlib.sha1(str(random.random())).hexdigest()[:5]
activation_key = hashlib.sha1(salt+user.username).hexdigest()
salt = sha_constructor(str(random.random())).hexdigest()[:5]
activation_key = sha_constructor(salt+user.username).hexdigest()
return self.create(user=user,
activation_key=activation_key)

6
registration/tests.py
View File

@ -20,7 +20,7 @@ getting django-registration running in the default setup, to wit:
"""
import datetime
import hashlib
from django.utils.hashcompat import sha_constructor
from django.conf import settings
from django.contrib.auth.models import User
@ -115,7 +115,7 @@ class RegistrationModelTests(RegistrationTestCase):
self.failIf(RegistrationProfile.objects.activate_user('foo'))
# Activating from a key that doesn't exist returns False.
self.failIf(RegistrationProfile.objects.activate_user(hashlib.sha1('foo').hexdigest()))
self.failIf(RegistrationProfile.objects.activate_user(sha_constructor('foo').hexdigest()))
def test_account_expiration_condition(self):
"""
@ -351,5 +351,5 @@ class RegistrationViewTests(RegistrationTestCase):
# Nonexistent key sets the account to False.
response = self.client.get(reverse('registration_activate',
kwargs={ 'activation_key': hashlib.sha1('foo').hexdigest() }))
kwargs={ 'activation_key': sha_constructor('foo').hexdigest() }))
self.failIf(response.context['account'])