summaryrefslogtreecommitdiff
path: root/tests/generic_views
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/generic_views
parent7f264e02f4480c49d1440be882416a10951c2165 (diff)
Stopped using django.utils.unittest in the test suite.
Refs #20680.
Diffstat (limited to 'tests/generic_views')
-rw-r--r--tests/generic_views/test_base.py2
-rw-r--r--tests/generic_views/test_dates.py2
-rw-r--r--tests/generic_views/test_edit.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/generic_views/test_base.py b/tests/generic_views/test_base.py
index f95732f8b5..013a8f282c 100644
--- a/tests/generic_views/test_base.py
+++ b/tests/generic_views/test_base.py
@@ -1,11 +1,11 @@
from __future__ import absolute_import
import time
+import unittest
from django.core.exceptions import ImproperlyConfigured
from django.http import HttpResponse
from django.test import TestCase, RequestFactory
-from django.utils import unittest
from django.views.generic import View, TemplateView, RedirectView
from . import views
diff --git a/tests/generic_views/test_dates.py b/tests/generic_views/test_dates.py
index 263326322e..bff909f7d0 100644
--- a/tests/generic_views/test_dates.py
+++ b/tests/generic_views/test_dates.py
@@ -2,12 +2,12 @@ from __future__ import absolute_import
import time
import datetime
+from unittest import skipUnless
from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase, skipUnlessDBFeature
from django.test.utils import override_settings
from django.utils import timezone
-from django.utils.unittest import skipUnless
from .models import Book, BookSigning
diff --git a/tests/generic_views/test_edit.py b/tests/generic_views/test_edit.py
index 982d9e5778..9ed18833e4 100644
--- a/tests/generic_views/test_edit.py
+++ b/tests/generic_views/test_edit.py
@@ -1,12 +1,12 @@
from __future__ import absolute_import
import warnings
+from unittest import expectedFailure
from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import reverse
from django import forms
from django.test import TestCase
-from django.utils.unittest import expectedFailure
from django.test.client import RequestFactory
from django.views.generic.base import View
from django.views.generic.edit import FormMixin, CreateView