Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Let tests pass on Django 1.10.1 

The change for https://code.djangoproject.com/ticket/27073
in d4eefc7e2a
removed the _default_manager assignment
fix_request_path_info
Diederik van der Boor 2016-09-11 21:32:10 +02:00
parent 2d6832f844
commit c97d1ef088
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
polymorphic/base.py
View File

@ -92,7 +92,10 @@ class PolymorphicModelBase(ModelBase):
new_class._default_manager._inherited = False # the default mgr was defined by the user, not inherited new_class._default_manager._inherited = False # the default mgr was defined by the user, not inherited
# validate resulting default manager # validate resulting default manager
self.validate_model_manager(new_class._default_manager, model_name, '_default_manager') if django.VERSION >= (1, 10) and not new_class._meta.abstract:
self.validate_model_manager(new_class.objects, model_name, 'objects')
else:
self.validate_model_manager(new_class._default_manager, model_name, '_default_manager')
# for __init__ function of this class (monkeypatching inheritance accessors) # for __init__ function of this class (monkeypatching inheritance accessors)
new_class.polymorphic_super_sub_accessors_replaced = False new_class.polymorphic_super_sub_accessors_replaced = False

13
polymorphic/tests.py
View File

@ -990,11 +990,16 @@ class PolymorphicTests(TestCase):
# by choice of MRO, should be MyManager from MROBase1. # by choice of MRO, should be MyManager from MROBase1.
self.assertIs(type(MRODerived.objects), MyManager) self.assertIs(type(MRODerived.objects), MyManager)
# check for correct default manager if django.VERSION < (1, 10, 1):
self.assertIs(type(MROBase1._default_manager), MyManager) # The change for https://code.djangoproject.com/ticket/27073
# in https://github.com/django/django/commit/d4eefc7e2af0d93283ed1c03e0af0a482982b6f0
# removes the assignment to _default_manager
# Django vanilla inheritance does not inherit MyManager as _default_manager here # check for correct default manager
self.assertIs(type(MROBase2._default_manager), MyManager) self.assertIs(type(MROBase1._default_manager), MyManager)
# Django vanilla inheritance does not inherit MyManager as _default_manager here
self.assertIs(type(MROBase2._default_manager), MyManager)
def test_queryset_assignment(self): def test_queryset_assignment(self):
# This is just a consistency check for now, testing standard Django behavior. # This is just a consistency check for now, testing standard Django behavior.