Ticket #16137: 16137.2.diff

django/db/models/query.py

@@ -414 +414 @@
         Returns a tuple of (object, created), where created is a boolean
         specifying whether an object was created.
         """
-        assert kwargs, \
-                'get_or_create() must be passed at least one keyword argument'
         defaults = kwargs.pop('defaults', {})
         lookup = kwargs.copy()
         for f in self.model._meta.fields:

docs/releases/1.4.txt

@@ -480 +480 @@
 * Added the :djadminopt:`--no-location` option to the :djadmin:`makemessages`
   command.
 
+* The :meth:`~django.db.models.query.QuerySet.get_or_create` method no longer
+  requires at least one keyword argument.
+
 .. _backwards-incompatible-changes-1.4:
 
 Backwards incompatible changes in 1.4

tests/modeltests/get_or_create/models.py

@@ -17 +17 @@
     def __unicode__(self):
         return u'%s %s' % (self.first_name, self.last_name)
 
+
+class DefaultPerson(models.Model):
+    first_name = models.CharField(max_length=100, default="Anonymous")
+
+
 class ManualPrimaryKeyTest(models.Model):
     id = models.IntegerField(primary_key=True)
     data = models.CharField(max_length=100)

tests/modeltests/get_or_create/tests.py

@@ -5 +5 @@
 from django.db import IntegrityError
 from django.test import TestCase
 
-from .models import Person, ManualPrimaryKeyTest
+from .models import Person, DefaultPerson, ManualPrimaryKeyTest
 
 
 class GetOrCreateTests(TestCase):
@@ -52 +52 @@
             ManualPrimaryKeyTest.objects.get_or_create, id=1, data="Different"
         )
         self.assertEqual(ManualPrimaryKeyTest.objects.get(id=1).data, "Original")
+
+    def test_get_or_create_empty(self):
+        try:
+            DefaultPerson.objects.get_or_create()
+        except AssertionError:
+            self.fail("If all the attributes on a model have defaults, we "
+                      "shouldn't need to pass any arguments.")