Ticket #5622: empty-ip.diff

django/db/models/fields/__init__.py

@@ -269 +269 @@
         """
         if not prepared:
             value = self.get_prep_value(value)
-        return value
+        if self.empty_strings_allowed:
+            return value
+        else:
+            return value or None
 
     def get_db_prep_save(self, value, connection):
         "Returns field's value prepared for saving into a database."

tests/regressiontests/model_fields/models.py

@@ -66 +66 @@
     bfield = models.BooleanField()
     string = models.CharField(max_length=10, default='abc')
 
+class IP(models.Model):
+    ip = models.IPAddressField(blank=True, null=True)
+
 ###############################################################################
 # ImageField
 

tests/regressiontests/model_fields/tests.py

@@ -7 +7 @@
 from django.db import models
 from django.core.exceptions import ValidationError
 
-from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, NullBooleanModel, BooleanModel
+from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, NullBooleanModel, BooleanModel, IP
 
 # If PIL available, do these tests.
 if Image:
@@ -214 +214 @@
         bs = BigS.objects.get(pk=bs.pk)
         self.assertEqual(bs.s, 'slug'*50)
 
+class IPFieldTests(django.test.TestCase):
+    def test_ip_empty(self):
+        """
+        Check it's possible to use empty values in IP field (#5622).
+        """
+        ip = IP.objects.create(ip="")
+        ip = IP.objects.get(pk=ip.pk)
+        self.assertEqual(ip.ip, None)
 
 class ValidationTest(django.test.TestCase):
     def test_charfield_raises_error_on_empty_string(self):