summaryrefslogtreecommitdiff
path: root/tests/model_fields
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_fields
parent7f264e02f4480c49d1440be882416a10951c2165 (diff)
Stopped using django.utils.unittest in the test suite.
Refs #20680.
Diffstat (limited to 'tests/model_fields')
-rw-r--r--tests/model_fields/test_imagefield.py2
-rw-r--r--tests/model_fields/tests.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/model_fields/test_imagefield.py b/tests/model_fields/test_imagefield.py
index 457892ddb8..f6019bd77f 100644
--- a/tests/model_fields/test_imagefield.py
+++ b/tests/model_fields/test_imagefield.py
@@ -2,13 +2,13 @@ from __future__ import absolute_import
import os
import shutil
+from unittest import skipIf
from django.core.exceptions import ImproperlyConfigured
from django.core.files import File
from django.core.files.images import ImageFile
from django.test import TestCase
from django.utils._os import upath
-from django.utils.unittest import skipIf
try:
from .models import Image
diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py
index 6abeed8c42..6546c49ec7 100644
--- a/tests/model_fields/tests.py
+++ b/tests/model_fields/tests.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals
import datetime
from decimal import Decimal
+import unittest
from django import test
from django import forms
@@ -9,7 +10,6 @@ from django.core.exceptions import ValidationError
from django.db import connection, models, IntegrityError
from django.db.models.fields.files import FieldFile
from django.utils import six
-from django.utils import unittest
from .models import (Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post,
NullBooleanModel, BooleanModel, DataModel, Document, RenamedField,