summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-02-09 22:09:07 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-02-09 22:09:07 +0000
commitea7b3fd1485ff2d9864dbec123072743222c23f9 (patch)
tree2496617e697c782dcc76c4ea22b63480cdd526af
parent9b129b8f3f7ba7e1bed065fed7f016429bd56499 (diff)
Fixed #3449 -- fixed regression test results so that they all pass now. Thanks
Brian Harring. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--AUTHORS1
-rw-r--r--tests/regressiontests/forms/tests.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 36b9d26b54..e6c6e58a1d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -83,6 +83,7 @@ answer newbie questions, and generally made Django that much better:
martin.glueck@gmail.com
Simon Greenhill <dev@simon.net.nz>
Espen Grindhaug <http://grindhaug.org/>
+ Brian Harring <ferringb@gmail.com>
Brant Harris
Hawkeye
heckj@mac.com
diff --git a/tests/regressiontests/forms/tests.py b/tests/regressiontests/forms/tests.py
index 20a1937f56..be17864b9d 100644
--- a/tests/regressiontests/forms/tests.py
+++ b/tests/regressiontests/forms/tests.py
@@ -1493,7 +1493,7 @@ u'1'
>>> f.clean('3')
Traceback (most recent call last):
...
-ValidationError: [u'Select a valid choice. 3 is not one of the available choices.']
+ValidationError: [u'Select a valid choice. That choice is not one of the available choices.']
>>> f = ChoiceField(choices=[('1', '1'), ('2', '2')], required=False)
>>> f.clean('')
@@ -1507,7 +1507,7 @@ u'1'
>>> f.clean('3')
Traceback (most recent call last):
...
-ValidationError: [u'Select a valid choice. 3 is not one of the available choices.']
+ValidationError: [u'Select a valid choice. That choice is not one of the available choices.']
>>> f = ChoiceField(choices=[('J', 'John'), ('P', 'Paul')])
>>> f.clean('J')
@@ -1515,7 +1515,7 @@ u'J'
>>> f.clean('John')
Traceback (most recent call last):
...
-ValidationError: [u'Select a valid choice. John is not one of the available choices.']
+ValidationError: [u'Select a valid choice. That choice is not one of the available choices.']
# NullBooleanField ############################################################