summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/__init__.py7
1 files changed, 5 insertions, 2 deletions
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