Ticket #5622: 5622.2.diff

django/db/models/fields/__init__.py

@@ -185 +185 @@
         Used by the default implementations of ``get_db_prep_save``and
         `get_db_prep_lookup```
         """
-        return value
+        if self.empty_strings_allowed:
+            return value 
+        else:
+            return value or None
 
     def get_db_prep_save(self, value):
         "Returns field's value prepared for saving into a database."

tests/regressiontests/model_fields/models.py

@@ -39 +39 @@
 class BigS(models.Model):
     s = models.SlugField(max_length=255)
 
+class IPModel(models.Model):
+    ip = models.IPAddressField(blank=True,null=True)
+
 __test__ = {'API_TESTS':"""
 # Create a couple of Places.
 >>> f = Foo.objects.create(a='abc', d=decimal.Decimal("12.34"))
@@ -97 +100 @@
 >>> bs = BigS.objects.get(pk=bs.pk)
 >>> bs.s == 'slug' * 50
 True
+
+# Regression test for #5622 -- Ensure that None is returned for empty values in IPAddressField
+>>> ip_model = IPModel.objects.create(ip="")
+>>> ip_model = IPModel.objects.get(pk=ip_model.pk)
+>>> ip_model.ip == None
+True
 """}