summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timgraham@google.com>2013-05-24 16:36:09 -0400
committerTim Graham <timograham@gmail.com>2013-05-27 10:01:14 -0400
commit90af278203963e3e3f96e443971cd38a2dad34e4 (patch)
treefe179729adc3855d7b22c99a39c4e80b96958db5 /docs
parenta64de33b791b4f1d8864dd0879b246c3cd5fa345 (diff)
Fixed #16137 - Removed kwargs requirement for QuerySet.get_or_create
Thanks wilfred@, poirier, and charettes for work on the patch.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/models/querysets.txt8
-rw-r--r--docs/releases/1.6.txt3
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 53359441ae..3fb5b3a498 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -1343,8 +1343,12 @@ get_or_create
.. method:: get_or_create(**kwargs)
-A convenience method for looking up an object with the given kwargs, creating
-one if necessary.
+A convenience method for looking up an object with the given kwargs (may be
+empty if your model has defaults for all fields), creating one if necessary.
+
+.. versionchanged:: 1.6
+
+ Older versions of Django required ``kwargs``.
Returns a tuple of ``(object, created)``, where ``object`` is the retrieved or
created object and ``created`` is a boolean specifying whether a new object was
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index 73b0fb85eb..4a8f7c6ecf 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -280,6 +280,9 @@ Minor features
* The :exc:`~django.core.exceptions.DoesNotExist` exception now includes a
message indicating the name of the attribute used for the lookup.
+* The :meth:`~django.db.models.query.QuerySet.get_or_create` method no longer
+ requires at least one keyword argument.
+
Backwards incompatible changes in 1.6
=====================================