summaryrefslogtreecommitdiff
path: root/django/forms/fields.py
diff options
context:
space:
mode:
authorJosh Schneier <josh.schneier@gmail.com>2017-09-05 12:41:38 -0400
committerTim Graham <timograham@gmail.com>2017-09-05 12:41:38 -0400
commit48c394a6fc2594891f766293afec8f86d63e1015 (patch)
tree370c31289c1d9ea46323289c31065a629914177f /django/forms/fields.py
parent79ae5811c7b06b6462f9411b6665241a4e98bedb (diff)
downloaddjango-48c394a6fc2594891f766293afec8f86d63e1015.tar.gz
Fixed #28555 -- Made CharField convert whitespace-only values to the empty_value when strip is enabled.
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):