diff --git a/acceptance_tests/__init__.py b/acceptance_tests/__init__.py index a342e4a62..46739a2e4 100644 --- a/acceptance_tests/__init__.py +++ b/acceptance_tests/__init__.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import locale import os diff --git a/acceptance_tests/course_validation/__init__.py b/acceptance_tests/course_validation/__init__.py index c4fd7853e..8809c47ef 100644 --- a/acceptance_tests/course_validation/__init__.py +++ b/acceptance_tests/course_validation/__init__.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import os diff --git a/acceptance_tests/course_validation/problem_count_stats.py b/acceptance_tests/course_validation/problem_count_stats.py index 23ab809c6..fd5f64e09 100644 --- a/acceptance_tests/course_validation/problem_count_stats.py +++ b/acceptance_tests/course_validation/problem_count_stats.py @@ -2,8 +2,6 @@ Script that produces min-max-avg for problem counts across all courses. """ -from __future__ import absolute_import, print_function - from elasticsearch import Elasticsearch es = Elasticsearch(retry_on_timeout=True) diff --git a/acceptance_tests/course_validation/report_generators.py b/acceptance_tests/course_validation/report_generators.py index 28f528ab4..6ff5d6050 100644 --- a/acceptance_tests/course_validation/report_generators.py +++ b/acceptance_tests/course_validation/report_generators.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import datetime import logging diff --git a/acceptance_tests/course_validation/report_runner.py b/acceptance_tests/course_validation/report_runner.py index 823b3e920..61dfc83a4 100755 --- a/acceptance_tests/course_validation/report_runner.py +++ b/acceptance_tests/course_validation/report_runner.py @@ -19,8 +19,6 @@ $ python -m acceptance_tests.course_validation.report_runner """ -from __future__ import absolute_import - import datetime import io import json diff --git a/acceptance_tests/mixins.py b/acceptance_tests/mixins.py index f8ab4aa92..23f477f7e 100644 --- a/acceptance_tests/mixins.py +++ b/acceptance_tests/mixins.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import datetime import locale diff --git a/acceptance_tests/pages.py b/acceptance_tests/pages.py index c4bf0f5ec..6e5d2b896 100644 --- a/acceptance_tests/pages.py +++ b/acceptance_tests/pages.py @@ -2,8 +2,6 @@ Tests for course analytics pages """ -from __future__ import absolute_import - from bok_choy.page_object import PageObject from bok_choy.promise import EmptyPromise @@ -317,7 +315,7 @@ def __init__(self, browser, course_id=None): def is_browser_on_page(self): return super(CourseLearnersPage, self).is_browser_on_page() \ - and self.browser.title.startswith('Learners') + and self.browser.title.startswith('Learners') class ErrorPage(DashboardPage): diff --git a/acceptance_tests/test_auth.py b/acceptance_tests/test_auth.py index 3d0129343..5ef83c9bb 100644 --- a/acceptance_tests/test_auth.py +++ b/acceptance_tests/test_auth.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from unittest import skipUnless diff --git a/acceptance_tests/test_course_detail.py b/acceptance_tests/test_course_detail.py index 68a6cedd6..2ba980148 100644 --- a/acceptance_tests/test_course_detail.py +++ b/acceptance_tests/test_course_detail.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from bok_choy.web_app_test import WebAppTest diff --git a/acceptance_tests/test_course_engagement.py b/acceptance_tests/test_course_engagement.py index 3b4e4d6b8..cddd29dd2 100644 --- a/acceptance_tests/test_course_engagement.py +++ b/acceptance_tests/test_course_engagement.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import datetime from unittest import skipUnless diff --git a/acceptance_tests/test_course_enrollment.py b/acceptance_tests/test_course_enrollment.py index 41f9761a0..163966780 100644 --- a/acceptance_tests/test_course_enrollment.py +++ b/acceptance_tests/test_course_enrollment.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import datetime from collections import OrderedDict diff --git a/acceptance_tests/test_course_enrollment_demographics.py b/acceptance_tests/test_course_enrollment_demographics.py index 678fddb7a..6887c955b 100644 --- a/acceptance_tests/test_course_enrollment_demographics.py +++ b/acceptance_tests/test_course_enrollment_demographics.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import datetime diff --git a/acceptance_tests/test_course_index.py b/acceptance_tests/test_course_index.py index 41ac24e80..f573f74d3 100644 --- a/acceptance_tests/test_course_index.py +++ b/acceptance_tests/test_course_index.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import requests from bok_choy.promise import EmptyPromise diff --git a/acceptance_tests/test_course_learners.py b/acceptance_tests/test_course_learners.py index 8584b94da..f577cf3c3 100644 --- a/acceptance_tests/test_course_learners.py +++ b/acceptance_tests/test_course_learners.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from unittest import skipUnless diff --git a/acceptance_tests/test_course_performance.py b/acceptance_tests/test_course_performance.py index 42c7709bb..7e692a0be 100644 --- a/acceptance_tests/test_course_performance.py +++ b/acceptance_tests/test_course_performance.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import datetime from unittest import skipUnless diff --git a/acceptance_tests/test_error_pages.py b/acceptance_tests/test_error_pages.py index 33343c990..adb602814 100644 --- a/acceptance_tests/test_error_pages.py +++ b/acceptance_tests/test_error_pages.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from unittest import skipUnless diff --git a/acceptance_tests/test_landing.py b/acceptance_tests/test_landing.py index 66faf3742..b1f49583b 100644 --- a/acceptance_tests/test_landing.py +++ b/acceptance_tests/test_landing.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from bok_choy.web_app_test import WebAppTest from six.moves import range diff --git a/acceptance_tests/test_status.py b/acceptance_tests/test_status.py index e37974ca5..79a2bda59 100644 --- a/acceptance_tests/test_status.py +++ b/acceptance_tests/test_status.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from unittest import TestCase diff --git a/analytics_dashboard/core/admin.py b/analytics_dashboard/core/admin.py index 35ee2b22f..97bdb3a59 100644 --- a/analytics_dashboard/core/admin.py +++ b/analytics_dashboard/core/admin.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.contrib import admin from django.contrib.auth.admin import UserAdmin diff --git a/analytics_dashboard/core/apps.py b/analytics_dashboard/core/apps.py index ac64e9e1e..14d51fe5f 100644 --- a/analytics_dashboard/core/apps.py +++ b/analytics_dashboard/core/apps.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import re diff --git a/analytics_dashboard/core/context_processors.py b/analytics_dashboard/core/context_processors.py index c66ce6168..57e318916 100644 --- a/analytics_dashboard/core/context_processors.py +++ b/analytics_dashboard/core/context_processors.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.conf import settings diff --git a/analytics_dashboard/core/management/commands/create_acceptance_test_soapbox_messages.py b/analytics_dashboard/core/management/commands/create_acceptance_test_soapbox_messages.py index a776ac9c0..15cdf1220 100644 --- a/analytics_dashboard/core/management/commands/create_acceptance_test_soapbox_messages.py +++ b/analytics_dashboard/core/management/commands/create_acceptance_test_soapbox_messages.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.core.management.base import BaseCommand diff --git a/analytics_dashboard/core/management/commands/delete_acceptance_test_soapbox_messages.py b/analytics_dashboard/core/management/commands/delete_acceptance_test_soapbox_messages.py index ba62471f4..574e75f4d 100644 --- a/analytics_dashboard/core/management/commands/delete_acceptance_test_soapbox_messages.py +++ b/analytics_dashboard/core/management/commands/delete_acceptance_test_soapbox_messages.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.core.management.base import BaseCommand diff --git a/analytics_dashboard/core/management/commands/delete_auto_auth_users.py b/analytics_dashboard/core/management/commands/delete_auto_auth_users.py index 6e2527cd2..861fc4afa 100644 --- a/analytics_dashboard/core/management/commands/delete_auto_auth_users.py +++ b/analytics_dashboard/core/management/commands/delete_auto_auth_users.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.contrib.auth import get_user_model from django.core.management.base import BaseCommand diff --git a/analytics_dashboard/core/middleware.py b/analytics_dashboard/core/middleware.py index edf3fc40c..350217d26 100644 --- a/analytics_dashboard/core/middleware.py +++ b/analytics_dashboard/core/middleware.py @@ -2,8 +2,6 @@ Middleware for Language Preferences """ -from __future__ import absolute_import - import logging from django.template.response import TemplateResponse diff --git a/analytics_dashboard/core/migrations/0001_initial.py b/analytics_dashboard/core/migrations/0001_initial.py index abe975988..e592224a1 100644 --- a/analytics_dashboard/core/migrations/0001_initial.py +++ b/analytics_dashboard/core/migrations/0001_initial.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals import django.core.validators import django.utils.timezone diff --git a/analytics_dashboard/core/migrations/0002_auto_20160729_1156.py b/analytics_dashboard/core/migrations/0002_auto_20160729_1156.py index 1da56d2b9..c089e4e00 100644 --- a/analytics_dashboard/core/migrations/0002_auto_20160729_1156.py +++ b/analytics_dashboard/core/migrations/0002_auto_20160729_1156.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals + import django.contrib.auth.models import django.core.validators diff --git a/analytics_dashboard/core/migrations/0003_auto_20160801_1741.py b/analytics_dashboard/core/migrations/0003_auto_20160801_1741.py index f27baa499..490f847ca 100644 --- a/analytics_dashboard/core/migrations/0003_auto_20160801_1741.py +++ b/analytics_dashboard/core/migrations/0003_auto_20160801_1741.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.9 on 2016-08-01 21:41 -from __future__ import absolute_import, unicode_literals + import django.core.validators from django.db import migrations, models diff --git a/analytics_dashboard/core/migrations/0004_auto_20170720_1310.py b/analytics_dashboard/core/migrations/0004_auto_20170720_1310.py index 98a0245c7..bfde977ae 100644 --- a/analytics_dashboard/core/migrations/0004_auto_20170720_1310.py +++ b/analytics_dashboard/core/migrations/0004_auto_20170720_1310.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.2 on 2017-07-20 17:10 -from __future__ import absolute_import, unicode_literals + import django.contrib.auth.validators from django.db import migrations, models diff --git a/analytics_dashboard/core/models.py b/analytics_dashboard/core/models.py index e8decdd43..3ce273959 100644 --- a/analytics_dashboard/core/models.py +++ b/analytics_dashboard/core/models.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.conf import settings from django.contrib.auth.models import AbstractUser diff --git a/analytics_dashboard/core/templatetags/dashboard_extras.py b/analytics_dashboard/core/templatetags/dashboard_extras.py index 24c6eb1af..b1afccc54 100644 --- a/analytics_dashboard/core/templatetags/dashboard_extras.py +++ b/analytics_dashboard/core/templatetags/dashboard_extras.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import json diff --git a/analytics_dashboard/core/tests/test_middleware.py b/analytics_dashboard/core/tests/test_middleware.py index 9a0e9affe..4096ff8a4 100644 --- a/analytics_dashboard/core/tests/test_middleware.py +++ b/analytics_dashboard/core/tests/test_middleware.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import logging diff --git a/analytics_dashboard/core/tests/test_templatetags.py b/analytics_dashboard/core/tests/test_templatetags.py index 9b23cc63e..a5a2f2889 100644 --- a/analytics_dashboard/core/tests/test_templatetags.py +++ b/analytics_dashboard/core/tests/test_templatetags.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from __future__ import absolute_import + import json diff --git a/analytics_dashboard/core/tests/test_utils.py b/analytics_dashboard/core/tests/test_utils.py index cd988a781..18de5319c 100644 --- a/analytics_dashboard/core/tests/test_utils.py +++ b/analytics_dashboard/core/tests/test_utils.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import uuid from copy import deepcopy diff --git a/analytics_dashboard/core/tests/test_views.py b/analytics_dashboard/core/tests/test_views.py index 91bfdde10..4d7be3639 100644 --- a/analytics_dashboard/core/tests/test_views.py +++ b/analytics_dashboard/core/tests/test_views.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import json import logging diff --git a/analytics_dashboard/core/utils.py b/analytics_dashboard/core/utils.py index 32f30317c..f8d820acc 100644 --- a/analytics_dashboard/core/utils.py +++ b/analytics_dashboard/core/utils.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from hashlib import md5 diff --git a/analytics_dashboard/core/views.py b/analytics_dashboard/core/views.py index ae490ad67..e8d09d620 100644 --- a/analytics_dashboard/core/views.py +++ b/analytics_dashboard/core/views.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import json import logging diff --git a/analytics_dashboard/courses/exceptions.py b/analytics_dashboard/courses/exceptions.py index 8d0d8e6be..07bf5b016 100644 --- a/analytics_dashboard/courses/exceptions.py +++ b/analytics_dashboard/courses/exceptions.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import abc diff --git a/analytics_dashboard/courses/middleware.py b/analytics_dashboard/courses/middleware.py index 7c2362d03..547735bc6 100644 --- a/analytics_dashboard/courses/middleware.py +++ b/analytics_dashboard/courses/middleware.py @@ -2,7 +2,7 @@ This file contains Django middleware. For more information visit https://docs.djangoproject.com/en/dev/topics/http/middleware/. """ -from __future__ import absolute_import + import logging diff --git a/analytics_dashboard/courses/permissions.py b/analytics_dashboard/courses/permissions.py index b8ae52528..b1074481b 100644 --- a/analytics_dashboard/courses/permissions.py +++ b/analytics_dashboard/courses/permissions.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import datetime import logging diff --git a/analytics_dashboard/courses/presenters/__init__.py b/analytics_dashboard/courses/presenters/__init__.py index 36a7bbc8d..1fa5534cb 100644 --- a/analytics_dashboard/courses/presenters/__init__.py +++ b/analytics_dashboard/courses/presenters/__init__.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import abc import datetime diff --git a/analytics_dashboard/courses/presenters/course_summaries.py b/analytics_dashboard/courses/presenters/course_summaries.py index 437910ce8..6a55b0702 100644 --- a/analytics_dashboard/courses/presenters/course_summaries.py +++ b/analytics_dashboard/courses/presenters/course_summaries.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from functools import reduce # pylint: disable=redefined-builtin diff --git a/analytics_dashboard/courses/presenters/engagement.py b/analytics_dashboard/courses/presenters/engagement.py index 199793117..f5ce3af33 100644 --- a/analytics_dashboard/courses/presenters/engagement.py +++ b/analytics_dashboard/courses/presenters/engagement.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import datetime import logging diff --git a/analytics_dashboard/courses/presenters/enrollment.py b/analytics_dashboard/courses/presenters/enrollment.py index 94d51f829..8f5919356 100644 --- a/analytics_dashboard/courses/presenters/enrollment.py +++ b/analytics_dashboard/courses/presenters/enrollment.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import copy import datetime diff --git a/analytics_dashboard/courses/presenters/performance.py b/analytics_dashboard/courses/presenters/performance.py index 0181f4ec4..d3aff8f15 100644 --- a/analytics_dashboard/courses/presenters/performance.py +++ b/analytics_dashboard/courses/presenters/performance.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import logging from collections import OrderedDict, namedtuple diff --git a/analytics_dashboard/courses/presenters/programs.py b/analytics_dashboard/courses/presenters/programs.py index 417aa2798..0a38fb2e9 100644 --- a/analytics_dashboard/courses/presenters/programs.py +++ b/analytics_dashboard/courses/presenters/programs.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.core.cache import cache diff --git a/analytics_dashboard/courses/serializers.py b/analytics_dashboard/courses/serializers.py index eea6c8653..e2ab46a87 100644 --- a/analytics_dashboard/courses/serializers.py +++ b/analytics_dashboard/courses/serializers.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.core.serializers.json import DjangoJSONEncoder from django.utils.encoding import force_text diff --git a/analytics_dashboard/courses/tests/factories.py b/analytics_dashboard/courses/tests/factories.py index dd6ed98c0..6d2d993b1 100644 --- a/analytics_dashboard/courses/tests/factories.py +++ b/analytics_dashboard/courses/tests/factories.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import hashlib import re diff --git a/analytics_dashboard/courses/tests/test_middleware.py b/analytics_dashboard/courses/tests/test_middleware.py index 90059b6fa..63d1f553d 100644 --- a/analytics_dashboard/courses/tests/test_middleware.py +++ b/analytics_dashboard/courses/tests/test_middleware.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import logging diff --git a/analytics_dashboard/courses/tests/test_permissions.py b/analytics_dashboard/courses/tests/test_permissions.py index 1bacdd7f5..88a102383 100644 --- a/analytics_dashboard/courses/tests/test_permissions.py +++ b/analytics_dashboard/courses/tests/test_permissions.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import unittest.mock as mock import ddt diff --git a/analytics_dashboard/courses/tests/test_presenters/test_course_summaries.py b/analytics_dashboard/courses/tests/test_presenters/test_course_summaries.py index 0fbf51886..d299bf7e3 100644 --- a/analytics_dashboard/courses/tests/test_presenters/test_course_summaries.py +++ b/analytics_dashboard/courses/tests/test_presenters/test_course_summaries.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import unittest.mock as mock import six diff --git a/analytics_dashboard/courses/tests/test_presenters/test_presenters.py b/analytics_dashboard/courses/tests/test_presenters/test_presenters.py index d6af1a024..9dfa5db05 100644 --- a/analytics_dashboard/courses/tests/test_presenters/test_presenters.py +++ b/analytics_dashboard/courses/tests/test_presenters/test_presenters.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division + import copy import datetime diff --git a/analytics_dashboard/courses/tests/test_presenters/test_programs.py b/analytics_dashboard/courses/tests/test_presenters/test_programs.py index 135164b94..04d1b4f91 100644 --- a/analytics_dashboard/courses/tests/test_presenters/test_programs.py +++ b/analytics_dashboard/courses/tests/test_presenters/test_programs.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import unittest.mock as mock from ddt import data, ddt, unpack diff --git a/analytics_dashboard/courses/tests/test_serializers.py b/analytics_dashboard/courses/tests/test_serializers.py index 90db6a5fa..c232d5ade 100644 --- a/analytics_dashboard/courses/tests/test_serializers.py +++ b/analytics_dashboard/courses/tests/test_serializers.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import json diff --git a/analytics_dashboard/courses/tests/test_utils.py b/analytics_dashboard/courses/tests/test_utils.py index a9dc27d18..7113aa0e5 100644 --- a/analytics_dashboard/courses/tests/test_utils.py +++ b/analytics_dashboard/courses/tests/test_utils.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.contrib.auth.models import AnonymousUser from django.test import RequestFactory, TestCase diff --git a/analytics_dashboard/courses/tests/test_views/__init__.py b/analytics_dashboard/courses/tests/test_views/__init__.py index 0e0625371..369622bdd 100644 --- a/analytics_dashboard/courses/tests/test_views/__init__.py +++ b/analytics_dashboard/courses/tests/test_views/__init__.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import json import logging diff --git a/analytics_dashboard/courses/tests/test_views/test_course_summaries.py b/analytics_dashboard/courses/tests/test_views/test_course_summaries.py index 278dd8728..aed5defba 100644 --- a/analytics_dashboard/courses/tests/test_views/test_course_summaries.py +++ b/analytics_dashboard/courses/tests/test_views/test_course_summaries.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import json diff --git a/analytics_dashboard/courses/tests/test_views/test_csv.py b/analytics_dashboard/courses/tests/test_views/test_csv.py index 03bb0b69b..512f1a081 100644 --- a/analytics_dashboard/courses/tests/test_views/test_csv.py +++ b/analytics_dashboard/courses/tests/test_views/test_csv.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import unittest.mock as mock import six diff --git a/analytics_dashboard/courses/tests/test_views/test_engagement.py b/analytics_dashboard/courses/tests/test_views/test_engagement.py index 0548ffa7d..0c32df453 100644 --- a/analytics_dashboard/courses/tests/test_views/test_engagement.py +++ b/analytics_dashboard/courses/tests/test_views/test_engagement.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from unittest.mock import Mock, patch import analyticsclient.constants.activity_types as AT diff --git a/analytics_dashboard/courses/tests/test_views/test_enrollment.py b/analytics_dashboard/courses/tests/test_views/test_enrollment.py index 7ca1c97e0..c5c109408 100644 --- a/analytics_dashboard/courses/tests/test_views/test_enrollment.py +++ b/analytics_dashboard/courses/tests/test_views/test_enrollment.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import json diff --git a/analytics_dashboard/courses/tests/test_views/test_learners.py b/analytics_dashboard/courses/tests/test_views/test_learners.py index 47cddbab9..854a5a49c 100644 --- a/analytics_dashboard/courses/tests/test_views/test_learners.py +++ b/analytics_dashboard/courses/tests/test_views/test_learners.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import json import logging diff --git a/analytics_dashboard/courses/tests/test_views/test_mixins.py b/analytics_dashboard/courses/tests/test_views/test_mixins.py index fb5bc0ba3..1a1faced0 100644 --- a/analytics_dashboard/courses/tests/test_views/test_mixins.py +++ b/analytics_dashboard/courses/tests/test_views/test_mixins.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import unittest.mock as mock from django.test import TestCase diff --git a/analytics_dashboard/courses/tests/test_views/test_pages.py b/analytics_dashboard/courses/tests/test_views/test_pages.py index 3675df6c6..0126fed06 100644 --- a/analytics_dashboard/courses/tests/test_views/test_pages.py +++ b/analytics_dashboard/courses/tests/test_views/test_pages.py @@ -1,7 +1,4 @@ # pylint: disable=abstract-method - -from __future__ import absolute_import - import unittest.mock as mock import httpretty import six diff --git a/analytics_dashboard/courses/tests/test_views/test_performance.py b/analytics_dashboard/courses/tests/test_views/test_performance.py index ccc4aacf7..a22c53a0b 100644 --- a/analytics_dashboard/courses/tests/test_views/test_performance.py +++ b/analytics_dashboard/courses/tests/test_views/test_performance.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import json import logging diff --git a/analytics_dashboard/courses/tests/utils.py b/analytics_dashboard/courses/tests/utils.py index 0a6c45aa9..916be362a 100644 --- a/analytics_dashboard/courses/tests/utils.py +++ b/analytics_dashboard/courses/tests/utils.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import copy import csv diff --git a/analytics_dashboard/courses/urls.py b/analytics_dashboard/courses/urls.py index 9a739d64e..bbf8b01ce 100644 --- a/analytics_dashboard/courses/urls.py +++ b/analytics_dashboard/courses/urls.py @@ -1,5 +1,5 @@ # pylint: disable=no-value-for-parameter -from __future__ import absolute_import + from django.conf import settings from django.conf.urls import include, url diff --git a/analytics_dashboard/courses/utils.py b/analytics_dashboard/courses/utils.py index 1e66794ce..a299ef8d8 100644 --- a/analytics_dashboard/courses/utils.py +++ b/analytics_dashboard/courses/utils.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import re diff --git a/analytics_dashboard/courses/views/__init__.py b/analytics_dashboard/courses/views/__init__.py index 798a9ccb8..600ebde9e 100644 --- a/analytics_dashboard/courses/views/__init__.py +++ b/analytics_dashboard/courses/views/__init__.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import copy import json import logging diff --git a/analytics_dashboard/courses/views/course_summaries.py b/analytics_dashboard/courses/views/course_summaries.py index ee2be7ff9..e5ea14daf 100644 --- a/analytics_dashboard/courses/views/course_summaries.py +++ b/analytics_dashboard/courses/views/course_summaries.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import logging diff --git a/analytics_dashboard/courses/views/csv.py b/analytics_dashboard/courses/views/csv.py index 6d40e5fbf..c88cf34eb 100644 --- a/analytics_dashboard/courses/views/csv.py +++ b/analytics_dashboard/courses/views/csv.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import datetime import logging diff --git a/analytics_dashboard/courses/views/engagement.py b/analytics_dashboard/courses/views/engagement.py index 7a2b4301a..48e655479 100644 --- a/analytics_dashboard/courses/views/engagement.py +++ b/analytics_dashboard/courses/views/engagement.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import logging diff --git a/analytics_dashboard/courses/views/enrollment.py b/analytics_dashboard/courses/views/enrollment.py index 81c698135..ecdb89c77 100644 --- a/analytics_dashboard/courses/views/enrollment.py +++ b/analytics_dashboard/courses/views/enrollment.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import logging diff --git a/analytics_dashboard/courses/views/learners.py b/analytics_dashboard/courses/views/learners.py index bc4066179..f8f3d50fe 100644 --- a/analytics_dashboard/courses/views/learners.py +++ b/analytics_dashboard/courses/views/learners.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import logging diff --git a/analytics_dashboard/courses/views/performance.py b/analytics_dashboard/courses/views/performance.py index 3ddff33f6..89490fd3d 100644 --- a/analytics_dashboard/courses/views/performance.py +++ b/analytics_dashboard/courses/views/performance.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import copy import logging diff --git a/analytics_dashboard/help/middleware.py b/analytics_dashboard/help/middleware.py index 4766aa966..ea98e84c5 100644 --- a/analytics_dashboard/help/middleware.py +++ b/analytics_dashboard/help/middleware.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.utils.deprecation import MiddlewareMixin from rest_framework.response import Response diff --git a/analytics_dashboard/help/tests.py b/analytics_dashboard/help/tests.py index 1731583b0..4aa99d85d 100644 --- a/analytics_dashboard/help/tests.py +++ b/analytics_dashboard/help/tests.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django import http from django.template.response import TemplateResponse diff --git a/analytics_dashboard/help/utils.py b/analytics_dashboard/help/utils.py index 0c78e6afc..acd46d3b5 100644 --- a/analytics_dashboard/help/utils.py +++ b/analytics_dashboard/help/utils.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import logging diff --git a/analytics_dashboard/help/views.py b/analytics_dashboard/help/views.py index 8158684e1..cf4c6c269 100644 --- a/analytics_dashboard/help/views.py +++ b/analytics_dashboard/help/views.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from analytics_dashboard.help import HELP_CONTEXT_TOKEN_NAME diff --git a/analytics_dashboard/learner_analytics_api/urls.py b/analytics_dashboard/learner_analytics_api/urls.py index 4d4ef8b8a..57a87b963 100644 --- a/analytics_dashboard/learner_analytics_api/urls.py +++ b/analytics_dashboard/learner_analytics_api/urls.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.conf.urls import include, url diff --git a/analytics_dashboard/learner_analytics_api/v0/clients.py b/analytics_dashboard/learner_analytics_api/v0/clients.py index 92cb04d54..33b626d00 100644 --- a/analytics_dashboard/learner_analytics_api/v0/clients.py +++ b/analytics_dashboard/learner_analytics_api/v0/clients.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import requests from django.conf import settings diff --git a/analytics_dashboard/learner_analytics_api/v0/permissions.py b/analytics_dashboard/learner_analytics_api/v0/permissions.py index 70ddc7b56..82e15b3e9 100644 --- a/analytics_dashboard/learner_analytics_api/v0/permissions.py +++ b/analytics_dashboard/learner_analytics_api/v0/permissions.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import logging diff --git a/analytics_dashboard/learner_analytics_api/v0/renderers.py b/analytics_dashboard/learner_analytics_api/v0/renderers.py index 4cea37031..13192a41c 100644 --- a/analytics_dashboard/learner_analytics_api/v0/renderers.py +++ b/analytics_dashboard/learner_analytics_api/v0/renderers.py @@ -1,7 +1,6 @@ """ Custom Django REST Framework rendererers used by the learner analytics API views. """ -from __future__ import absolute_import from rest_framework.renderers import BaseRenderer diff --git a/analytics_dashboard/learner_analytics_api/v0/tests/test_views.py b/analytics_dashboard/learner_analytics_api/v0/tests/test_views.py index 66105e7bf..77cfd3b6d 100644 --- a/analytics_dashboard/learner_analytics_api/v0/tests/test_views.py +++ b/analytics_dashboard/learner_analytics_api/v0/tests/test_views.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import json diff --git a/analytics_dashboard/learner_analytics_api/v0/urls.py b/analytics_dashboard/learner_analytics_api/v0/urls.py index b8fbd5cc0..2b0c3d1c3 100644 --- a/analytics_dashboard/learner_analytics_api/v0/urls.py +++ b/analytics_dashboard/learner_analytics_api/v0/urls.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from django.conf import settings from django.conf.urls import url diff --git a/analytics_dashboard/learner_analytics_api/v0/views.py b/analytics_dashboard/learner_analytics_api/v0/views.py index 910f1a0e5..e1b08cdac 100644 --- a/analytics_dashboard/learner_analytics_api/v0/views.py +++ b/analytics_dashboard/learner_analytics_api/v0/views.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from requests.exceptions import ConnectTimeout from rest_framework.exceptions import PermissionDenied diff --git a/analytics_dashboard/settings/base.py b/analytics_dashboard/settings/base.py index 98c4a4018..c837ed886 100644 --- a/analytics_dashboard/settings/base.py +++ b/analytics_dashboard/settings/base.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import os from os.path import abspath, basename, dirname, join, normpath diff --git a/analytics_dashboard/settings/dev.py b/analytics_dashboard/settings/dev.py index 653f2b570..c05b8acc3 100644 --- a/analytics_dashboard/settings/dev.py +++ b/analytics_dashboard/settings/dev.py @@ -1,5 +1,4 @@ """Common developpment settings""" -from __future__ import absolute_import import os diff --git a/analytics_dashboard/settings/devstack.py b/analytics_dashboard/settings/devstack.py index 7817e60bf..473890d08 100644 --- a/analytics_dashboard/settings/devstack.py +++ b/analytics_dashboard/settings/devstack.py @@ -1,5 +1,4 @@ """django settings for development on devstack""" -from __future__ import absolute_import from analytics_dashboard.settings.dev import * from analytics_dashboard.settings.yaml_config import * diff --git a/analytics_dashboard/settings/local.py b/analytics_dashboard/settings/local.py index ed254f7a2..12d67033e 100644 --- a/analytics_dashboard/settings/local.py +++ b/analytics_dashboard/settings/local.py @@ -1,7 +1,5 @@ """Development settings and globals.""" -from __future__ import absolute_import - import os from os.path import join, normpath diff --git a/analytics_dashboard/settings/logger.py b/analytics_dashboard/settings/logger.py index f49e11d9b..6fb114717 100644 --- a/analytics_dashboard/settings/logger.py +++ b/analytics_dashboard/settings/logger.py @@ -1,7 +1,5 @@ """Logging configuration""" -from __future__ import absolute_import - import os import platform import sys @@ -15,7 +13,6 @@ def get_logger_config(log_dir='/var/tmp', debug=False, local_loglevel='INFO', service_variant='insights'): - """ Return the appropriate logging config dictionary. You should assign the @@ -37,15 +34,14 @@ def get_logger_config(log_dir='/var/tmp', "[%(name)s][env:{logging_env}] %(levelname)s " "[{hostname} %(process)d] [%(filename)s:%(lineno)d] " "- %(message)s").format( - service_variant=service_variant, - logging_env=logging_env, hostname=hostname) + service_variant=service_variant, + logging_env=logging_env, hostname=hostname) if debug: handlers = ['console'] else: handlers = ['local'] - logger_config = { 'version': 1, 'disable_existing_loggers': False, diff --git a/analytics_dashboard/settings/production.py b/analytics_dashboard/settings/production.py index 5163f97dd..e152bccdb 100644 --- a/analytics_dashboard/settings/production.py +++ b/analytics_dashboard/settings/production.py @@ -1,9 +1,5 @@ """Production settings and globals.""" -from __future__ import absolute_import - -import six - from analytics_dashboard.settings.base import * from analytics_dashboard.settings.logger import get_logger_config from analytics_dashboard.settings.yaml_config import * diff --git a/analytics_dashboard/settings/test.py b/analytics_dashboard/settings/test.py index 925afda57..02fa80f5a 100644 --- a/analytics_dashboard/settings/test.py +++ b/analytics_dashboard/settings/test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from analytics_dashboard.settings.base import * from analytics_dashboard.settings.logger import get_logger_config diff --git a/analytics_dashboard/settings/yaml_config.py b/analytics_dashboard/settings/yaml_config.py index dfeadf751..564292323 100644 --- a/analytics_dashboard/settings/yaml_config.py +++ b/analytics_dashboard/settings/yaml_config.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from os import environ diff --git a/analytics_dashboard/urls.py b/analytics_dashboard/urls.py index 9cd50c469..ef06157ba 100644 --- a/analytics_dashboard/urls.py +++ b/analytics_dashboard/urls.py @@ -1,5 +1,5 @@ # pylint: disable=line-too-long,no-value-for-parameter -from __future__ import absolute_import + import os diff --git a/analytics_dashboard/wsgi.py b/analytics_dashboard/wsgi.py index 2b2025282..8d4e1d2da 100644 --- a/analytics_dashboard/wsgi.py +++ b/analytics_dashboard/wsgi.py @@ -13,7 +13,7 @@ framework. """ -from __future__ import absolute_import + import os from os.path import abspath, dirname diff --git a/common/clients.py b/common/clients.py index 9906504d5..b505249e6 100644 --- a/common/clients.py +++ b/common/clients.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import logging diff --git a/common/tests/course_fixtures.py b/common/tests/course_fixtures.py index a7aab9f9b..82f609f69 100644 --- a/common/tests/course_fixtures.py +++ b/common/tests/course_fixtures.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import uuid diff --git a/common/tests/factories.py b/common/tests/factories.py index adeb0a7d0..e3d7f26b1 100644 --- a/common/tests/factories.py +++ b/common/tests/factories.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + import copy import uuid diff --git a/common/tests/test_course_structure.py b/common/tests/test_course_structure.py index 1f3ed19c8..4c230a332 100644 --- a/common/tests/test_course_structure.py +++ b/common/tests/test_course_structure.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from unittest import TestCase diff --git a/docs/en_us/_themes/edx_theme/__init__.py b/docs/en_us/_themes/edx_theme/__init__.py index 2485efc72..b618d5265 100644 --- a/docs/en_us/_themes/edx_theme/__init__.py +++ b/docs/en_us/_themes/edx_theme/__init__.py @@ -3,7 +3,6 @@ From https://github.com/ryan-roemer/sphinx-bootstrap-theme. """ -from __future__ import absolute_import import os diff --git a/docs/en_us/dashboard/source/conf.py b/docs/en_us/dashboard/source/conf.py index 4a88eda4f..0b13ba035 100644 --- a/docs/en_us/dashboard/source/conf.py +++ b/docs/en_us/dashboard/source/conf.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # -from __future__ import absolute_import - import datetime import os import sys @@ -17,25 +15,26 @@ sys.path.append(os.path.abspath('../../../')) sys.path.append(os.path.abspath('../../')) -#from docs.shared.conf import * +# from docs.shared.conf import * sys.path.insert(0, os.path.abspath('.')) master_doc = 'index' # Add any paths that contain templates here, relative to this directory. -#templates_path.append('source/_templates') +# templates_path.append('source/_templates') # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -#html_static_path.append('source/_static') +# html_static_path.append('source/_static') # General information about the project. project = 'Using edX Insights' -copyright = '{year}, edX Inc. and licensed under a Creative Commons Attribution-ShareAlike 4.0 International License unless otherwise specified'.format(year=datetime.datetime.now().year) +copyright = '{year}, edX Inc. and licensed under a Creative Commons Attribution-ShareAlike 4.0 International License unless otherwise specified'.format( + year=datetime.datetime.now().year) # The short X.Y version. version = '' diff --git a/manage.py b/manage.py index 815087a87..546dd3e2c 100755 --- a/manage.py +++ b/manage.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import absolute_import + import os import sys