Ticket #3511: 3511.diff

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/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
@@ -28 +28 @@
-        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

@@ -236 +236 @@
-        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):