Ticket #10413: 10413.diff

django/contrib/contenttypes/generic.py

@@ -253 +253 @@
 
         def add(self, *objs):
             for obj in objs:
+                if not isinstance(obj, self.model):
+                    raise TypeError, "'%s' instance expected" % self.model._meta.object_name
                 setattr(obj, self.content_type_field_name, self.content_type)
                 setattr(obj, self.object_id_field_name, self.pk_val)
                 obj.save()

django/db/models/fields/related.py

@@ -20 +20 @@
 
 pending_lookups = {}
 
+_Model = None
+def get_model_class():
+    global _Model
+    if _Model is None:
+        from django.db.models.base import Model
+        _Model = Model
+    return _Model
+
 def add_lazy_relation(cls, field, relation, operation):
     """
     Adds a lookup on ``cls`` when a related field is defined using a string,
@@ -302 +310 @@
 
             def add(self, *objs):
                 for obj in objs:
+                    if not isinstance(obj, self.model):
+                        raise TypeError, "'%s' instance expected" % self.model._meta.object_name
                     setattr(obj, rel_field.name, instance)
                     obj.save()
             add.alters_data = True
@@ -438 +448 @@
                 for obj in objs:
                     if isinstance(obj, self.model):
                         new_ids.add(obj._get_pk_val())
+                    elif isinstance(obj, get_model_class()):
+                        raise TypeError, "'%s' instance expected" % self.model._meta.object_name
                     else:
                         new_ids.add(obj)
                 # Add the newly created or already existing objects to the join table.

tests/modeltests/many_to_many/models.py

@@ -61 +61 @@
 # Adding a second time is OK
 >>> a2.publications.add(p3)
 
+# Adding an object of the wrong type raises TypeError
+>>> a2.publications.add(a1)
+Traceback (most recent call last):
+...
+TypeError: 'Publication' instance expected
+
 # Add a Publication directly via publications.add by using keyword arguments.
 >>> new_publication = a2.publications.create(title='Highlights for Children')
 

tests/modeltests/many_to_one/models.py

@@ -72 +72 @@
 >>> r2.article_set.add(new_article2)
 >>> new_article2.reporter.id
 2
+
+# Adding an object of the wrong type raises TypeError
+>>> r.article_set.add(r2)
+Traceback (most recent call last):
+...
+TypeError: 'Article' instance expected
+
 >>> r.article_set.all()
 [<Article: John's second story>, <Article: This is a test>]
 >>> r2.article_set.all()