Run 2to3 -f future . -w

This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future

cms/__init__.py

@@ -2,7 +2,7 @@
 Celery needs to be loaded when the cms modules are so that task
 registration and discovery can work correctly.
 """
-from __future__ import absolute_import
+
 
 # We monkey patch Kombu's entrypoints listing because scanning through this
 # accounts for the majority of LMS/Studio startup time for tests, and we don't

cms/celery.py

@@ -4,7 +4,7 @@
 
 Taken from: https://celery.readthedocs.org/en/latest/django/first-steps-with-django.html
 """
-from __future__ import absolute_import
+
 
 import os
 

cms/conftest.py

@@ -6,7 +6,7 @@
 only running cms tests.
 """
 
-from __future__ import absolute_import, unicode_literals
+
 
 import importlib
 import os

cms/djangoapps/api/apps.py

@@ -2,7 +2,7 @@
 Configuration for Studio API Django application
 """
 
-from __future__ import absolute_import
+
 
 from django.apps import AppConfig
 

cms/djangoapps/api/urls.py

@@ -2,7 +2,7 @@
 URLs for the Studio API app
 """
 
-from __future__ import absolute_import
+
 
 from django.conf.urls import include, url
 

cms/djangoapps/api/v1/serializers/course_runs.py

@@ -1,5 +1,5 @@
 """ Course run serializers. """
-from __future__ import absolute_import
+
 
 import logging
 import time  # pylint: disable=unused-import

cms/djangoapps/api/v1/tests/test_serializers/test_course_runs.py

@@ -1,6 +1,6 @@
 """Tests for course run serializers"""
 
-from __future__ import absolute_import
+
 
 import datetime
 

cms/djangoapps/api/v1/tests/test_views/test_course_runs.py

@@ -1,6 +1,6 @@
 """Tests for Course run views"""
 
-from __future__ import absolute_import
+
 
 import datetime
 

cms/djangoapps/api/v1/urls.py

@@ -2,7 +2,7 @@
 URLs for the Studio API [Course Run]
 """
 
-from __future__ import absolute_import
+
 
 from rest_framework.routers import DefaultRouter
 

cms/djangoapps/api/v1/views/course_runs.py

@@ -1,6 +1,6 @@
 """HTTP endpoints for the Course Run API."""
 
-from __future__ import absolute_import
+
 
 from django.conf import settings
 from django.http import Http404

cms/djangoapps/cms_user_tasks/apps.py

@@ -3,7 +3,7 @@
 Signal handlers are connected here.
 """
 
-from __future__ import absolute_import
+
 
 from django.apps import AppConfig
 

cms/djangoapps/cms_user_tasks/signals.py

@@ -1,7 +1,7 @@
 """
 Receivers of signals sent from django-user-tasks
 """
-from __future__ import absolute_import, print_function, unicode_literals
+
 
 import logging
 

cms/djangoapps/cms_user_tasks/tasks.py

@@ -2,7 +2,7 @@
 Celery tasks used by cms_user_tasks
 """
 
-from __future__ import absolute_import
+
 
 from boto.exception import NoAuthHandlerFound
 from celery.exceptions import MaxRetriesExceededError

cms/djangoapps/cms_user_tasks/tests.py

@@ -2,7 +2,7 @@
 Unit tests for integration of the django-user-tasks app and its REST API.
 """
 
-from __future__ import absolute_import, print_function, unicode_literals
+
 
 import logging
 from uuid import uuid4

cms/djangoapps/contentstore/admin.py

@@ -2,7 +2,7 @@
 Admin site bindings for contentstore
 """
 
-from __future__ import absolute_import
+
 
 from config_models.admin import ConfigurationModelAdmin
 from django.contrib import admin

cms/djangoapps/contentstore/api/tests/base.py

@@ -1,7 +1,7 @@
 """
 Base test case for the course API views.
 """
-from __future__ import absolute_import
+
 
 from django.core.urlresolvers import reverse
 from rest_framework.test import APITestCase

cms/djangoapps/contentstore/api/tests/test_import.py

@@ -1,7 +1,7 @@
 """
 Tests for the course import API views
 """
-from __future__ import absolute_import
+
 
 import os
 import tarfile

cms/djangoapps/contentstore/api/tests/test_quality.py

@@ -1,7 +1,7 @@
 """
 Tests for the course import API views
 """
-from __future__ import absolute_import
+
 
 from rest_framework import status
 

cms/djangoapps/contentstore/api/tests/test_validation.py

@@ -1,7 +1,7 @@
 """
 Tests for the course import API views
 """
-from __future__ import absolute_import
+
 
 from datetime import datetime
 

cms/djangoapps/contentstore/api/urls.py

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

cms/djangoapps/contentstore/api/views/course_import.py

@@ -1,7 +1,7 @@
 """
 APIs related to Course Import.
 """
-from __future__ import absolute_import
+
 
 import base64
 import logging

cms/djangoapps/contentstore/api/views/course_quality.py

@@ -1,5 +1,5 @@
 # pylint: disable=missing-docstring
-from __future__ import absolute_import
+
 
 import logging
 import time

cms/djangoapps/contentstore/api/views/course_validation.py

@@ -1,5 +1,5 @@
 # pylint: disable=missing-docstring
-from __future__ import absolute_import
+
 
 import logging
 

cms/djangoapps/contentstore/api/views/utils.py

@@ -1,7 +1,7 @@
 """
 Common utilities for Contentstore APIs.
 """
-from __future__ import absolute_import
+
 
 from contextlib import contextmanager
 

cms/djangoapps/contentstore/apps.py

@@ -4,7 +4,7 @@
 Above-modulestore level signal handlers are connected here.
 """
 
-from __future__ import absolute_import
+
 
 from django.apps import AppConfig
 

cms/djangoapps/contentstore/config/waffle.py

@@ -2,7 +2,7 @@
 This module contains various configuration settings via
 waffle switches for the contentstore app.
 """
-from __future__ import absolute_import
+
 
 from openedx.core.djangoapps.waffle_utils import CourseWaffleFlag, WaffleFlagNamespace, WaffleSwitchNamespace
 

cms/djangoapps/contentstore/config/waffle_utils.py

@@ -1,6 +1,6 @@
 """Util methods for Waffle checks"""
 
-from __future__ import absolute_import
+
 
 from cms.djangoapps.contentstore.config.waffle import ENABLE_CHECKLISTS_QUALITY
 

cms/djangoapps/contentstore/course_group_config.py

@@ -1,7 +1,7 @@
 """
 Class for manipulating groups configuration on a course object.
 """
-from __future__ import absolute_import
+
 
 import json
 import logging

cms/djangoapps/contentstore/course_info_model.py

@@ -12,7 +12,7 @@
 }
 """
 
-from __future__ import absolute_import
+
 
 import logging
 import re

cms/djangoapps/contentstore/courseware_index.py

@@ -1,5 +1,5 @@
 """ Code to allow module store to interface with courseware index """
-from __future__ import absolute_import
+
 
 import logging
 import re

cms/djangoapps/contentstore/debug_file_uploader.py

@@ -1,6 +1,6 @@
 """ Upload file handler to help test progress bars in uploads. """
 
-from __future__ import absolute_import
+
 
 import time
 

cms/djangoapps/contentstore/git_export_utils.py

@@ -3,7 +3,7 @@
 committing and pushing the changes.
 """
 
-from __future__ import absolute_import
+
 
 import logging
 import os

cms/djangoapps/contentstore/management/commands/clean_cert_name.py

@@ -3,7 +3,7 @@
 erroneous certificate names.
 """
 
-from __future__ import absolute_import
+
 
 from collections import namedtuple
 

cms/djangoapps/contentstore/management/commands/cleanup_assets.py

@@ -2,7 +2,7 @@
 Script for removing all redundant Mac OS metadata files (with filename ".DS_Store"
 or with filename which starts with "._") for all courses
 """
-from __future__ import absolute_import
+
 
 import logging
 

cms/djangoapps/contentstore/management/commands/create_course.py

@@ -1,7 +1,7 @@
 """
 Django management command to create a course in a specific modulestore
 """
-from __future__ import absolute_import
+
 
 from datetime import datetime, timedelta
 

cms/djangoapps/contentstore/management/commands/delete_course.py

@@ -1,7 +1,7 @@
 """
 Management Command to delete course.
 """
-from __future__ import absolute_import, print_function
+
 
 from django.core.management.base import BaseCommand, CommandError
 from opaque_keys import InvalidKeyError

cms/djangoapps/contentstore/management/commands/delete_orphans.py

@@ -1,5 +1,5 @@
 """Script for deleting orphans"""
-from __future__ import absolute_import, print_function
+
 
 from django.core.management.base import BaseCommand, CommandError
 from opaque_keys import InvalidKeyError

cms/djangoapps/contentstore/management/commands/edit_course_tabs.py

@@ -6,7 +6,7 @@
 # Run it this way:
 #   ./manage.py cms --settings dev edit_course_tabs --course Stanford/CS99/2013_spring
 #
-from __future__ import absolute_import, print_function
+
 
 from django.core.management.base import BaseCommand, CommandError
 from opaque_keys.edx.keys import CourseKey

cms/djangoapps/contentstore/management/commands/empty_asset_trashcan.py

@@ -1,6 +1,6 @@
 """Script to Empty the trashcan"""
 
-from __future__ import absolute_import
+
 
 from django.core.management.base import BaseCommand
 from opaque_keys.edx.keys import CourseKey

cms/djangoapps/contentstore/management/commands/export.py

@@ -1,7 +1,7 @@
 """
 Script for exporting courseware from Mongo to a tar.gz file
 """
-from __future__ import absolute_import, print_function
+
 
 import os
 

cms/djangoapps/contentstore/management/commands/export_all_courses.py

@@ -1,7 +1,7 @@
 """
 Script for exporting all courseware from Mongo to a directory and listing the courses which failed to export
 """
-from __future__ import absolute_import, print_function
+
 
 from django.core.management.base import BaseCommand
 from six import text_type

cms/djangoapps/contentstore/management/commands/export_content_library.py

@@ -1,7 +1,7 @@
 """
 Script for exporting a content library from Mongo to a tar.gz file
 """
-from __future__ import absolute_import, print_function
+
 
 import os
 import shutil

cms/djangoapps/contentstore/management/commands/export_olx.py

@@ -14,7 +14,7 @@
 * It only supports the export of courses.  It does not export libraries.
 """
 
-from __future__ import absolute_import
+
 
 import os
 import re

cms/djangoapps/contentstore/management/commands/fix_not_found.py

@@ -1,7 +1,7 @@
 """
 Script for fixing the item not found errors in a course
 """
-from __future__ import absolute_import
+
 
 from django.core.management.base import BaseCommand, CommandError
 from opaque_keys.edx.keys import CourseKey

cms/djangoapps/contentstore/management/commands/force_publish.py

@@ -1,7 +1,7 @@
 """
 Script for force publishing a course
 """
-from __future__ import absolute_import, print_function
+
 
 from django.core.management.base import BaseCommand, CommandError
 from opaque_keys import InvalidKeyError

cms/djangoapps/contentstore/management/commands/generate_courses.py

@@ -1,7 +1,7 @@
 """
 Django management command to generate a test course from a course config json
 """
-from __future__ import absolute_import
+
 
 import json
 import logging