Author: kmtracey
Date: 2011-06-12 21:31:56 -0700 (Sun, 12 Jun 2011)
New Revision: 16390

Modified:
   django/trunk/django/db/models/fields/__init__.py
Log:
Refs #16234: Avoid GenericIPAddressField clobbering Field 
default_error_messages dict.

Modified: django/trunk/django/db/models/fields/__init__.py
===================================================================
--- django/trunk/django/db/models/fields/__init__.py    2011-06-12 23:50:37 UTC 
(rev 16389)
+++ django/trunk/django/db/models/fields/__init__.py    2011-06-13 04:31:56 UTC 
(rev 16390)
@@ -937,6 +937,7 @@
 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

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to