From f15036ae6de5b2a4a6640aeabab16076217e9ea2 Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Mon, 14 May 2007 14:02:36 +0000
Subject: [PATCH] Renamed form-specific cleaning methods to be do_clean_*,
 rather than clean_*. This avoids a name clash that would occur when you had a
 form field called "data" (because clean_data is already a dictionary on the
 Form class).

Backwards incompatible change.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/newforms/forms.py                   |  4 ++--
 tests/regressiontests/forms/regressions.py | 14 ++++++++++++++
 tests/regressiontests/forms/tests.py       |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/django/newforms/forms.py b/django/newforms/forms.py
index edd1992cf4..f624e005e9 100644
--- a/django/newforms/forms.py
+++ b/django/newforms/forms.py
@@ -184,8 +184,8 @@ class BaseForm(StrAndUnicode):
             try:
                 value = field.clean(value)
                 self.clean_data[name] = value
-                if hasattr(self, 'clean_%s' % name):
-                    value = getattr(self, 'clean_%s' % name)()
+                if hasattr(self, 'do_clean_%s' % name):
+                    value = getattr(self, 'do_clean_%s' % name)()
                 self.clean_data[name] = value
             except ValidationError, e:
                 errors[name] = e.messages
diff --git a/tests/regressiontests/forms/regressions.py b/tests/regressiontests/forms/regressions.py
index 5daabc03af..789ac81715 100644
--- a/tests/regressiontests/forms/regressions.py
+++ b/tests/regressiontests/forms/regressions.py
@@ -34,4 +34,18 @@ Unicode decoding problems...
 >>> f = SomeForm()
 >>> f.as_p()
 u'<p><label for="id_somechoice_0">Somechoice:</label> <ul>\n<li><label><input type="radio" id="id_somechoice_0" value="0" name="somechoice" /> En tied\xe4</label></li>\n<li><label><input type="radio" id="id_somechoice_1" value="1" name="somechoice" /> Mies</label></li>\n<li><label><input type="radio" id="id_somechoice_2" value="2" name="somechoice" /> Nainen</label></li>\n</ul></p>'
+
+#######################
+# Miscellaneous Tests #
+#######################
+
+There once was a problem with Form fields called "data". Let's make sure that
+doesn't come back.
+>>> class DataForm(Form):
+...     data = CharField(max_length=10)
+>>> f = DataForm({'data': 'xyzzy'})
+>>> f.is_valid()
+True
+>>> f.clean_data
+{'data': u'xyzzy'}
 """
diff --git a/tests/regressiontests/forms/tests.py b/tests/regressiontests/forms/tests.py
index 615cb2247b..82be58dd0c 100644
--- a/tests/regressiontests/forms/tests.py
+++ b/tests/regressiontests/forms/tests.py
@@ -2303,7 +2303,7 @@ returns a list of input.
 Validation errors are HTML-escaped when output as HTML.
 >>> class EscapingForm(Form):
 ...     special_name = CharField()
-...     def clean_special_name(self):
+...     def do_clean_special_name(self):
 ...         raise ValidationError("Something's wrong with '%s'" % self.clean_data['special_name'])
 
 >>> f = EscapingForm({'special_name': "Nothing to escape"}, auto_id=False)
@@ -2326,7 +2326,7 @@ including the current field (e.g., the field XXX if you're in clean_XXX()).
 ...    username = CharField(max_length=10)
 ...    password1 = CharField(widget=PasswordInput)
 ...    password2 = CharField(widget=PasswordInput)
-...    def clean_password2(self):
+...    def do_clean_password2(self):
 ...        if self.clean_data.get('password1') and self.clean_data.get('password2') and self.clean_data['password1'] != self.clean_data['password2']:
 ...            raise ValidationError(u'Please make sure your passwords match.')
 ...        return self.clean_data['password2']