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/ace_common/apps.py

@@ -1,7 +1,7 @@
 """
 Configuration for the ace_common Django app.
 """
-from __future__ import absolute_import
+
 
 from django.apps import AppConfig
 from django.utils.translation import ugettext_lazy as _

openedx/core/djangoapps/ace_common/message.py

@@ -1,7 +1,7 @@
 """
 Base Message types to be used to construct ace messages.
 """
-from __future__ import absolute_import
+
 
 from edx_ace.message import MessageType
 

openedx/core/djangoapps/ace_common/settings/devstack.py

@@ -2,7 +2,7 @@
 Settings for edX ACE on devstack.
 """
 
-from __future__ import absolute_import
+
 
 from openedx.core.djangoapps.ace_common.settings import common
 

openedx/core/djangoapps/ace_common/template_context.py

@@ -1,7 +1,7 @@
 """
 Context dictionary for templates that use the ace_common base template.
 """
-from __future__ import absolute_import
+
 
 from django.conf import settings
 from django.core.urlresolvers import NoReverseMatch

openedx/core/djangoapps/ace_common/templatetags/ace.py

@@ -1,5 +1,5 @@
 # pylint: disable=missing-docstring
-from __future__ import absolute_import
+
 
 from crum import get_current_request
 from django import template

openedx/core/djangoapps/ace_common/tests/mixins.py

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

openedx/core/djangoapps/ace_common/tests/test_message.py

@@ -1,7 +1,7 @@
 """
 Tests for ace message module
 """
-from __future__ import absolute_import
+
 
 import ddt
 from django.test import TestCase

openedx/core/djangoapps/ace_common/tests/test_templatetags.py

@@ -1,5 +1,5 @@
 # pylint: disable=missing-docstring
-from __future__ import absolute_import
+
 
 from django.template import VariableDoesNotExist
 from django.test import override_settings

openedx/core/djangoapps/ace_common/tests/test_tracking.py

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

openedx/core/djangoapps/ace_common/tracking.py

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

openedx/core/djangoapps/api_admin/admin.py

@@ -1,5 +1,5 @@
 """Admin views for API managment."""
-from __future__ import absolute_import
+
 
 from config_models.admin import ConfigurationModelAdmin
 from django.contrib import admin

openedx/core/djangoapps/api_admin/api/filters.py

@@ -1,7 +1,7 @@
 """
 Filters for api_admin api
 """
-from __future__ import absolute_import
+
 
 from rest_framework import filters
 

openedx/core/djangoapps/api_admin/api/urls.py

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

openedx/core/djangoapps/api_admin/api/v1/serializers.py

@@ -1,7 +1,7 @@
 """
 API v1 serializers.
 """
-from __future__ import absolute_import
+
 from rest_framework import serializers
 
 from openedx.core.djangoapps.api_admin.models import ApiAccessRequest

openedx/core/djangoapps/api_admin/api/v1/tests/test_views.py

@@ -1,7 +1,7 @@
 """
 Tests for the `api_admin` api module.
 """
-from __future__ import absolute_import
+
 import json
 
 from rest_framework.reverse import reverse

openedx/core/djangoapps/api_admin/api/v1/urls.py

@@ -1,7 +1,7 @@
 """
 URL definitions for api access request API v1.
 """
-from __future__ import absolute_import
+
 from django.conf.urls import url
 
 from openedx.core.djangoapps.api_admin.api.v1 import views

openedx/core/djangoapps/api_admin/api/v1/views.py

@@ -1,7 +1,7 @@
 """
 API Views.
 """
-from __future__ import absolute_import
+
 from django_filters.rest_framework import DjangoFilterBackend
 
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication

openedx/core/djangoapps/api_admin/decorators.py

@@ -1,5 +1,5 @@
 """Decorators for API access management."""
-from __future__ import absolute_import
+
 
 from functools import wraps
 

openedx/core/djangoapps/api_admin/forms.py

@@ -1,5 +1,5 @@
 """Forms for API management."""
-from __future__ import absolute_import
+
 
 from django import forms
 from django.contrib.auth.models import User

openedx/core/djangoapps/api_admin/management/commands/create_api_access_request.py

@@ -1,5 +1,5 @@
 """ Management command to create an ApiAccessRequest for given users """
-from __future__ import unicode_literals
+
 
 import logging
 from contextlib import contextmanager

openedx/core/djangoapps/api_admin/management/commands/delete_historical_api_admin_data.py

@@ -2,7 +2,7 @@
 Command to delete all rows from the api_admin_historicalapiaccessrequest table.
 """
 
-from __future__ import absolute_import
+
 import logging
 from openedx.core.djangoapps.api_admin.models import ApiAccessRequest
 from openedx.core.djangoapps.util.row_delete import delete_rows, BaseDeletionCommand

openedx/core/djangoapps/api_admin/migrations/0001_initial.py

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

openedx/core/djangoapps/api_admin/migrations/0002_auto_20160325_1604.py

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

openedx/core/djangoapps/api_admin/migrations/0003_auto_20160404_1618.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

openedx/core/djangoapps/api_admin/migrations/0004_auto_20160412_1506.py

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

openedx/core/djangoapps/api_admin/migrations/0005_auto_20160414_1232.py

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

openedx/core/djangoapps/api_admin/migrations/0006_catalog.py

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

openedx/core/djangoapps/api_admin/migrations/0007_delete_historical_api_records.py

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

openedx/core/djangoapps/api_admin/models.py

@@ -1,5 +1,5 @@
 """Models for API management."""
-from __future__ import absolute_import
+
 
 import logging
 from smtplib import SMTPException

openedx/core/djangoapps/api_admin/tests/factories.py

@@ -1,5 +1,5 @@
 """Factories for API management."""
-from __future__ import absolute_import
+
 
 import factory
 from factory.django import DjangoModelFactory

openedx/core/djangoapps/api_admin/tests/test_forms.py

@@ -1,6 +1,6 @@
 #pylint: disable=missing-docstring
 
-from __future__ import absolute_import
+
 
 import ddt
 from django.test import TestCase

openedx/core/djangoapps/api_admin/tests/test_models.py

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

openedx/core/djangoapps/api_admin/tests/test_views.py

@@ -1,6 +1,6 @@
 """ Tests for the api_admin app's views. """
 
-from __future__ import absolute_import
+
 
 import json
 

openedx/core/djangoapps/api_admin/urls.py

@@ -1,6 +1,6 @@
 """URLs for API access management."""
 
-from __future__ import absolute_import
+
 
 from django.conf.urls import include, url
 from django.contrib.admin.views.decorators import staff_member_required

openedx/core/djangoapps/api_admin/views.py

@@ -1,5 +1,5 @@
 """Views for API management."""
-from __future__ import absolute_import
+
 
 import logging
 

openedx/core/djangoapps/api_admin/widgets.py

@@ -1,6 +1,6 @@
 """ Form widget classes """
 
-from __future__ import absolute_import
+
 
 from django.conf import settings
 from django.forms.utils import flatatt

openedx/core/djangoapps/auth_exchange/forms.py

@@ -1,7 +1,7 @@
 """
 Forms to support third-party to first-party OAuth 2.0 access token exchange
 """
-from __future__ import absolute_import
+
 
 import provider.constants
 from django.contrib.auth.models import User

openedx/core/djangoapps/auth_exchange/tests/mixins.py

@@ -3,7 +3,7 @@ Mixins to facilitate testing OAuth connections to Django-OAuth-Toolkit or
 Django-OAuth2-Provider.
 """
 
-from __future__ import absolute_import
+
 
 from unittest import expectedFailure
 

openedx/core/djangoapps/auth_exchange/tests/test_forms.py

@@ -2,7 +2,7 @@
 """
 Tests for OAuth token exchange forms
 """
-from __future__ import absolute_import
+
 
 import unittest
 

openedx/core/djangoapps/auth_exchange/tests/test_views.py

@@ -4,7 +4,7 @@ Tests for OAuth token exchange views
 
 # pylint: disable=no-member
 
-from __future__ import absolute_import
+
 
 import json
 import unittest

openedx/core/djangoapps/auth_exchange/tests/utils.py

@@ -2,7 +2,7 @@
 Test utilities for OAuth access token exchange
 """
 
-from __future__ import absolute_import
+
 
 from django.conf import settings
 from social_django.models import Partial, UserSocialAuth

openedx/core/djangoapps/auth_exchange/views.py

@@ -9,7 +9,7 @@ The following are currently implemented:
 
 # pylint: disable=abstract-method
 
-from __future__ import absolute_import
+
 
 import django.contrib.auth as auth
 import social_django.utils as social_utils

openedx/core/djangoapps/bookmarks/__init__.py

@@ -1,7 +1,7 @@
 """
 Bookmarks module.
 """
-from __future__ import absolute_import
+
 
 from collections import namedtuple
 

openedx/core/djangoapps/bookmarks/api.py

@@ -1,7 +1,7 @@
 """
 Bookmarks Python API.
 """
-from __future__ import absolute_import
+
 
 import six
 from django.conf import settings

openedx/core/djangoapps/bookmarks/apps.py

@@ -1,7 +1,7 @@
 """
 Configuration for bookmarks Django app
 """
-from __future__ import absolute_import
+
 
 from django.apps import AppConfig
 from django.utils.translation import ugettext_lazy as _

openedx/core/djangoapps/bookmarks/migrations/0001_initial.py

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

openedx/core/djangoapps/bookmarks/models.py

@@ -1,7 +1,7 @@
 """
 Models for Bookmarks.
 """
-from __future__ import absolute_import
+
 
 import logging
 

openedx/core/djangoapps/bookmarks/serializers.py

@@ -1,7 +1,7 @@
 """
 Serializers for Bookmarks.
 """
-from __future__ import absolute_import
+
 
 import six
 from rest_framework import serializers

openedx/core/djangoapps/bookmarks/services.py

@@ -1,7 +1,7 @@
 """
 Bookmarks service.
 """
-from __future__ import absolute_import
+
 
 import logging
 

openedx/core/djangoapps/bookmarks/signals.py

@@ -1,7 +1,7 @@
 """
 Signals for bookmarks.
 """
-from __future__ import absolute_import
+
 
 from importlib import import_module
 

openedx/core/djangoapps/bookmarks/tasks.py

@@ -1,7 +1,7 @@
 """
 Tasks for bookmarks.
 """
-from __future__ import absolute_import
+
 
 import logging
 

openedx/core/djangoapps/bookmarks/tests/factories.py

@@ -2,7 +2,7 @@
 Factories for Bookmark models.
 """
 
-from __future__ import absolute_import
+
 
 from functools import partial
 

openedx/core/djangoapps/bookmarks/tests/test_api.py

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

openedx/core/djangoapps/bookmarks/tests/test_models.py

@@ -1,7 +1,7 @@
 """
 Tests for Bookmarks models.
 """
-from __future__ import absolute_import
+
 
 import datetime
 from contextlib import contextmanager

openedx/core/djangoapps/bookmarks/tests/test_services.py

@@ -2,7 +2,7 @@
 Tests for bookmark services.
 """
 
-from __future__ import absolute_import
+
 
 from opaque_keys.edx.keys import UsageKey
 

openedx/core/djangoapps/bookmarks/tests/test_tasks.py

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

openedx/core/djangoapps/bookmarks/tests/test_views.py

@@ -1,7 +1,7 @@
 """
 Tests for bookmark views.
 """
-from __future__ import absolute_import
+
 
 import json
 

openedx/core/djangoapps/bookmarks/urls.py

@@ -2,7 +2,7 @@
 URL routes for the bookmarks app.
 """
 
-from __future__ import absolute_import
+
 
 from django.conf import settings
 from django.conf.urls import url

openedx/core/djangoapps/bookmarks/views.py

@@ -4,7 +4,7 @@ HTTP end-points for the Bookmarks API.
 For more information, see:
 https://openedx.atlassian.net/wiki/display/TNL/Bookmarks+API
 """
-from __future__ import absolute_import
+
 
 import logging
 

openedx/core/djangoapps/cache_toolbox/app_settings.py

@@ -2,7 +2,7 @@
 Settings for cache_toolbox.
 """
 
-from __future__ import absolute_import
+
 
 from django.conf import settings
 

openedx/core/djangoapps/cache_toolbox/core.py

@@ -8,7 +8,7 @@ Core methods
 
 """
 
-from __future__ import absolute_import
+
 
 from django.core.cache import cache
 from django.db import DEFAULT_DB_ALIAS

openedx/core/djangoapps/cache_toolbox/middleware.py

@@ -78,7 +78,7 @@ choice for most environments but you may be happy with the trade-offs of the
 
 """
 
-from __future__ import absolute_import
+
 
 from logging import getLogger
 

openedx/core/djangoapps/cache_toolbox/model.py

@@ -54,7 +54,7 @@ instance::
     ... Foo.DoesNotExist
 """
 
-from __future__ import absolute_import
+
 
 from django.db.models.signals import post_delete, post_save
 

openedx/core/djangoapps/cache_toolbox/templatetags/cache_toolbox.py

@@ -2,7 +2,7 @@
 Implementation of custom django template tags for
 automatically caching template fragments.
 """
-from __future__ import absolute_import
+
 
 from django import template
 from django.core.cache import cache

openedx/core/djangoapps/cache_toolbox/tests/test_middleware.py

@@ -1,5 +1,5 @@
 """Tests for cached authentication middleware."""
-from __future__ import absolute_import
+
 
 from django.conf import settings
 from django.contrib.auth.models import User

openedx/core/djangoapps/catalog/admin.py

@@ -1,7 +1,7 @@
 """
 Django admin bindings for catalog support models.
 """
-from __future__ import absolute_import
+
 
 from config_models.admin import ConfigurationModelAdmin
 from django.contrib import admin

openedx/core/djangoapps/catalog/constants.py

@@ -1,5 +1,5 @@
 """ Constants associated with catalog """
-from __future__ import absolute_import
+
 
 from enum import Enum
 

openedx/core/djangoapps/catalog/management/commands/cache_programs.py

@@ -1,5 +1,5 @@
 """"Management command to add program information to the cache."""
-from __future__ import absolute_import
+
 
 import logging
 import sys

openedx/core/djangoapps/catalog/management/commands/create_catalog_integrations.py

@@ -1,6 +1,6 @@
 '''CatalogIntegration management command'''
 
-from __future__ import absolute_import
+
 from django.core.management import BaseCommand, CommandError
 from openedx.core.djangoapps.catalog.models import CatalogIntegration
 

openedx/core/djangoapps/catalog/management/commands/sync_course_runs.py

@@ -1,7 +1,7 @@
 """
 Sync course runs from catalog service.
 """
-from __future__ import absolute_import
+
 from collections import namedtuple
 import logging
 

openedx/core/djangoapps/catalog/management/commands/tests/test_cache_programs.py

@@ -1,7 +1,7 @@
 """
 Test cases for cache_programs command.
 """
-from __future__ import absolute_import
+
 import json
 
 import httpretty

openedx/core/djangoapps/catalog/management/commands/tests/test_create_catalog_integrations.py

@@ -1,7 +1,7 @@
 """
 Test cases for catalog_integrations command.
 """
-from __future__ import absolute_import
+
 from django.test import TestCase
 from django.core.management import call_command, CommandError
 

openedx/core/djangoapps/catalog/management/commands/tests/test_sync_course_runs.py

@@ -1,7 +1,7 @@
 """
 Tests for the sync course runs management command.
 """
-from __future__ import absolute_import
+
 import ddt
 import mock
 

openedx/core/djangoapps/catalog/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

openedx/core/djangoapps/catalog/migrations/0002_catalogintegration_username.py

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

openedx/core/djangoapps/catalog/migrations/0003_catalogintegration_page_size.py

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

openedx/core/djangoapps/catalog/migrations/0004_auto_20170616_0618.py

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

openedx/core/djangoapps/catalog/migrations/0005_catalogintegration_long_term_cache_ttl.py

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

openedx/core/djangoapps/catalog/models.py

@@ -1,5 +1,5 @@
 """Models governing integration with the catalog service."""
-from __future__ import absolute_import
+
 
 from config_models.models import ConfigurationModel
 from django.conf import settings

openedx/core/djangoapps/catalog/tests/factories.py

@@ -1,6 +1,6 @@
 """Factories for generating fake catalog data."""
 # pylint: disable=missing-docstring, invalid-name
-from __future__ import absolute_import
+
 
 import uuid
 from functools import partial

openedx/core/djangoapps/catalog/tests/mixins.py

@@ -1,5 +1,5 @@
 """Mixins to help test catalog integration."""
-from __future__ import absolute_import
+
 
 from openedx.core.djangoapps.catalog.models import CatalogIntegration
 

openedx/core/djangoapps/catalog/tests/test_models.py

@@ -1,5 +1,5 @@
 """Catalog model tests."""
-from __future__ import absolute_import
+
 
 import ddt
 import mock

openedx/core/djangoapps/catalog/tests/test_utils.py

@@ -1,7 +1,7 @@
 """Tests covering utilities for integrating with the catalog service."""
 # pylint: disable=missing-docstring
 
-from __future__ import absolute_import
+
 
 from collections import defaultdict
 from datetime import timedelta

openedx/core/djangoapps/catalog/urls.py

@@ -1,7 +1,7 @@
 """
 Defines the URL routes for this app.
 """
-from __future__ import absolute_import
+
 
 from django.conf.urls import url
 

openedx/core/djangoapps/catalog/utils.py

@@ -1,5 +1,5 @@
 """Helper functions for working with the catalog service."""
-from __future__ import absolute_import, unicode_literals
+
 
 import copy
 import datetime

openedx/core/djangoapps/catalog/views.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from django.conf import settings
 from django.core.management import call_command

openedx/core/djangoapps/ccxcon/admin.py

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

openedx/core/djangoapps/ccxcon/api.py

@@ -2,7 +2,7 @@
 Module containing API functions for the CCXCon
 """
 
-from __future__ import absolute_import
+
 
 import logging
 

openedx/core/djangoapps/ccxcon/apps.py

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

openedx/core/djangoapps/ccxcon/migrations/0001_initial_ccxcon_model.py

@@ -1,7 +1,7 @@
 """
 Initial migration
 """
-from __future__ import absolute_import, unicode_literals
+
 
 from django.db import migrations, models
 

openedx/core/djangoapps/ccxcon/migrations/0002_auto_20160325_0407.py

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

openedx/core/djangoapps/ccxcon/models.py

@@ -2,7 +2,7 @@
 Models for the ccxcon
 """
 
-from __future__ import absolute_import
+
 
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible

openedx/core/djangoapps/ccxcon/signals.py

@@ -1,7 +1,7 @@
 """
 Signal handler for posting course updated to CCXCon
 """
-from __future__ import absolute_import
+
 
 import six
 from django.dispatch.dispatcher import receiver

openedx/core/djangoapps/ccxcon/tasks.py

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

openedx/core/djangoapps/ccxcon/tests/factories.py

@@ -1,7 +1,7 @@
 """
 Dummy factories for tests
 """
-from __future__ import absolute_import
+
 
 from factory.django import DjangoModelFactory
 

openedx/core/djangoapps/ccxcon/tests/test_api.py

@@ -2,7 +2,7 @@
 Unit tests for the API module
 """
 
-from __future__ import absolute_import
+
 
 import datetime
 

openedx/core/djangoapps/ccxcon/tests/test_signals.py

@@ -2,7 +2,7 @@
 Test for contentstore signals receiver
 """
 
-from __future__ import absolute_import
+
 
 import mock
 from django.test import TestCase

openedx/core/djangoapps/ccxcon/tests/test_tasks.py

@@ -2,7 +2,7 @@
 Tests for the CCXCon celery tasks
 """
 
-from __future__ import absolute_import
+
 
 import mock
 from django.test import TestCase

openedx/core/djangoapps/certificates/api.py

@@ -1,7 +1,7 @@
 """
 The public API for certificates.
 """
-from __future__ import absolute_import
+
 
 import logging
 from datetime import datetime

openedx/core/djangoapps/certificates/config/waffle.py

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