Ticket #10993: patch.diff

django/db/models/query.py

@@ -357 +357 @@
         Returns a tuple of (object, created), where created is a boolean
         specifying whether an object was created.
         """
+        defaults = kwargs.pop('defaults', {})
         assert kwargs, \
-                'get_or_create() must be passed at least one keyword argument'
-        defaults = kwargs.pop('defaults', {})
+                'get_or_create() must be passed at least one lookup argument'
         try:
             self._for_write = True
             return self.get(**kwargs), False

tests/modeltests/get_or_create/tests.py

@@ -50 +50 @@
             ManualPrimaryKeyTest.objects.get_or_create, id=1, data="Different"
         )
         self.assertEqual(ManualPrimaryKeyTest.objects.get(id=1).data, "Original")
+
+        # If you pass default values without lookup arguments you will get an 
+        # error
+        self.assertRaises(AssertionError, Person.objects.get_or_create, 
+            defaults={'first_name': "Tom", 
+                      'last_name': "Smith"})