summaryrefslogtreecommitdiff
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:21:35 +0200
commitcecbb71312a5cc515ac1ddf821bdeb072c3bfaea (patch)
tree609748f5d41446dd2738bc398de27a5bb4ddfeae
parent1892ced10a8c0a74a93acddecdb3329fc58a017b (diff)
Prevented evaluation of a possible lazy message
As far as possible, message evaluation should not happen in field __init__ (often run at import time).
-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 c5a1ac8137..ab746e4971 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -530,7 +530,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