mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 22:26:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #18407 -- Made model field's to_python methods fully accept unicode.

Browse Source 
When generating error message in to_python, any unicode string
containing non-ascii characters triggered a UnicodeEncodeError for
most field types.
This commit is contained in:
Claude Paroz
2012-05-31 16:46:07 +02:00
parent 473c272246
commit 0dc904979d
2 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/modeltests/validation/test_error_messages.py
View File

@@ -1,3 +1,4 @@
# -*- encoding: utf-8 -*-
from django.core.exceptions import ValidationError
from django.db import models
from django.utils.unittest import TestCase
@@ -12,8 +13,8 @@ class ValidationMessagesTest(TestCase):
def test_autofield_field_raises_error_message(self):
f = models.AutoField(primary_key=True)
self._test_validation_messages(f, 'foo',
[u"'foo' value must be an integer."])
self._test_validation_messages(f, u'fõo',
[u"'fõo' value must be an integer."])
# primary_key must be True. Refs #12467.
with self.assertRaisesRegexp(AssertionError,
"AutoFields must have primary_key=True."):
@@ -21,33 +22,33 @@ class ValidationMessagesTest(TestCase):
def test_integer_field_raises_error_message(self):
f = models.IntegerField()
self._test_validation_messages(f, 'foo',
[u"'foo' value must be an integer."])
self._test_validation_messages(f, u'fõo',
[u"'fõo' value must be an integer."])
def test_boolean_field_raises_error_message(self):
f = models.BooleanField()
self._test_validation_messages(f, 'foo',
[u"'foo' value must be either True or False."])
self._test_validation_messages(f, u'fõo',
[u"'fõo' value must be either True or False."])
def test_float_field_raises_error_message(self):
f = models.FloatField()
self._test_validation_messages(f, 'foo',
[u"'foo' value must be a float."])
self._test_validation_messages(f, u'fõo',
[u"'fõo' value must be a float."])
def test_decimal_field_raises_error_message(self):
f = models.DecimalField()
self._test_validation_messages(f, 'foo',
[u"'foo' value must be a decimal number."])
self._test_validation_messages(f, u'fõo',
[u"'fõo' value must be a decimal number."])
def test_null_boolean_field_raises_error_message(self):
f = models.NullBooleanField()
self._test_validation_messages(f, 'foo',
[u"'foo' value must be either None, True or False."])
self._test_validation_messages(f, u'fõo',
[u"'fõo' value must be either None, True or False."])
def test_date_field_raises_error_message(self):
f = models.DateField()
self._test_validation_messages(f, 'foo',
[u"'foo' value has an invalid date format. "
self._test_validation_messages(f, u'fõo',
[u"'fõo' value has an invalid date format. "
u"It must be in YYYY-MM-DD format."])
self._test_validation_messages(f, 'aaaa-10-10',
@@ -65,8 +66,8 @@ class ValidationMessagesTest(TestCase):
def test_datetime_field_raises_error_message(self):
f = models.DateTimeField()
# Wrong format
self._test_validation_messages(f, 'foo',
[u"'foo' value has an invalid format. It must be "
self._test_validation_messages(f, u'fõo',
[u"'fõo' value has an invalid format. It must be "
u"in YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] format."])
# Correct format but invalid date
@@ -83,8 +84,8 @@ class ValidationMessagesTest(TestCase):
def test_time_field_raises_error_message(self):
f = models.TimeField()
# Wrong format
self._test_validation_messages(f, 'foo',
[u"'foo' value has an invalid format. It must be in "
self._test_validation_messages(f, u'fõo',
[u"'fõo' value has an invalid format. It must be in "
u"HH:MM[:ss[.uuuuuu]] format."])
# Correct format but invalid time