mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-25 14:46:09 +00:00
Code Issues 32 Releases Wiki Activity

fixes #753 - ValidationError and CriticalValidationError now accept both strings and promises from gettext_lazy

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Georg Bauer
2005-11-21 10:41:54 +00:00
parent a49fa746cd
commit e4e28d907a
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
django/core/validators.py
View File

@@ -27,6 +27,7 @@ url_re = re.compile(r'^http://\S+$')
from django.conf.settings import JING_PATH
from django.utils.translation import gettext_lazy, ngettext
from django.utils.functional import Promise
class ValidationError(Exception):
def __init__(self, message):
@@ -34,7 +35,7 @@ class ValidationError(Exception):
if isinstance(message, list):
self.messages = message
else:
assert isinstance(message, basestring), ("%s should be a string" % repr(message))
assert isinstance(message, (basestring, Promise)), ("%s should be a string" % repr(message))
self.messages = [message]
def __str__(self):
# This is needed because, without a __str__(), printing an exception
@@ -49,7 +50,7 @@ class CriticalValidationError(Exception):
if isinstance(message, list):
self.messages = message
else:
assert isinstance(message, basestring), ("'%s' should be a string" % message)
assert isinstance(message, (basestring, Promise)), ("'%s' should be a string" % message)
self.messages = [message]
def __str__(self):
return str(self.messages)