summaryrefslogtreecommitdiff
path: root/tests/model_inheritance_regress
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-07-01 14:22:27 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-07-01 14:29:33 +0200
commitcfcf4b3605f9653e4e056088d89932b2a0e4281b (patch)
tree1eed1ebdb087b26abeddf5245fc723930d14d847 /tests/model_inheritance_regress
parent7f264e02f4480c49d1440be882416a10951c2165 (diff)
Stopped using django.utils.unittest in the test suite.
Refs #20680.
Diffstat (limited to 'tests/model_inheritance_regress')
-rw-r--r--tests/model_inheritance_regress/tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/model_inheritance_regress/tests.py b/tests/model_inheritance_regress/tests.py
index 28635a29a9..7ca16647fa 100644
--- a/tests/model_inheritance_regress/tests.py
+++ b/tests/model_inheritance_regress/tests.py
@@ -5,10 +5,10 @@ from __future__ import absolute_import, unicode_literals
import datetime
from operator import attrgetter
-from django import forms
+from unittest import expectedFailure
+from django import forms
from django.test import TestCase
-from django.utils.unittest import expectedFailure
from .models import (Place, Restaurant, ItalianRestaurant, ParkingLot,
ParkingLot2, ParkingLot3, Supplier, Wholesaler, Child, SelfRefParent,