multi-auth: Merged to [3151]archive/attic/multi-authattic/multi-auth

git-svn-id: http://code.djangoproject.com/svn/django/branches/multi-auth@3152 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 18 insertions, 1 deletions

diff --git a/django/db/models/query.py b/django/db/models/query.py
index 4bd9b3b9fe..e826efa779 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -205,6 +205,23 @@ class QuerySet(object):
         assert len(obj_list) == 1, "get() returned more than one %s -- it returned %s! Lookup parameters were %s" % (self.model._meta.object_name, len(obj_list), kwargs)
         return obj_list[0]
 
+    def get_or_create(self, **kwargs):
+        """
+        Looks up an object with the given kwargs, creating one if necessary.
+        Returns a tuple of (object, created), where created is a boolean
+        specifying whether an object was created.
+        """
+        assert len(kwargs), 'get_or_create() must be passed at least one keyword argument'
+        defaults = kwargs.pop('defaults', {})
+        try:
+            return self.get(**kwargs), False
+        except self.model.DoesNotExist:
+            params = dict([(k, v) for k, v in kwargs.items() if '__' not in k])
+            params.update(defaults)
+            obj = self.model(**params)
+            obj.save()
+            return obj, True
+
     def latest(self, field_name=None):
         """
         Returns the latest object, according to the model's 'get_latest_by'
@@ -529,7 +546,7 @@ class DateQuerySet(QuerySet):
         c._order = self._order
         return c
 
-class QOperator:
+class QOperator(object):
     "Base class for QAnd and QOr"
     def __init__(self, *args):
         self.args = args