summaryrefslogtreecommitdiff
path: root/django/core/exceptions.py
diff options
context:
space:
mode:
authorLoic Bistuer <loic.bistuer@sixmedia.com>2013-06-05 14:55:05 -0400
committerTim Graham <timograham@gmail.com>2013-06-18 08:01:17 -0400
commitee77d4b25360a9fc050c32769a334fd69a011a63 (patch)
tree1f20a040970dc53d2e4977d79fe66ea7626cd932 /django/core/exceptions.py
parentf34cfec0fa1243b4a3b9865b961a2360f211f0d8 (diff)
downloaddjango-ee77d4b25360a9fc050c32769a334fd69a011a63.tar.gz
Fixed #20199 -- Allow ModelForm fields to override error_messages from model fields
Diffstat (limited to 'django/core/exceptions.py')
-rw-r--r--django/core/exceptions.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/django/core/exceptions.py b/django/core/exceptions.py
index 5975164d07..829d6e774e 100644
--- a/django/core/exceptions.py
+++ b/django/core/exceptions.py
@@ -117,9 +117,7 @@ class ValidationError(Exception):
message = message.message
if params:
message %= params
- message = force_text(message)
- else:
- message = force_text(message)
+ message = force_text(message)
messages.append(message)
return messages