Skip to content

Commit 973c3c8

Browse files
committed
Fix tests for Django 1.10.1
1 parent 58c849e commit 973c3c8

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

polymorphic_tree/tests/test_models.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
3+
4+
import django
35
from django.db.models import Q
46
from django.test import TestCase
57

@@ -116,11 +118,18 @@ def show_base_manager(model):
116118
self.assertEqual(show_base_manager(One2OneRelatingModelDerived), "<class 'polymorphic_tree.managers.PolymorphicMPTTModelManager'> <class 'polymorphic_tree.tests.models.One2OneRelatingModelDerived'>")
117119

118120
def test_instance_default_manager(self):
119-
def show_default_manager(instance):
120-
return "{0} {1}".format(
121-
repr(type(instance.__class__._default_manager)),
122-
repr(instance.__class__._default_manager.model)
123-
)
121+
if django.VERSION >= (1, 10, 1):
122+
def show_default_manager(instance):
123+
return "{0} {1}".format(
124+
repr(type(instance.__class__.objects)),
125+
repr(instance.__class__.objects.model)
126+
)
127+
else:
128+
def show_default_manager(instance):
129+
return "{0} {1}".format(
130+
repr(type(instance.__class__._default_manager)),
131+
repr(instance.__class__._default_manager.model)
132+
)
124133

125134
plain_a = PlainA(field1='C1')
126135
plain_b = PlainB(field2='C1')

0 commit comments

Comments
 (0)