Merge pull request #22644 from edx/feanil/2to3_imports

Run `2to3 -f future . -w`

common/djangoapps/course_action_state/managers.py

@@ -1,7 +1,7 @@
 """
 Model Managers for Course Actions
 """
-from __future__ import absolute_import
+
 import six
 import traceback
 from django.db import models, transaction

common/djangoapps/course_action_state/migrations/0001_initial.py

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

common/djangoapps/course_action_state/models.py

@@ -9,7 +9,7 @@ file and check it in at the same time as your model changes. To do that,
 3. It adds the migration file to edx-platform/common/djangoapps/course_action_state/migrations/
 
 """
-from __future__ import absolute_import
+
 from django.contrib.auth.models import User
 from django.db import models
 from opaque_keys.edx.django.models import CourseKeyField

common/djangoapps/course_action_state/tests/test_managers.py

@@ -2,7 +2,7 @@
 """
 Tests for basic common operations related to Course Action State managers
 """
-from __future__ import absolute_import
+
 from six.moves import range
 
 from collections import namedtuple

common/djangoapps/course_action_state/tests/test_rerun_manager.py

@@ -2,7 +2,7 @@
 Tests specific to the CourseRerunState Model and Manager.
 """
 
-from __future__ import absolute_import
+
 
 from django.test import TestCase
 from opaque_keys.edx.locations import CourseLocator

common/djangoapps/course_modes/admin.py

@@ -1,5 +1,5 @@
 """Django admin for course_modes"""
-from __future__ import absolute_import, unicode_literals
+
 
 import six
 from django import forms

common/djangoapps/course_modes/api/serializers.py

@@ -1,7 +1,7 @@
 """
 Course modes API serializers.
 """
-from __future__ import absolute_import
+
 
 from rest_framework import serializers
 

common/djangoapps/course_modes/api/urls.py

@@ -1,7 +1,7 @@
 """
 URL definitions for the course_modes API.
 """
-from __future__ import absolute_import
+
 
 from django.conf.urls import include, url
 

common/djangoapps/course_modes/api/v1/tests/test_views.py

@@ -1,7 +1,7 @@
 """
 Tests for the course modes API.
 """
-from __future__ import absolute_import, unicode_literals
+
 
 import json
 import unittest

common/djangoapps/course_modes/api/v1/urls.py

@@ -1,7 +1,7 @@
 """
 URL definitions for the course_modes v1 API.
 """
-from __future__ import absolute_import
+
 
 from django.conf import settings
 from django.conf.urls import url

common/djangoapps/course_modes/api/v1/views.py

@@ -2,7 +2,7 @@
 Defines the "ReSTful" API for course modes.
 """
 
-from __future__ import absolute_import
+
 
 import logging
 

common/djangoapps/course_modes/apps.py

@@ -1,5 +1,5 @@
 """Django App config for course_modes"""
-from __future__ import absolute_import
+
 
 from django.apps import AppConfig
 

common/djangoapps/course_modes/helpers.py

@@ -1,5 +1,5 @@
 """ Helper methods for CourseModes. """
-from __future__ import absolute_import, unicode_literals
+
 
 import six
 from django.utils.translation import ugettext_lazy as _

common/djangoapps/course_modes/migrations/0001_initial.py

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

common/djangoapps/course_modes/migrations/0002_coursemode_expiration_datetime_is_explicit.py

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

common/djangoapps/course_modes/migrations/0003_auto_20151113_1443.py

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

common/djangoapps/course_modes/migrations/0004_auto_20151113_1457.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+
 
 from datetime import timedelta
 

common/djangoapps/course_modes/migrations/0005_auto_20151217_0958.py

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

common/djangoapps/course_modes/migrations/0006_auto_20160208_1407.py

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

common/djangoapps/course_modes/migrations/0007_coursemode_bulk_sku.py

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

common/djangoapps/course_modes/migrations/0008_course_key_field_to_foreign_key.py

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

common/djangoapps/course_modes/migrations/0009_suggested_prices_to_charfield.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+
 
 import re
 

common/djangoapps/course_modes/migrations/0010_archived_suggested_prices_to_charfield.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+
 
 import re
 

common/djangoapps/course_modes/migrations/0011_change_regex_for_comma_separated_ints.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.8 on 2018-01-30 17:38
-from __future__ import absolute_import, unicode_literals
+
 
 import re
 

common/djangoapps/course_modes/migrations/0012_historicalcoursemode.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.21 on 2019-06-19 01:31
-from __future__ import unicode_literals
+
 
 from django.conf import settings
 import django.core.validators

common/djangoapps/course_modes/models.py

@@ -1,7 +1,7 @@
 """
 Add and create new modes for running courses on this particular LMS
 """
-from __future__ import absolute_import
+
 
 from collections import defaultdict, namedtuple
 from datetime import timedelta

common/djangoapps/course_modes/signals.py

@@ -1,7 +1,7 @@
 """
 Signal handler for setting default course mode expiration dates
 """
-from __future__ import absolute_import, unicode_literals
+
 
 import logging
 

common/djangoapps/course_modes/tests/factories.py

@@ -1,7 +1,7 @@
 """
 Factories for course mode models.
 """
-from __future__ import absolute_import
+
 
 import random
 

common/djangoapps/course_modes/tests/test_admin.py

@@ -1,7 +1,7 @@
 """
 Tests for the course modes Django admin interface.
 """
-from __future__ import absolute_import, unicode_literals
+
 
 import unittest
 from datetime import datetime, timedelta

common/djangoapps/course_modes/tests/test_models.py

@@ -4,7 +4,7 @@ when you run "manage.py test".
 
 Replace this with more appropriate tests for your application.
 """
-from __future__ import absolute_import, unicode_literals
+
 
 import itertools
 from datetime import timedelta

common/djangoapps/course_modes/tests/test_signals.py

@@ -1,7 +1,7 @@
 """
 Unit tests for the course_mode signals
 """
-from __future__ import absolute_import, unicode_literals
+
 
 from datetime import datetime, timedelta
 

common/djangoapps/course_modes/tests/test_views.py

@@ -2,7 +2,7 @@
 Tests for course_modes views.
 """
 
-from __future__ import absolute_import
+
 
 import decimal
 import unittest

common/djangoapps/course_modes/urls.py

@@ -1,5 +1,5 @@
 """URLs for course_mode API"""
-from __future__ import absolute_import, unicode_literals
+
 
 from django.conf import settings
 from django.conf.urls import url

common/djangoapps/course_modes/views.py

@@ -1,7 +1,7 @@
 """
 Views for the course_mode module
 """
-from __future__ import absolute_import, unicode_literals
+
 
 import decimal
 import json

common/djangoapps/database_fixups/migrations/0001_initial.py

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

common/djangoapps/edxmako/apps.py

@@ -1,7 +1,7 @@
 """
 Configuration for the edxmako Django application.
 """
-from __future__ import absolute_import
+
 
 from django.apps import AppConfig
 from django.conf import settings

common/djangoapps/edxmako/backend.py

@@ -1,7 +1,7 @@
 """
 Django template system engine for Mako templates.
 """
-from __future__ import absolute_import, unicode_literals
+
 
 import logging
 

common/djangoapps/edxmako/makoloader.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import logging
 

common/djangoapps/edxmako/paths.py

@@ -2,7 +2,7 @@
 Set up lookup paths for mako templates.
 """
 
-from __future__ import absolute_import
+
 
 import contextlib
 import hashlib

common/djangoapps/edxmako/request_context.py

@@ -19,7 +19,7 @@ Methods for creating RequestContext for using with Mako templates.
 """
 
 
-from __future__ import absolute_import
+
 
 from crum import get_current_request
 from django.template import RequestContext

common/djangoapps/edxmako/shortcuts.py

@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-from __future__ import absolute_import
+
 
 import logging
 

common/djangoapps/edxmako/template.py

@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-from __future__ import absolute_import
+
 
 from django.conf import settings
 from django.template import Context, engines

common/djangoapps/edxmako/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import unittest
 

common/djangoapps/entitlements/admin.py

@@ -1,5 +1,5 @@
 """Admin forms for Course Entitlements"""
-from __future__ import absolute_import
+
 
 from django import forms
 from django.contrib import admin

common/djangoapps/entitlements/api/urls.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from django.conf.urls import include, url
 

common/djangoapps/entitlements/api/v1/filters.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from django_filters import rest_framework as filters
 

common/djangoapps/entitlements/api/v1/permissions.py

@@ -3,7 +3,7 @@ This module provides a custom DRF Permission class for supporting SAFE_METHODS t
 requiring Superuser access for all other Request types on an API endpoint.
 """
 
-from __future__ import absolute_import
+
 
 from rest_framework.permissions import SAFE_METHODS, BasePermission
 

common/djangoapps/entitlements/api/v1/serializers.py

@@ -1,7 +1,7 @@
 """
 Serializers for all Course Entitlement related return objects.
 """
-from __future__ import absolute_import
+
 
 from django.contrib.auth import get_user_model
 from rest_framework import serializers

common/djangoapps/entitlements/api/v1/tests/test_serializers.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import unittest
 

common/djangoapps/entitlements/api/v1/tests/test_views.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import json
 import logging

common/djangoapps/entitlements/api/v1/urls.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from django.conf.urls import include, url
 from rest_framework.routers import DefaultRouter

common/djangoapps/entitlements/api/v1/views.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import logging
 

common/djangoapps/entitlements/apps.py

@@ -4,7 +4,7 @@ Entitlements Application Configuration
 Signal handlers are connected here.
 """
 
-from __future__ import absolute_import
+
 
 from django.apps import AppConfig
 

common/djangoapps/entitlements/management/commands/expire_old_entitlements.py

@@ -2,7 +2,7 @@
 Management command for expiring old entitlements.
 """
 
-from __future__ import absolute_import
+
 
 import logging
 from textwrap import dedent

common/djangoapps/entitlements/management/commands/tests/test_expire_old_entitlements.py

@@ -1,6 +1,6 @@
 """Test Entitlements models"""
 
-from __future__ import absolute_import
+
 
 import mock
 from django.core.management import call_command

common/djangoapps/entitlements/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+
 
 import uuid
 

common/djangoapps/entitlements/migrations/0002_auto_20171102_0719.py

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

common/djangoapps/entitlements/migrations/0003_auto_20171205_1431.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+
 
 import datetime
 

common/djangoapps/entitlements/migrations/0004_auto_20171206_1729.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+
 
 import uuid
 

common/djangoapps/entitlements/migrations/0005_courseentitlementsupportdetail.py

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

common/djangoapps/entitlements/migrations/0006_courseentitlementsupportdetail_action.py

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

common/djangoapps/entitlements/migrations/0007_change_expiration_period_default.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+
 
 import datetime
 

common/djangoapps/entitlements/migrations/0008_auto_20180328_1107.py

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

common/djangoapps/entitlements/migrations/0009_courseentitlement_refund_locked.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-04-12 12:00
-from __future__ import absolute_import, unicode_literals
+
 
 from django.db import migrations, models
 

common/djangoapps/entitlements/migrations/0010_backfill_refund_lock.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+
 
 from datetime import datetime
 

common/djangoapps/entitlements/migrations/0011_historicalcourseentitlement.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-30 21:13
-from __future__ import unicode_literals
+
 
 from django.conf import settings
 from django.db import migrations, models

common/djangoapps/entitlements/migrations/0012_allow_blank_order_number_values.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.25 on 2019-10-23 15:47
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 

common/djangoapps/entitlements/migrations/0013_historicalcourseentitlementsupportdetail.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.26 on 2019-12-17 14:08
-from __future__ import unicode_literals
+
 
 from django.conf import settings
 from django.db import migrations, models

common/djangoapps/entitlements/models.py

@@ -1,6 +1,6 @@
 """Entitlement Models"""
 
-from __future__ import absolute_import
+
 
 import logging
 import uuid as uuid_tools

common/djangoapps/entitlements/signals.py

@@ -2,7 +2,7 @@
 Entitlements related signal handlers.
 """
 
-from __future__ import absolute_import
+
 
 from django.dispatch import receiver
 

common/djangoapps/entitlements/tasks.py

@@ -2,7 +2,7 @@
 This file contains celery tasks for entitlements-related functionality.
 """
 
-from __future__ import absolute_import
+
 
 from celery import task
 from celery.utils.log import get_task_logger

common/djangoapps/entitlements/tests/factories.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import string
 from uuid import uuid4

common/djangoapps/entitlements/tests/test_models.py

@@ -1,6 +1,6 @@
 """Test Entitlements models"""
 
-from __future__ import absolute_import
+
 
 import unittest
 from datetime import timedelta

common/djangoapps/entitlements/tests/test_tasks.py

@@ -2,7 +2,7 @@
 Test entitlements tasks
 """
 
-from __future__ import absolute_import
+
 
 from datetime import datetime, timedelta
 

common/djangoapps/entitlements/tests/test_utils.py

@@ -2,7 +2,7 @@
 Test entitlements utilities
 """
 
-from __future__ import absolute_import
+
 
 from datetime import timedelta
 

common/djangoapps/entitlements/utils.py

@@ -2,7 +2,7 @@
 Utility methods for the entitlement application.
 """
 
-from __future__ import absolute_import
+
 
 import logging
 

common/djangoapps/pipeline_mako/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from edxmako.shortcuts import render_to_string
 

common/djangoapps/pipeline_mako/helpers/studiofrontend.py

@@ -2,7 +2,7 @@
 Contains code that gets run inside our mako template
 Debugging python-in-mako is terrible, so we've moved the actual code out to its own file
 """
-from __future__ import absolute_import
+
 
 import logging
 

common/djangoapps/pipeline_mako/tests/test_render.py

@@ -1,6 +1,6 @@
 """ Tests for rendering functions in the mako pipeline. """
 
-from __future__ import absolute_import
+
 
 import ddt
 from mock import patch

common/djangoapps/pipeline_mako/tests/test_static_content.py

@@ -2,7 +2,7 @@
 Tests of pipeline_mako/templates/static_content.html
 """
 
-from __future__ import absolute_import
+
 
 import unittest
 

common/djangoapps/static_replace/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import logging
 import re

common/djangoapps/static_replace/admin.py

@@ -2,7 +2,7 @@
 Django admin page for AssetBaseUrlConfig, which allows you to set the base URL
 that gets prepended to asset URLs in order to serve them from, say, a CDN.
 """
-from __future__ import absolute_import
+
 
 from config_models.admin import ConfigurationModelAdmin
 from django.contrib import admin

common/djangoapps/static_replace/management/commands/clear_collectstatic_cache.py

@@ -2,7 +2,7 @@
 Django management command to clear the 'staticfiles' Django cache
 """
 
-from __future__ import absolute_import, print_function
+
 
 from django.core.management.base import BaseCommand
 from django.core.cache import caches

common/djangoapps/static_replace/migrations/0001_initial.py

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

common/djangoapps/static_replace/migrations/0002_assetexcludedextensionsconfig.py

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

common/djangoapps/static_replace/models.py

@@ -2,7 +2,7 @@
 Models for static_replace
 """
 
-from __future__ import absolute_import
+
 
 import six
 from six.moves import map

common/djangoapps/static_replace/test/test_static_replace.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """Tests for static_replace"""
-from __future__ import absolute_import, print_function
+
 
 import re
 from six import BytesIO

common/djangoapps/status/migrations/0001_initial.py

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

common/djangoapps/status/migrations/0002_update_help_text.py

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

common/djangoapps/status/models.py

@@ -2,7 +2,7 @@
 Store status messages in the database.
 """
 
-from __future__ import absolute_import
+
 
 import six
 from config_models.admin import ConfigurationModelAdmin

common/djangoapps/status/status.py

@@ -2,7 +2,7 @@
 A tiny app that checks for a status message.
 """
 
-from __future__ import absolute_import
+
 
 import logging
 

common/djangoapps/status/tests.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """ Tests for setting and displaying the site status message. """
-from __future__ import absolute_import
+
 
 import unittest
 

common/djangoapps/student/__init__.py

@@ -1,7 +1,7 @@
 """
 Student app helpers and settings
 """
-from __future__ import absolute_import
+
 
 from openedx.core.djangoapps.waffle_utils import WaffleSwitchNamespace
 

common/djangoapps/student/admin.py

@@ -1,5 +1,5 @@
 """ Django admin pages for student app """
-from __future__ import absolute_import
+
 
 from functools import wraps
 

common/djangoapps/student/apps.py

@@ -1,7 +1,7 @@
 """
 Configuration for the ``student`` Django application.
 """
-from __future__ import absolute_import
+
 
 import os
 

common/djangoapps/student/auth.py

@@ -4,7 +4,7 @@ authorization has authorization to do so, which infers authorization via role hi
 (GlobalStaff is superset of auths of course instructor, ...), which consults the config
 to decide whether to check course creator role, and other such functions.
 """
-from __future__ import absolute_import
+
 
 from ccx_keys.locator import CCXBlockUsageLocator, CCXLocator
 from django.conf import settings

common/djangoapps/student/forms.py

@@ -1,7 +1,7 @@
 """
 Utility functions for validating forms
 """
-from __future__ import absolute_import
+
 
 import re
 from importlib import import_module

common/djangoapps/student/helpers.py

@@ -1,7 +1,7 @@
 """
 Helpers for the student app.
 """
-from __future__ import absolute_import
+
 
 import json
 import logging

common/djangoapps/student/management/commands/add_to_group.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, print_function
+
 
 from django.contrib.auth.models import Group, User
 from django.core.management.base import BaseCommand, CommandError

common/djangoapps/student/management/commands/anonymized_id_mapping.py

@@ -8,7 +8,7 @@ the following:
 ./manage.py lms anonymized_id_mapping COURSE_ID
 """
 
-from __future__ import absolute_import
+
 
 import csv