p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid a deprecation warning when running on Python 2.6. Patch from Karen Tracey. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-09-02 03:04:28 +00:00
parent 54e02cc92b
commit 63c9b7bf06
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/contrib/comments/forms.py
View File

@ -1,7 +1,7 @@
import re import re
import time import time
import datetime import datetime
from sha import sha
from django import forms from django import forms
from django.forms.util import ErrorDict from django.forms.util import ErrorDict
from django.conf import settings from django.conf import settings
@ -9,6 +9,7 @@ from django.http import Http404
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from models import Comment from models import Comment
from django.utils.encoding import force_unicode from django.utils.encoding import force_unicode
from django.utils.hashcompat import sha_constructor
from django.utils.text import get_text_list from django.utils.text import get_text_list
from django.utils.translation import ngettext from django.utils.translation import ngettext
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@ -154,4 +155,4 @@ class CommentForm(forms.Form):
def generate_security_hash(self, content_type, object_pk, timestamp): def generate_security_hash(self, content_type, object_pk, timestamp):
"""Generate a (SHA1) security hash from the provided info.""" """Generate a (SHA1) security hash from the provided info."""
info = (content_type, object_pk, timestamp, settings.SECRET_KEY) info = (content_type, object_pk, timestamp, settings.SECRET_KEY)
return sha("".join(info)).hexdigest() return sha_constructor("".join(info)).hexdigest()