diff --git a/common/djangoapps/microsite_configuration/tests/backends/test_base.py b/common/djangoapps/microsite_configuration/tests/backends/test_base.py index bcfac1a941..0a7d0031c4 100644 --- a/common/djangoapps/microsite_configuration/tests/backends/test_base.py +++ b/common/djangoapps/microsite_configuration/tests/backends/test_base.py @@ -1,6 +1,8 @@ """ Test Microsite base backends. """ +from __future__ import absolute_import + import logging from django.test import TestCase diff --git a/common/djangoapps/microsite_configuration/tests/backends/test_database.py b/common/djangoapps/microsite_configuration/tests/backends/test_database.py index ec13684390..d58c2b9aff 100644 --- a/common/djangoapps/microsite_configuration/tests/backends/test_database.py +++ b/common/djangoapps/microsite_configuration/tests/backends/test_database.py @@ -1,6 +1,8 @@ """ Test Microsite database backends. """ +from __future__ import absolute_import + import logging from mock import patch @@ -126,7 +128,7 @@ class DatabaseMicrositeBackendTests(DatabaseMicrositeTestCase): """ microsite.set_by_domain(self.microsite.site.domain) configs = microsite.get_all_config() - self.assertEqual(len(configs.keys()), 1) + self.assertEqual(len(list(configs.keys())), 1) self.assertEqual(configs[self.microsite.key], self.microsite.values) def test_set_config_by_domain(self): diff --git a/common/djangoapps/microsite_configuration/tests/backends/test_filebased.py b/common/djangoapps/microsite_configuration/tests/backends/test_filebased.py index a7d169a189..e96e67bd21 100644 --- a/common/djangoapps/microsite_configuration/tests/backends/test_filebased.py +++ b/common/djangoapps/microsite_configuration/tests/backends/test_filebased.py @@ -1,6 +1,9 @@ """ Test Microsite filebased backends. """ +from __future__ import absolute_import + +import six import unittest from mock import patch @@ -111,7 +114,7 @@ class FilebasedMicrositeBackendTests(TestCase): """ microsite.set_by_domain(self.microsite_subdomain) configs = microsite.get_all_config() - self.assertEqual(len(configs.keys()), 3) + self.assertEqual(len(list(configs.keys())), 3) def test_set_config_by_domain(self): """ @@ -161,7 +164,7 @@ class FilebasedMicrositeTemplateBackendTests(ModuleStoreTestCase): ) response = self.client.get( - reverse('syllabus', args=[unicode(self.course.id)]), + reverse('syllabus', args=[six.text_type(self.course.id)]), HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME, ) diff --git a/common/djangoapps/microsite_configuration/tests/factories.py b/common/djangoapps/microsite_configuration/tests/factories.py index d8a175adef..6b58dc25ff 100644 --- a/common/djangoapps/microsite_configuration/tests/factories.py +++ b/common/djangoapps/microsite_configuration/tests/factories.py @@ -1,6 +1,8 @@ """ Factories module to hold microsite factories """ +from __future__ import absolute_import + import factory from django.contrib.sites.models import Site from factory.django import DjangoModelFactory diff --git a/common/djangoapps/microsite_configuration/tests/test_admin.py b/common/djangoapps/microsite_configuration/tests/test_admin.py index f3e1c68abc..e78bdf3da4 100644 --- a/common/djangoapps/microsite_configuration/tests/test_admin.py +++ b/common/djangoapps/microsite_configuration/tests/test_admin.py @@ -1,6 +1,8 @@ """ Tests for microsite admin """ +from __future__ import absolute_import + from django.contrib.admin.sites import AdminSite from django.http import HttpRequest diff --git a/common/djangoapps/microsite_configuration/tests/test_logic.py b/common/djangoapps/microsite_configuration/tests/test_logic.py index e8f905b758..c321f21920 100644 --- a/common/djangoapps/microsite_configuration/tests/test_logic.py +++ b/common/djangoapps/microsite_configuration/tests/test_logic.py @@ -2,6 +2,8 @@ Some additional unit tests for Microsite logic. The LMS covers some of the Microsite testing, this adds some additional coverage """ +from __future__ import absolute_import + import ddt from mock import patch diff --git a/common/djangoapps/microsite_configuration/tests/test_microsites.py b/common/djangoapps/microsite_configuration/tests/test_microsites.py index 6bdefced3d..bdd694ed73 100644 --- a/common/djangoapps/microsite_configuration/tests/test_microsites.py +++ b/common/djangoapps/microsite_configuration/tests/test_microsites.py @@ -2,6 +2,8 @@ """ Tests configuration templatetags and helper functions. """ +from __future__ import absolute_import + import logging from django.conf import settings diff --git a/common/djangoapps/microsite_configuration/tests/tests.py b/common/djangoapps/microsite_configuration/tests/tests.py index c53c63116f..2a1375c87c 100644 --- a/common/djangoapps/microsite_configuration/tests/tests.py +++ b/common/djangoapps/microsite_configuration/tests/tests.py @@ -1,6 +1,8 @@ """ Holds base classes for microsite tests """ +from __future__ import absolute_import + from django.test import TestCase from mock import DEFAULT