From 19e67c6cd13d6442abb2a6eba1b7fba80dcf5457 Mon Sep 17 00:00:00 2001 From: Rolo Date: Thu, 4 Jun 2015 11:24:53 +0100 Subject: Fixed #24677 -- Made TextField.to_python() return a string. This is consistent with CharField. --- django/db/models/fields/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'django') diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index e6fa29a565..3215927ea0 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -2141,12 +2141,15 @@ class TextField(Field): def get_internal_type(self): return "TextField" - def get_prep_value(self, value): - value = super(TextField, self).get_prep_value(value) + def to_python(self, value): if isinstance(value, six.string_types) or value is None: return value return smart_text(value) + def get_prep_value(self, value): + value = super(TextField, self).get_prep_value(value) + return self.to_python(value) + def formfield(self, **kwargs): # Passing max_length to forms.CharField means that the value's length # will be validated twice. This is considered acceptable since we want -- cgit v1.3