From dd894586153ec0bd3817c32325e0bf4d03d66d79 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Wed, 10 Aug 2016 13:20:16 +0200 Subject: [PATCH] Fixed expressions unit test, DateTime refactored in Django 1.10 --- polymorphic/tests.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/polymorphic/tests.py b/polymorphic/tests.py index 9ff5892..3a89b89 100644 --- a/polymorphic/tests.py +++ b/polymorphic/tests.py @@ -690,8 +690,8 @@ class PolymorphicTests(TestCase): def test_instance_default_manager(self): def show_default_manager(instance): return "{0} {1}".format( - repr(type(instance._default_manager)), - repr(instance._default_manager.model) + repr(type(instance.__class__._default_manager)), + repr(instance.__class__._default_manager.model) ) plain_a = PlainA(field1='C1') @@ -1172,11 +1172,10 @@ class PolymorphicTests(TestCase): @skipIf(django.VERSION < (1,8,), "This test needs Django >=1.8") def test_polymorphic__expressions(self): - from django.db.models.expressions import DateTime - from django.utils.timezone import utc + from django.db.models.functions import Concat # no exception raised - result = DateModel.objects.annotate(val=DateTime('date', 'day', utc)) + result = Model2B.objects.annotate(val=Concat('field1', 'field2')) self.assertEqual(list(result), []) class RegressionTests(TestCase):