summaryrefslogtreecommitdiff
path: root/django/forms/fields.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/forms/fields.py')
-rw-r--r--django/forms/fields.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 40fdb24a10..805018786a 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -221,11 +221,12 @@ class CharField(Field):
def to_python(self, value):
"""Return a string."""
+ if value not in self.empty_values:
+ value = str(value)
+ if self.strip:
+ value = value.strip()
if value in self.empty_values:
return self.empty_value
- value = str(value)
- if self.strip:
- value = value.strip()
return value
def widget_attrs(self, widget):