Reorder imports using isort (except lms and cms)

common/djangoapps/course_action_state/managers.py

@@ -2,6 +2,7 @@
 Model Managers for Course Actions
 """
 import traceback
+
 from django.db import models, transaction
 
 

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

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
 from django.conf import settings
+from django.db import migrations, models
+
 from openedx.core.djangoapps.xmodule_django.models import CourseKeyField
 
 

common/djangoapps/course_action_state/models.py

@@ -11,8 +11,9 @@
 """
 from django.contrib.auth.models import User
 from django.db import models
-from openedx.core.djangoapps.xmodule_django.models import CourseKeyField
+
 from course_action_state.managers import CourseActionStateManager, CourseRerunUIStateManager
+from openedx.core.djangoapps.xmodule_django.models import CourseKeyField
 
 
 class CourseActionState(models.Model):

common/djangoapps/course_action_state/tests/test_managers.py

@@ -2,13 +2,14 @@
 """
 Tests for basic common operations related to Course Action State managers
 """
-from ddt import ddt, data
-from django.test import TestCase
 from collections import namedtuple
+
+from ddt import data, ddt
+from django.test import TestCase
 from opaque_keys.edx.locations import CourseLocator
-from course_action_state.models import CourseRerunState
-from course_action_state.managers import CourseActionStateItemNotFoundError
 
+from course_action_state.managers import CourseActionStateItemNotFoundError
+from course_action_state.models import CourseRerunState
 
 # Sequence of Action models to be tested with ddt.
 COURSE_ACTION_STATES = (CourseRerunState, )

common/djangoapps/course_action_state/tests/test_rerun_manager.py

@@ -4,8 +4,9 @@
 
 from django.test import TestCase
 from opaque_keys.edx.locations import CourseLocator
-from course_action_state.models import CourseRerunState
+
 from course_action_state.managers import CourseRerunUIStateManager
+from course_action_state.models import CourseRerunState
 from student.tests.factories import UserFactory
 
 

common/djangoapps/course_modes/helpers.py

@@ -2,11 +2,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from course_modes.models import CourseMode
-from student.helpers import (
-    VERIFY_STATUS_NEED_TO_VERIFY,
-    VERIFY_STATUS_SUBMITTED,
-    VERIFY_STATUS_APPROVED
-)
+from student.helpers import VERIFY_STATUS_APPROVED, VERIFY_STATUS_NEED_TO_VERIFY, VERIFY_STATUS_SUBMITTED
 
 DISPLAY_VERIFIED = "verified"
 DISPLAY_HONOR = "honor"

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

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+
 from openedx.core.djangoapps.xmodule_django.models import CourseKeyField
 
 

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

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 from datetime import timedelta
 
-from django.db import migrations, models
 import django.db.models.deletion
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

common/djangoapps/course_modes/models.py

@@ -1,19 +1,19 @@
 """
 Add and create new modes for running courses on this particular LMS
 """
+from collections import defaultdict, namedtuple
 from datetime import datetime, timedelta
-import pytz
 
-from collections import namedtuple, defaultdict
+import pytz
 from config_models.models import ConfigurationModel
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import Q
 from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy as _
-from openedx.core.djangoapps.xmodule_django.models import CourseKeyField
-from request_cache.middleware import ns_request_cached, RequestCache
 
+from openedx.core.djangoapps.xmodule_django.models import CourseKeyField
+from request_cache.middleware import RequestCache, ns_request_cached
 
 Mode = namedtuple('Mode',
                   [

common/djangoapps/course_modes/signals.py

@@ -3,6 +3,7 @@
 """
 from django.core.exceptions import ObjectDoesNotExist
 from django.dispatch.dispatcher import receiver
+
 from xmodule.modulestore.django import SignalHandler, modulestore
 
 from .models import CourseMode, CourseModeExpirationConfig

common/djangoapps/course_modes/tests/factories.py

@@ -3,11 +3,12 @@
 """
 import random
 
-from course_modes.models import CourseMode
-from factory.django import DjangoModelFactory
 from factory import lazy_attribute
+from factory.django import DjangoModelFactory
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
+from course_modes.models import CourseMode
+
 
 # Factories are self documenting
 # pylint: disable=missing-docstring

common/djangoapps/course_modes/tests/test_admin.py

@@ -5,24 +5,22 @@
 from datetime import datetime, timedelta
 
 import ddt
-from pytz import timezone, UTC
-
 from django.conf import settings
 from django.core.urlresolvers import reverse
+from pytz import UTC, timezone
 
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from util.date_utils import get_time_display
-from xmodule.modulestore.tests.factories import CourseFactory
-from student.tests.factories import UserFactory
-from course_modes.models import CourseMode
 from course_modes.admin import CourseModeForm
+from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
-
 # Technically, we shouldn't be importing verify_student, since it's
 # defined in the LMS and course_modes is in common.  However, the benefits
 # of putting all this configuration in one place outweigh the downsides.
 # Once the course admin tool is deployed, we can remove this dependency.
 from lms.djangoapps.verify_student.models import VerificationDeadline
+from student.tests.factories import UserFactory
+from util.date_utils import get_time_display
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
 
 
 # We can only test this in the LMS because the course modes admin relies

common/djangoapps/course_modes/tests/test_models.py

@@ -5,15 +5,15 @@
 Replace this with more appropriate tests for your application.
 """
 
-from datetime import datetime, timedelta
 import itertools
+from datetime import datetime, timedelta
 
 import ddt
+import pytz
 from django.core.exceptions import ValidationError
 from django.test import TestCase
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from opaque_keys.edx.locator import CourseLocator
-import pytz
 
 from course_modes.helpers import enrollment_mode_display
 from course_modes.models import CourseMode, Mode, invalidate_course_mode_cache

common/djangoapps/course_modes/tests/test_signals.py

@@ -3,15 +3,15 @@
 """
 
 from datetime import datetime, timedelta
-from mock import patch
 
 import ddt
+from mock import patch
 from pytz import UTC
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory
 
 from course_modes.models import CourseMode
 from course_modes.signals import _listen_for_course_publish
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
 
 
 @ddt.ddt

common/djangoapps/course_modes/tests/test_views.py

@@ -2,34 +2,33 @@
 Tests for course_modes views.
 """
 
-from datetime import datetime
-import unittest
 import decimal
+import unittest
+from datetime import datetime
+
 import ddt
-import httpretty
 import freezegun
-from mock import patch
-from nose.plugins.attrib import attr
-
+import httpretty
 from django.conf import settings
 from django.core.urlresolvers import reverse
-
-from lms.djangoapps.commerce.tests import test_utils as ecomm_test_utils
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.tests.factories import CourseFactory
+from mock import patch
+from nose.plugins.attrib import attr
 
 from course_modes.models import CourseMode, Mode
 from course_modes.tests.factories import CourseModeFactory
+from lms.djangoapps.commerce.tests import test_utils as ecomm_test_utils
+from openedx.core.djangoapps.catalog.tests.mixins import CatalogIntegrationMixin
 from openedx.core.djangoapps.embargo.test_utils import restrict_course
+from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme
 from openedx.features.enterprise_support.tests.mixins.enterprise import EnterpriseServiceMockMixin
 from student.models import CourseEnrollment
 from student.tests.factories import CourseEnrollmentFactory, UserFactory
+from util import organizations_helpers as organizations_api
 from util.testing import UrlResetMixin
-from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme
 from util.tests.mixins.discovery import CourseCatalogServiceMockMixin
-from util import organizations_helpers as organizations_api
-from openedx.core.djangoapps.catalog.tests.mixins import CatalogIntegrationMixin
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
 
 
 @attr(shard=3)

common/djangoapps/course_modes/urls.py

@@ -1,5 +1,5 @@
-from django.conf.urls import patterns, url
 from django.conf import settings
+from django.conf.urls import patterns, url
 
 from course_modes import views
 

common/djangoapps/course_modes/views.py

@@ -12,23 +12,24 @@
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.shortcuts import redirect
 from django.utils.decorators import method_decorator
-from django.utils.translation import get_language, to_locale, ugettext as _
+from django.utils.translation import ugettext as _
+from django.utils.translation import get_language, to_locale
 from django.views.generic.base import View
 from ipware.ip import get_ip
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
-from xmodule.modulestore.django import modulestore
 
-from lms.djangoapps.commerce.utils import EcommerceService
 from course_modes.models import CourseMode
 from courseware.access import has_access
 from edxmako.shortcuts import render_to_response
+from lms.djangoapps.commerce.utils import EcommerceService
 from openedx.core.djangoapps.embargo import api as embargo_api
 from openedx.features.enterprise_support import api as enterprise_api
 from student.models import CourseEnrollment
-from util.db import outer_atomic
-from util import organizations_helpers as organization_api
 from third_party_auth.decorators import tpa_hint_ends_existing_session
+from util import organizations_helpers as organization_api
+from util.db import outer_atomic
+from xmodule.modulestore.django import modulestore
 
 
 class ChooseModeView(View):

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

@@ -3,6 +3,7 @@
 
 from django.db import migrations, models
 
+
 # We used to have a uniqueness constraint on auth_user.email:
 # https://github.com/edx/edx-platform/commit/c52727b0e0fb241d8211900975d3b69fe5a1bd57
 #

common/djangoapps/django_comment_common/admin.py

@@ -5,5 +5,4 @@
 
 from .models import ForumsConfig
 
-
 admin.site.register(ForumsConfig)

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

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

common/djangoapps/django_comment_common/migrations/0002_forumsconfig.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

common/djangoapps/django_comment_common/migrations/0003_enable_forums.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 from django.db import migrations, models
 
+
 def add_default_enable(apps, schema_editor):
     ForumsConfig = apps.get_model("django_comment_common", "ForumsConfig")
     settings_count = ForumsConfig.objects.count()

common/djangoapps/django_comment_common/models.py

@@ -1,19 +1,17 @@
 import logging
 
+from config_models.models import ConfigurationModel
 from django.conf import settings
-from django.db import models
 from django.contrib.auth.models import User
-
-from django.dispatch import receiver
+from django.db import models
 from django.db.models.signals import post_save
+from django.dispatch import receiver
 from django.utils.translation import ugettext_noop
 
-from config_models.models import ConfigurationModel
+from openedx.core.djangoapps.xmodule_django.models import CourseKeyField, NoneToEmptyManager
 from student.models import CourseEnrollment
-
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
-from openedx.core.djangoapps.xmodule_django.models import CourseKeyField, NoneToEmptyManager
 
 FORUM_ROLE_ADMINISTRATOR = ugettext_noop('Administrator')
 FORUM_ROLE_MODERATOR = ugettext_noop('Moderator')

common/djangoapps/django_comment_common/signals.py

@@ -3,7 +3,6 @@
 
 from django.dispatch import Signal
 
-
 thread_created = Signal(providing_args=['user', 'post'])
 thread_edited = Signal(providing_args=['user', 'post'])
 thread_voted = Signal(providing_args=['user', 'post'])

common/djangoapps/django_comment_common/tests.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
-
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
+
 from django_comment_common.models import Role
 from student.models import CourseEnrollment, User
 

common/djangoapps/django_comment_common/utils.py

@@ -2,8 +2,13 @@
 Common comment client utility functions.
 """
 
-from django_comment_common.models import Role, FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_MODERATOR, \
-    FORUM_ROLE_COMMUNITY_TA, FORUM_ROLE_STUDENT
+from django_comment_common.models import (
+    FORUM_ROLE_ADMINISTRATOR,
+    FORUM_ROLE_COMMUNITY_TA,
+    FORUM_ROLE_MODERATOR,
+    FORUM_ROLE_STUDENT,
+    Role
+)
 
 
 class ThreadContext(object):