From 0cabf3aefb9d8d261841af089e872b6e08d9e29d Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 21 Jun 2014 11:17:10 +0200 Subject: [PATCH] [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. --- django/forms/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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