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

openedx/core/djangoapps/content/block_structure/admin.py

@@ -1,7 +1,7 @@
 """
 Django Admin for Block Structures.
 """
-from __future__ import absolute_import
+
 
 from config_models.admin import ConfigurationModelAdmin
 from django.contrib import admin

openedx/core/djangoapps/content/block_structure/api.py

@@ -1,7 +1,7 @@
 """
 Higher order functions built on the BlockStructureManager to interact with a django cache.
 """
-from __future__ import absolute_import
+
 
 from django.core.cache import cache
 

openedx/core/djangoapps/content/block_structure/apps.py

@@ -2,7 +2,7 @@
 Configuration for block_structure djangoapp
 """
 
-from __future__ import absolute_import
+
 
 from django.apps import AppConfig
 

openedx/core/djangoapps/content/block_structure/block_structure.py

@@ -8,7 +8,7 @@ The following internal data structures are implemented:
     _BlockRelations - Data structure for a single block's relations.
     _BlockData - Data structure for a single block's data.
 """
-from __future__ import absolute_import
+
 
 from copy import deepcopy
 from functools import partial

openedx/core/djangoapps/content/block_structure/config/__init__.py

@@ -2,7 +2,7 @@
 This module contains various configuration settings via
 waffle switches for the Block Structure framework.
 """
-from __future__ import absolute_import
+
 
 from openedx.core.djangoapps.waffle_utils import WaffleSwitchNamespace
 from openedx.core.lib.cache_utils import request_cached

openedx/core/djangoapps/content/block_structure/config/models.py

@@ -1,7 +1,7 @@
 """
 Models for configuration of Block Structures.
 """
-from __future__ import absolute_import
+
 
 from config_models.models import ConfigurationModel
 from django.db.models import IntegerField

openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py

@@ -1,7 +1,7 @@
 """
 Command to load course blocks.
 """
-from __future__ import absolute_import
+
 
 import logging
 

openedx/core/djangoapps/content/block_structure/management/commands/tests/test_generate_course_blocks.py

@@ -1,7 +1,7 @@
 """
 Tests for generate_course_blocks management command.
 """
-from __future__ import absolute_import
+
 
 import itertools
 

openedx/core/djangoapps/content/block_structure/manager.py

@@ -2,7 +2,7 @@
 Top-level module for the Block Structure framework with a class for managing
 BlockStructures.
 """
-from __future__ import absolute_import
+
 
 from contextlib import contextmanager
 

openedx/core/djangoapps/content/block_structure/migrations/0001_config.py

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

openedx/core/djangoapps/content/block_structure/migrations/0002_blockstructuremodel.py

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

openedx/core/djangoapps/content/block_structure/migrations/0003_blockstructuremodel_storage.py

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

openedx/core/djangoapps/content/block_structure/migrations/0004_blockstructuremodel_usagekeywithrun.py

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

openedx/core/djangoapps/content/block_structure/models.py

@@ -2,7 +2,7 @@
 Models used by the block structure framework.
 """
 
-from __future__ import absolute_import
+
 
 import errno
 from contextlib import contextmanager

openedx/core/djangoapps/content/block_structure/signals.py

@@ -1,7 +1,7 @@
 """
 Signal handlers for invalidating cached data.
 """
-from __future__ import absolute_import
+
 
 import six
 from django.conf import settings

openedx/core/djangoapps/content/block_structure/store.py

@@ -2,7 +2,7 @@
 Module for the Storage of BlockStructure objects.
 """
 # pylint: disable=protected-access
-from __future__ import absolute_import
+
 
 from logging import getLogger
 

openedx/core/djangoapps/content/block_structure/tasks.py

@@ -1,7 +1,7 @@
 """
 Asynchronous tasks related to the Course Blocks sub-application.
 """
-from __future__ import absolute_import
+
 
 import logging
 

openedx/core/djangoapps/content/block_structure/tests/helpers.py

@@ -1,7 +1,7 @@
 """
 Common utilities for tests in block_structure module
 """
-from __future__ import absolute_import
+
 
 from contextlib import contextmanager
 from uuid import uuid4

openedx/core/djangoapps/content/block_structure/tests/test_block_structure.py

@@ -1,7 +1,7 @@
 """
 Tests for block_structure.py
 """
-from __future__ import absolute_import
+
 
 import itertools
 # pylint: disable=protected-access

openedx/core/djangoapps/content/block_structure/tests/test_factory.py

@@ -1,7 +1,7 @@
 """
 Tests for block_structure_factory.py
 """
-from __future__ import absolute_import
+
 
 from django.test import TestCase
 

openedx/core/djangoapps/content/block_structure/tests/test_manager.py

@@ -1,7 +1,7 @@
 """
 Tests for manager.py
 """
-from __future__ import absolute_import
+
 
 import ddt
 import six

openedx/core/djangoapps/content/block_structure/tests/test_models.py

@@ -2,7 +2,7 @@
 Unit tests for Block Structure models.
 """
 # pylint: disable=protected-access
-from __future__ import absolute_import
+
 
 import errno
 from itertools import product

openedx/core/djangoapps/content/block_structure/tests/test_signals.py

@@ -1,7 +1,7 @@
 """
 Unit tests for the Course Blocks signals
 """
-from __future__ import absolute_import
+
 
 import ddt
 from mock import patch

openedx/core/djangoapps/content/block_structure/tests/test_store.py

@@ -1,7 +1,7 @@
 """
 Tests for block_structure/cache.py
 """
-from __future__ import absolute_import
+
 
 import ddt
 

openedx/core/djangoapps/content/block_structure/tests/test_tasks.py

@@ -2,7 +2,7 @@
 Unit tests for the Course Blocks tasks
 """
 
-from __future__ import absolute_import
+
 
 from mock import patch
 

openedx/core/djangoapps/content/block_structure/tests/test_transformer_registry.py

@@ -2,7 +2,7 @@
 Tests for transformer_registry.py
 """
 
-from __future__ import absolute_import
+
 
 from unittest import TestCase
 

openedx/core/djangoapps/content/block_structure/tests/test_transformers.py

@@ -1,7 +1,7 @@
 """
 Tests for transformers.py
 """
-from __future__ import absolute_import
+
 
 from unittest import TestCase
 

openedx/core/djangoapps/content/block_structure/transformer.py

@@ -2,7 +2,7 @@
 This module provides the abstract base class for all Block Structure
 Transformers.
 """
-from __future__ import absolute_import
+
 
 from abc import abstractmethod
 

openedx/core/djangoapps/content/block_structure/transformer_registry.py

@@ -2,7 +2,7 @@
 Block Structure Transformer Registry implemented using the platform's
 PluginManager.
 """
-from __future__ import absolute_import
+
 
 from base64 import b64encode
 from hashlib import sha1

openedx/core/djangoapps/content/block_structure/transformers.py

@@ -1,7 +1,7 @@
 """
 Module for a collection of BlockStructureTransformers.
 """
-from __future__ import absolute_import
+
 
 import functools
 from logging import getLogger

openedx/core/djangoapps/content/course_overviews/admin.py

@@ -3,7 +3,7 @@ Django admin page for CourseOverviews, the basic metadata about a course that
 is used in user dashboard queries and other places where you need info like
 name, and start dates, but don't actually need to crawl into course content.
 """
-from __future__ import absolute_import
+
 
 from config_models.admin import ConfigurationModelAdmin
 from django.contrib import admin

openedx/core/djangoapps/content/course_overviews/apps.py

@@ -1,7 +1,7 @@
 """
 Configuration for course_overviews Django app
 """
-from __future__ import absolute_import
+
 
 from django.apps import AppConfig
 

openedx/core/djangoapps/content/course_overviews/management/commands/generate_course_overview.py

@@ -2,7 +2,7 @@
 Command to load course overviews.
 """
 
-from __future__ import absolute_import
+
 
 import logging
 

openedx/core/djangoapps/content/course_overviews/management/commands/simulate_publish.py

@@ -11,7 +11,7 @@ This management command will emit the SignalHandler.course_published signal for
 some subset of courses and signal listeners, and then rely on existing listener
 behavior to trigger the necessary data updates.
 """
-from __future__ import absolute_import, print_function
+
 
 import copy
 import logging

openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py

@@ -1,7 +1,7 @@
 """
 Tests that the generate_course_overview management command actually generates course overviews.
 """
-from __future__ import absolute_import
+
 
 import six
 from django.core.management.base import CommandError

openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_simulate_publish.py

@@ -1,7 +1,7 @@
 """
 Tests the simulate_publish management command.
 """
-from __future__ import absolute_import
+
 
 import six
 

openedx/core/djangoapps/content/course_overviews/migrations/0001_initial.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0002_add_course_catalog_fields.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0003_courseoverviewgeneratedhistory.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0004_courseoverview_org.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0005_delete_courseoverviewgeneratedhistory.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0006_courseoverviewimageset.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0007_courseoverviewimageconfig.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0008_remove_courseoverview_facebook_url.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0009_readd_facebook_url.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0010_auto_20160329_2317.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0011_courseoverview_marketing_url.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0012_courseoverview_eligible_for_financial_aid.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0013_courseoverview_language.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0014_courseoverview_certificate_available_date.py

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

openedx/core/djangoapps/content/course_overviews/migrations/0015_historicalcourseoverview.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

openedx/core/djangoapps/content/course_overviews/migrations/0016_simulatecoursepublishconfig.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.23 on 2019-09-16 10:45
-from __future__ import unicode_literals
+
 
 from django.conf import settings
 from django.db import migrations, models

openedx/core/djangoapps/content/course_overviews/migrations/0017_auto_20191002_0823.py

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

openedx/core/djangoapps/content/course_overviews/models.py

@@ -1,7 +1,7 @@
 """
 Declaration of CourseOverview model
 """
-from __future__ import absolute_import
+
 
 import json
 import logging

openedx/core/djangoapps/content/course_overviews/signals.py

@@ -1,7 +1,7 @@
 """
 Signal handler for invalidating cached course overviews
 """
-from __future__ import absolute_import
+
 
 import logging
 

openedx/core/djangoapps/content/course_overviews/tasks.py

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

openedx/core/djangoapps/content/course_overviews/tests/factories.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from datetime import timedelta
 import json

openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py

@@ -1,7 +1,7 @@
 """
 Tests for course_overviews app.
 """
-from __future__ import absolute_import
+
 
 import datetime
 import itertools

openedx/core/djangoapps/content/course_overviews/tests/test_signals.py

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

openedx/core/djangoapps/content/course_overviews/tests/test_tasks.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import mock
 import six