summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-06-21 11:17:10 +0200
committerClaude Paroz <claude@2xlibre.net>2014-06-21 11:23:30 +0200
commit0cabf3aefb9d8d261841af089e872b6e08d9e29d (patch)
tree1bcdf32eb04110457d46fa571a288cfa44e306f4 /django/forms
parentd107c7bd7db183d85bb3b22e0019b3be8af262d2 (diff)
[1.7.x] Prevented evaluation of a possible lazy message
As far as possible, message evaluation should not happen in field __init__ (often run at import time). Backport of cecbb71312a from master.
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/fields.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 1b64cba387..011cb7762b 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -527,7 +527,7 @@ class RegexField(CharField):
'Enter a valid value' is too generic for you.
"""
# error_message is just kept for backwards compatibility:
- if error_message:
+ if error_message is not None:
error_messages = kwargs.get('error_messages') or {}
error_messages['invalid'] = error_message
kwargs['error_messages'] = error_messages