Author: russellm
Date: 2008-09-14 02:04:40 -0500 (Sun, 14 Sep 2008)
New Revision: 9019
Modified:
django/trunk/django/contrib/formtools/utils.py
Log:
Fixed #8570: Corrected some code that was using 8-space tabs for some reason.
Thanks to Manuel Saelices for the report.
Modified: django/trunk/django/contrib/formtools/utils.py
===================================================================
--- django/trunk/django/contrib/formtools/utils.py 2008-09-14 06:49:28 UTC
(rev 9018)
+++ django/trunk/django/contrib/formtools/utils.py 2008-09-14 07:04:40 UTC
(rev 9019)
@@ -2,27 +2,27 @@
import cPickle as pickle
except ImportError:
import pickle
-
+
from django.conf import settings
from django.utils.hashcompat import md5_constructor
from django.forms import BooleanField
def security_hash(request, form, *args):
- """
- Calculates a security hash for the given Form instance.
+ """
+ Calculates a security hash for the given Form instance.
- This creates a list of the form field names/values in a deterministic
- order, pickles the result with the SECRET_KEY setting, then takes an
md5
- hash of that.
- """
-
- data = [(bf.name, bf.field.clean(bf.data) or '') for bf in form]
- data.extend(args)
- data.append(settings.SECRET_KEY)
-
- # Use HIGHEST_PROTOCOL because it's the most efficient. It requires
- # Python 2.3, but Django requires 2.3 anyway, so that's OK.
- pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL)
-
- return md5_constructor(pickled).hexdigest()
+ This creates a list of the form field names/values in a deterministic
+ order, pickles the result with the SECRET_KEY setting, then takes an md5
+ hash of that.
+ """
+ data = [(bf.name, bf.field.clean(bf.data) or '') for bf in form]
+ data.extend(args)
+ data.append(settings.SECRET_KEY)
+
+ # Use HIGHEST_PROTOCOL because it's the most efficient. It requires
+ # Python 2.3, but Django requires 2.3 anyway, so that's OK.
+ pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL)
+
+ return md5_constructor(pickled).hexdigest()
+
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
