Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #8570: Corrected some code that was using 8-space tabs for some…

… reason. Thanks to Manuel Saelices for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 24d3129edda155405e9665565e56d1783390f61d 1 parent 5a4feb9
@freakboy3742 freakboy3742 authored
Showing with 17 additions and 17 deletions.
  1. +17 −17 django/contrib/formtools/utils.py
View
34 django/contrib/formtools/utils.py
@@ -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)
- 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()
+ return md5_constructor(pickled).hexdigest()
Please sign in to comment.
Something went wrong with that request. Please try again.