summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2011-06-13 04:31:56 +0000
committerKaren Tracey <kmtracey@gmail.com>2011-06-13 04:31:56 +0000
commit13efd1046526808815e727093daca0ae3bf538f2 (patch)
treea73c4ab2bf7403d04798f380931aeed94dbd6c76
parent7116c31373020f173370b2c29ad3894b747af818 (diff)
Refs #16234: Avoid GenericIPAddressField clobbering Field default_error_messages dict.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/models/fields/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 4707cb4a4c..94a9b65368 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -937,6 +937,7 @@ class IPAddressField(Field):
class GenericIPAddressField(Field):
empty_strings_allowed = True
description = _("IP address")
+ default_error_messages = {}
def __init__(self, protocol='both', unpack_ipv4=False, *args, **kwargs):
self.unpack_ipv4 = unpack_ipv4