Merge pull request #20518 from amitvadhel/INCR-INCR-158

INCR-158

openedx/core/djangoapps/site_configuration/admin.py

@@ -1,6 +1,8 @@
 """
 Django admin page for Site Configuration models
 """
+from __future__ import absolute_import
+
 from django.contrib import admin
 
 from .models import SiteConfiguration, SiteConfigurationHistory

openedx/core/djangoapps/site_configuration/context_processors.py

@@ -1,6 +1,7 @@
 """
 Django template context processors.
 """
+from __future__ import absolute_import
 
 from django.conf import settings
 from django.utils.http import urlquote_plus

openedx/core/djangoapps/site_configuration/helpers.py

@@ -1,6 +1,8 @@
 """
 Helpers methods for site configuration.
 """
+from __future__ import absolute_import
+
 from django.conf import settings
 
 from microsite_configuration import microsite

openedx/core/djangoapps/site_configuration/middleware.py

@@ -1,6 +1,7 @@
 """
 This file contains Django middleware related to the site_configuration app.
 """
+from __future__ import absolute_import
 
 from django.conf import settings
 

openedx/core/djangoapps/site_configuration/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from django.db import migrations, models
 import django.utils.timezone

openedx/core/djangoapps/site_configuration/migrations/0002_auto_20160720_0231.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from django.db import migrations, models
 

openedx/core/djangoapps/site_configuration/models.py

@@ -1,6 +1,8 @@
 """
 Django models for site configurations.
 """
+from __future__ import absolute_import
+
 import collections
 from logging import getLogger
 

openedx/core/djangoapps/site_configuration/templatetags/configuration.py

@@ -2,6 +2,8 @@
 Template tags and helper functions for displaying breadcrumbs in page titles
 based on the current site.
 """
+from __future__ import absolute_import
+
 from django import template
 from django.conf import settings
 from django.templatetags.static import static

openedx/core/djangoapps/site_configuration/tests/factories.py

@@ -1,6 +1,8 @@
 """
 Model factories for unit testing views or models.
 """
+from __future__ import absolute_import
+
 from django.contrib.sites.models import Site
 from factory.django import DjangoModelFactory
 from factory import SubFactory, Sequence, SelfAttribute, lazy_attribute

openedx/core/djangoapps/site_configuration/tests/mixins.py

@@ -1,6 +1,8 @@
 """
 Mixins for TestCase classes that need to account for multiple sites
 """
+from __future__ import absolute_import
+
 from openedx.core.djangoapps.site_configuration.tests.factories import SiteConfigurationFactory, SiteFactory
 
 

openedx/core/djangoapps/site_configuration/tests/test_context_processors.py

@@ -1,6 +1,8 @@
 """
 Tests for Django template context processors.
 """
+from __future__ import absolute_import
+
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings

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

@@ -1,6 +1,7 @@
 """
 Tests for helper function provided by site_configuration app.
 """
+from __future__ import absolute_import
 
 from django.test import TestCase
 

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

@@ -2,6 +2,8 @@
 """
 Test site_configuration middleware.
 """
+from __future__ import absolute_import
+
 import ddt
 from mock import patch
 

openedx/core/djangoapps/site_configuration/tests/test_models.py

@@ -1,6 +1,8 @@
 """
 Tests for site configuration's django models.
 """
+from __future__ import absolute_import
+
 from mock import patch
 
 from django.test import TestCase

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

@@ -1,6 +1,7 @@
 """
 Test helpers for Site Configuration.
 """
+from __future__ import absolute_import
 
 from functools import wraps
 import contextlib