diff --git a/lms/djangoapps/course_wiki/tests/test_access.py b/lms/djangoapps/course_wiki/tests/test_access.py index e6de1463df..b4e653ec2d 100644 --- a/lms/djangoapps/course_wiki/tests/test_access.py +++ b/lms/djangoapps/course_wiki/tests/test_access.py @@ -2,14 +2,16 @@ Tests for wiki permissions """ +from __future__ import absolute_import + from django.contrib.auth.models import Group -from wiki.models import URLPath from course_wiki import settings from course_wiki.utils import course_wiki_slug, user_is_article_course_staff from course_wiki.views import get_or_create_root from courseware.tests.factories import InstructorFactory, StaffFactory from student.tests.factories import UserFactory +from wiki.models import URLPath from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory diff --git a/lms/djangoapps/course_wiki/tests/test_comprehensive_theming.py b/lms/djangoapps/course_wiki/tests/test_comprehensive_theming.py index 2d2c9c7453..110927008e 100644 --- a/lms/djangoapps/course_wiki/tests/test_comprehensive_theming.py +++ b/lms/djangoapps/course_wiki/tests/test_comprehensive_theming.py @@ -1,14 +1,16 @@ """ Tests for wiki middleware. """ +from __future__ import absolute_import + from unittest import skip from django.test.client import Client -from wiki.models import URLPath from course_wiki.views import get_or_create_root from courseware.tests.factories import InstructorFactory from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme +from wiki.models import URLPath from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory diff --git a/lms/djangoapps/course_wiki/tests/test_middleware.py b/lms/djangoapps/course_wiki/tests/test_middleware.py index 71b037c480..e6e19db5a9 100644 --- a/lms/djangoapps/course_wiki/tests/test_middleware.py +++ b/lms/djangoapps/course_wiki/tests/test_middleware.py @@ -2,11 +2,13 @@ Tests for wiki middleware. """ +from __future__ import absolute_import + from django.test.client import Client -from wiki.models import URLPath from course_wiki.views import get_or_create_root from courseware.tests.factories import InstructorFactory +from wiki.models import URLPath from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory diff --git a/lms/djangoapps/course_wiki/tests/test_tab.py b/lms/djangoapps/course_wiki/tests/test_tab.py index 87b322f280..aa6eb35066 100644 --- a/lms/djangoapps/course_wiki/tests/test_tab.py +++ b/lms/djangoapps/course_wiki/tests/test_tab.py @@ -2,6 +2,8 @@ Tests for wiki views. """ +from __future__ import absolute_import + from django.conf import settings from django.test.client import RequestFactory diff --git a/lms/djangoapps/course_wiki/tests/tests.py b/lms/djangoapps/course_wiki/tests/tests.py index 9990ba3207..23f7c97123 100644 --- a/lms/djangoapps/course_wiki/tests/tests.py +++ b/lms/djangoapps/course_wiki/tests/tests.py @@ -2,6 +2,9 @@ Tests for course wiki """ +from __future__ import absolute_import + +import six from django.urls import reverse from mock import patch from six import text_type @@ -217,7 +220,7 @@ class WikiRedirectTestCase(EnterpriseTestConsentRequired, LoginEnrollmentTestCas # However, for private wikis, enrolled users must pass through the consent gate # (Unenrolled users are redirected to course/about) - course_id = unicode(course.id) + course_id = six.text_type(course.id) self.login(self.student, self.password) self.enroll(course)