Index: django/contrib/contenttypes/generic.py =================================================================== --- django/contrib/contenttypes/generic.py (revision 9836) +++ django/contrib/contenttypes/generic.py (working copy) @@ -307,7 +307,7 @@ # Avoid a circular import. from django.contrib.contenttypes.models import ContentType if self.instance is None: - return self.model._default_manager.empty() + return self.model._default_manager.get_empty_query_set() return self.model._default_manager.filter(**{ self.ct_field.name: ContentType.objects.get_for_model(self.instance), self.ct_fk_field.name: self.instance.pk, Index: tests/modeltests/generic_relations/models.py =================================================================== --- tests/modeltests/generic_relations/models.py (revision 9836) +++ tests/modeltests/generic_relations/models.py (working copy) @@ -219,6 +219,12 @@ >>> from django.contrib.contenttypes.generic import generic_inlineformset_factory >>> GenericFormSet = generic_inlineformset_factory(TaggedItem, extra=1) +>>> formset = GenericFormSet() +>>> for form in formset.forms: +... print form.as_p() +
+
+ >>> formset = GenericFormSet(instance=Animal()) >>> for form in formset.forms: ... print form.as_p()