From 49b3d053759ed3de78917b59af4c30fd22a3b0fb Mon Sep 17 00:00:00 2001 From: amitvadhel Date: Fri, 10 May 2019 12:01:15 +0300 Subject: [PATCH] INCR-INCR-158: Run python-modernize on openedx/core/djangoapps/site_configuration --- openedx/core/djangoapps/site_configuration/admin.py | 2 ++ .../core/djangoapps/site_configuration/context_processors.py | 1 + openedx/core/djangoapps/site_configuration/helpers.py | 2 ++ openedx/core/djangoapps/site_configuration/middleware.py | 1 + .../djangoapps/site_configuration/migrations/0001_initial.py | 2 +- .../site_configuration/migrations/0002_auto_20160720_0231.py | 2 +- openedx/core/djangoapps/site_configuration/models.py | 2 ++ .../djangoapps/site_configuration/templatetags/configuration.py | 2 ++ openedx/core/djangoapps/site_configuration/tests/factories.py | 2 ++ openedx/core/djangoapps/site_configuration/tests/mixins.py | 2 ++ .../site_configuration/tests/test_context_processors.py | 2 ++ .../core/djangoapps/site_configuration/tests/test_helpers.py | 1 + .../core/djangoapps/site_configuration/tests/test_middleware.py | 2 ++ openedx/core/djangoapps/site_configuration/tests/test_models.py | 2 ++ openedx/core/djangoapps/site_configuration/tests/test_util.py | 1 + 15 files changed, 24 insertions(+), 2 deletions(-) diff --git a/openedx/core/djangoapps/site_configuration/admin.py b/openedx/core/djangoapps/site_configuration/admin.py index 670b1c3592..bdef636767 100644 --- a/openedx/core/djangoapps/site_configuration/admin.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/context_processors.py b/openedx/core/djangoapps/site_configuration/context_processors.py index ad15d3a85c..ea5cc426a2 100644 --- a/openedx/core/djangoapps/site_configuration/context_processors.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/helpers.py b/openedx/core/djangoapps/site_configuration/helpers.py index fc6e0084be..6ec58d21ac 100644 --- a/openedx/core/djangoapps/site_configuration/helpers.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/middleware.py b/openedx/core/djangoapps/site_configuration/middleware.py index 60e7ef6cd0..78d30d33ca 100644 --- a/openedx/core/djangoapps/site_configuration/middleware.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/migrations/0001_initial.py b/openedx/core/djangoapps/site_configuration/migrations/0001_initial.py index e6a792b552..ce59d2a3ba 100644 --- a/openedx/core/djangoapps/site_configuration/migrations/0001_initial.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/migrations/0002_auto_20160720_0231.py b/openedx/core/djangoapps/site_configuration/migrations/0002_auto_20160720_0231.py index 0548a00942..36c641924c 100644 --- a/openedx/core/djangoapps/site_configuration/migrations/0002_auto_20160720_0231.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/models.py b/openedx/core/djangoapps/site_configuration/models.py index 8cc3fc0174..b20631fe93 100644 --- a/openedx/core/djangoapps/site_configuration/models.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/templatetags/configuration.py b/openedx/core/djangoapps/site_configuration/templatetags/configuration.py index 14393ff847..7aefae38ef 100644 --- a/openedx/core/djangoapps/site_configuration/templatetags/configuration.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/tests/factories.py b/openedx/core/djangoapps/site_configuration/tests/factories.py index 7d3e736df7..79849e8f13 100644 --- a/openedx/core/djangoapps/site_configuration/tests/factories.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/tests/mixins.py b/openedx/core/djangoapps/site_configuration/tests/mixins.py index 3883546c74..20ce91e976 100644 --- a/openedx/core/djangoapps/site_configuration/tests/mixins.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/tests/test_context_processors.py b/openedx/core/djangoapps/site_configuration/tests/test_context_processors.py index 4a7fee8c4c..259274ffd2 100644 --- a/openedx/core/djangoapps/site_configuration/tests/test_context_processors.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/tests/test_helpers.py b/openedx/core/djangoapps/site_configuration/tests/test_helpers.py index 146015660c..ebd2b9e62d 100644 --- a/openedx/core/djangoapps/site_configuration/tests/test_helpers.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/tests/test_middleware.py b/openedx/core/djangoapps/site_configuration/tests/test_middleware.py index 91509be26d..f5997386b0 100644 --- a/openedx/core/djangoapps/site_configuration/tests/test_middleware.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/tests/test_models.py b/openedx/core/djangoapps/site_configuration/tests/test_models.py index 88645a48bd..afd262d889 100644 --- a/openedx/core/djangoapps/site_configuration/tests/test_models.py +++ b/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 diff --git a/openedx/core/djangoapps/site_configuration/tests/test_util.py b/openedx/core/djangoapps/site_configuration/tests/test_util.py index 2ddb1e55fe..06079ad1bd 100644 --- a/openedx/core/djangoapps/site_configuration/tests/test_util.py +++ b/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