Ticket #3511: 3511.2.diff

django/db/models/base.py

@@ -1 +1 @@
-import django.db.models.manipulators
-import django.db.models.manager
-from django.core import validators
-
+, MultipleObjectsReturned
-from django.db.models.fields import AutoField, ImageField, FieldDoesNotExist
-from django.db.models.fields.related import OneToOneRel, ManyToOneRel
-from django.db.models.query import delete_objects
@@ -35 +35 @@
-        new_class = type.__new__(cls, name, bases, {'__module__': attrs.pop('__module__')})
-        new_class.add_to_class('_meta', Options(attrs.pop('Meta', None)))
-        new_class.add_to_class('DoesNotExist', types.ClassType('DoesNotExist', (ObjectDoesNotExist,), {}))
+        new_class.add_to_class('MultipleObjectsReturned',
+            types.ClassType('MultipleObjectsReturned', (MultipleObjectsReturned, ), {}))
-
-        # Build complete list of parents
-        for base in bases:

django/db/models/query.py

@@ -261 +261 @@
-        obj_list = list(clone)
-        if len(obj_list) < 1:
-            raise self.model.DoesNotExist, "%s matching query does not exist." % self.model._meta.object_name
-
+
+
-        return obj_list[0]
-
-    def create(self, **kwargs):

django/core/exceptions.py

@@ -4 +4 @@
-    "The requested object does not exist"
-    silent_variable_failure = True
-
+class MultipleObjectsReturned(Exception):
+    "The query returned multiple objects when only one was expected."
+    pass
+
-class SuspiciousOperation(Exception):
-    "The user did something suspicious"
-    pass

django/shortcuts/__init__.py

@@ -38 +38 @@
-    klass may be a Model, Manager, or QuerySet object. All other passed
-    arguments and keyword arguments are used in the get() query.
-
-AssertionError
+MultipleObjectsReturned
-    object is found.
-    """
-    queryset = _get_queryset(klass)

tests/modeltests/get_object_or_404/models.py

@@ -78 +78 @@
->>> get_object_or_404(Author.objects.all())
-Traceback (most recent call last):
-...
-AssertionError
+MultipleObjectsReturned
-
-# Using an EmptyQuerySet raises a Http404 error.
->>> get_object_or_404(Article.objects.none(), title__contains="Run")

docs/shortcuts.txt

@@ -98 +98 @@
-        except MyModel.DoesNotExist:
-            raise Http404
-
-AssertionError`` will be raised if more than
-
+MultipleObjectsReturned`` exception will be
+raised if more than 
-
-.. _get(): ../db-api/#get-kwargs
-