[INCR-180] Compatibility changes - openedx/core/djangoapps/theming/tests

openedx/core/djangoapps/theming/tests/test_commands.py

@@ -1,8 +1,10 @@
 """
 Tests for Management commands of comprehensive theming.
 """
+from __future__ import absolute_import
+
+from django.core.management import CommandError, call_command
 from django.test import TestCase
-from django.core.management import call_command, CommandError
 
 from openedx.core.djangoapps.theming.helpers import get_themes
 from openedx.core.djangoapps.theming.management.commands.compile_sass import Command

openedx/core/djangoapps/theming/tests/test_finders.py

@@ -2,6 +2,8 @@
 Tests for comprehensive theme static files finders.
 """
 
+from __future__ import absolute_import
+
 from django.conf import settings
 from django.test import TestCase
 

openedx/core/djangoapps/theming/tests/test_helpers.py

@@ -1,17 +1,23 @@
 """
 Test helpers for Comprehensive Theming.
 """
-from mock import patch, Mock
+from __future__ import absolute_import
 
-from django.test import TestCase, override_settings
 from django.conf import settings
+from django.test import TestCase, override_settings
 from edx_django_utils.cache import RequestCache
+from mock import Mock, patch
 
-from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.theming import helpers as theming_helpers
-from openedx.core.djangoapps.theming.helpers import get_template_path_with_theme, strip_site_theme_templates_path, \
-    get_themes, Theme, get_theme_base_dir
+from openedx.core.djangoapps.theming.helpers import (
+    Theme,
+    get_template_path_with_theme,
+    get_theme_base_dir,
+    get_themes,
+    strip_site_theme_templates_path
+)
+from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme
 from openedx.core.djangolib.testing.utils import skip_unless_cms, skip_unless_lms
 
 

openedx/core/djangoapps/theming/tests/test_microsites.py

@@ -1,9 +1,11 @@
 """
     Tests for microsites and comprehensive themes.
 """
+from __future__ import absolute_import
+
 from django.conf import settings
-from django.test import TestCase
 from django.contrib.sites.models import Site
+from django.test import TestCase
 
 from openedx.core.djangoapps.theming.models import SiteTheme
 from openedx.core.djangolib.testing.utils import skip_unless_lms

openedx/core/djangoapps/theming/tests/test_middleware.py

@@ -2,9 +2,12 @@
     Tests for middleware for comprehensive themes.
 """
 
+from __future__ import absolute_import
+
 from django.contrib.messages.middleware import MessageMiddleware
-from django.test import RequestFactory, TestCase, override_settings
 from django.contrib.sites.models import Site
+from django.test import RequestFactory, TestCase, override_settings
+
 from openedx.core.djangoapps.theming.middleware import CurrentSiteThemeMiddleware
 from student.tests.factories import UserFactory
 

openedx/core/djangoapps/theming/tests/test_storage.py

@@ -1,15 +1,16 @@
 """
 Tests for comprehensive theme static files storage classes.
 """
-import ddt
+from __future__ import absolute_import
+
 import re
 
+import ddt
+from django.conf import settings
+from django.test import TestCase, override_settings
 from mock import patch
 
-from django.test import TestCase, override_settings
-from django.conf import settings
-
-from openedx.core.djangoapps.theming.helpers import get_theme_base_dirs, Theme, get_theme_base_dir
+from openedx.core.djangoapps.theming.helpers import Theme, get_theme_base_dir, get_theme_base_dirs
 from openedx.core.djangoapps.theming.storage import ThemeStorage
 from openedx.core.djangolib.testing.utils import skip_unless_lms
 

openedx/core/djangoapps/theming/tests/test_theme_locales.py

@@ -1,6 +1,8 @@
 """
 Tests for Theming locales
 """
+from __future__ import absolute_import
+
 import os
 
 from django.conf import settings

openedx/core/djangoapps/theming/tests/test_theme_style_overrides.py

@@ -1,10 +1,12 @@
 """
 Tests for comprehensive themes.
 """
+from __future__ import absolute_import
+
 from django.conf import settings
-from django.urls import reverse
-from django.test import TestCase
 from django.contrib import staticfiles
+from django.test import TestCase
+from django.urls import reverse
 
 from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme
 from openedx.core.djangolib.testing.utils import skip_unless_cms, skip_unless_lms

openedx/core/djangoapps/theming/tests/test_util.py

@@ -1,18 +1,17 @@
 """
 Test helpers for Comprehensive Theming.
 """
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
-from functools import wraps
+import contextlib
 import os
 import os.path
-import contextlib
 import re
-
-from mock import patch
+from functools import wraps
 
 from django.conf import settings
 from django.contrib.sites.models import Site
+from mock import patch
 
 import edxmako
 from openedx.core.djangoapps.theming.models import SiteTheme

openedx/core/djangoapps/theming/tests/test_views.py

@@ -2,11 +2,14 @@
     Tests for comprehensive them
 """
 
-from courseware.tests.factories import GlobalStaffFactory
+from __future__ import absolute_import
+
 from django.conf import settings
 from django.contrib.messages.middleware import MessageMiddleware
-from django.test import TestCase
 from django.contrib.sites.models import Site
+from django.test import TestCase
+
+from courseware.tests.factories import GlobalStaffFactory
 from openedx.core.djangoapps.theming.middleware import CurrentSiteThemeMiddleware
 from student.tests.factories import UserFactory