From ddae2ecfe42a4135850a435e1eefc79dfecaa062 Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Tue, 29 May 2007 13:09:48 +0000
Subject: unicode: Merged from trunk up to [5380].

git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 tests/regressiontests/forms/tests.py                | 19 +++++++++++++++++++
 tests/regressiontests/serializers_regress/models.py |  3 +++
 tests/regressiontests/serializers_regress/tests.py  |  2 ++
 3 files changed, 24 insertions(+)

(limited to 'tests/regressiontests')

diff --git a/tests/regressiontests/forms/tests.py b/tests/regressiontests/forms/tests.py
index ba5beed5e5..4844267b43 100644
--- a/tests/regressiontests/forms/tests.py
+++ b/tests/regressiontests/forms/tests.py
@@ -3655,6 +3655,25 @@ u' id="header"'
 u' class="news" title="Read this"'
 >>> flatatt({})
 u''
+
+####################################
+# Test accessing errors in clean() #
+####################################
+
+>>> class UserForm(Form):
+...     username = CharField(max_length=10)
+...     password = CharField(widget=PasswordInput)
+...     def clean(self):
+...         data = self.cleaned_data
+...         if not self.errors:
+...             data['username'] = data['username'].lower()
+...         return data
+
+>>> f = UserForm({'username': 'SirRobin', 'password': 'blue'})
+>>> f.is_valid()
+True
+>>> f.cleaned_data['username']
+u'sirrobin'
 """
 
 __test__ = {
diff --git a/tests/regressiontests/serializers_regress/models.py b/tests/regressiontests/serializers_regress/models.py
index 999b79ccaf..3b9c228d4c 100644
--- a/tests/regressiontests/serializers_regress/models.py
+++ b/tests/regressiontests/serializers_regress/models.py
@@ -129,6 +129,9 @@ class M2MSelfData(models.Model):
 class FKDataToField(models.Model):
     data = models.ForeignKey(UniqueAnchor, null=True, to_field='data')
 
+class FKDataToO2O(models.Model):
+    data = models.ForeignKey(O2OData, null=True)
+
 # The following test classes are for validating the
 # deserialization of objects that use a user-defined
 # field as the primary key.
diff --git a/tests/regressiontests/serializers_regress/tests.py b/tests/regressiontests/serializers_regress/tests.py
index 8395fe0320..af0cd64cf8 100644
--- a/tests/regressiontests/serializers_regress/tests.py
+++ b/tests/regressiontests/serializers_regress/tests.py
@@ -200,6 +200,8 @@ The end."""),
     (fk_obj, 451, FKDataToField, "UAnchor 2"),
     (fk_obj, 452, FKDataToField, None),
 
+    (fk_obj, 460, FKDataToO2O, 300),
+
     (data_obj, 500, Anchor, "Anchor 3"),
     (data_obj, 501, Anchor, "Anchor 4"),
     (data_obj, 502, UniqueAnchor, "UAnchor 2"),
-- 
cgit v1.3