Reorder LMS imports using isort
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
""" API URLs. """
|
||||
from django.conf.urls import patterns, url, include
|
||||
from django.conf.urls import include, patterns, url
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
|
||||
@@ -1,35 +1,35 @@
|
||||
""" Commerce API v0 view tests. """
|
||||
from datetime import datetime, timedelta
|
||||
import json
|
||||
import itertools
|
||||
import json
|
||||
from datetime import datetime, timedelta
|
||||
from uuid import uuid4
|
||||
import httpretty
|
||||
|
||||
import ddt
|
||||
import httpretty
|
||||
import mock
|
||||
import pytz
|
||||
from django.conf import settings
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.test import TestCase
|
||||
from django.test.utils import override_settings
|
||||
import mock
|
||||
from edx_rest_api_client import exceptions
|
||||
from nose.plugins.attrib import attr
|
||||
import pytz
|
||||
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
|
||||
from xmodule.modulestore.tests.factories import CourseFactory
|
||||
|
||||
from commerce.api.v0.views import SAILTHRU_CAMPAIGN_COOKIE
|
||||
from commerce.constants import Messages
|
||||
from commerce.tests import TEST_BASKET_ID, TEST_ORDER_NUMBER, TEST_PAYMENT_DATA
|
||||
from commerce.tests.mocks import mock_basket_order, mock_create_basket
|
||||
from commerce.tests.test_views import UserMixin
|
||||
from course_modes.models import CourseMode
|
||||
from edx_rest_api_client import exceptions
|
||||
from openedx.core.djangoapps.embargo.test_utils import restrict_course
|
||||
from enrollment.api import get_enrollment
|
||||
from openedx.core.djangoapps.embargo.test_utils import restrict_course
|
||||
from openedx.core.lib.django_test_client_utils import get_absolute_url
|
||||
from student.models import CourseEnrollment
|
||||
from student.tests.factories import CourseModeFactory
|
||||
from student.tests.tests import EnrollmentEventTestMixin
|
||||
from xmodule.modulestore.django import modulestore
|
||||
from commerce.api.v0.views import SAILTHRU_CAMPAIGN_COOKIE
|
||||
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
|
||||
from xmodule.modulestore.tests.factories import CourseFactory
|
||||
|
||||
UTM_COOKIE_NAME = 'edx.test.utm'
|
||||
UTM_COOKIE_CONTENTS = {
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
""" API v0 URLs. """
|
||||
from django.conf.urls import patterns, url, include
|
||||
from django.conf.urls import include, patterns, url
|
||||
|
||||
from commerce.api.v0 import views
|
||||
|
||||
|
||||
BASKET_URLS = patterns(
|
||||
'',
|
||||
url(r'^$', views.BasketsView.as_view(), name='create'),
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
""" API v0 views. """
|
||||
import logging
|
||||
import requests
|
||||
|
||||
import requests
|
||||
from edx_rest_api_client import exceptions
|
||||
from opaque_keys import InvalidKeyError
|
||||
from opaque_keys.edx.keys import CourseKey
|
||||
@@ -15,17 +15,16 @@ from commerce.exceptions import InvalidResponseError
|
||||
from commerce.http import DetailResponse, InternalRequestErrorResponse
|
||||
from course_modes.models import CourseMode
|
||||
from courseware import courses
|
||||
from openedx.core.djangoapps.embargo import api as embargo_api
|
||||
from enrollment.api import add_enrollment
|
||||
from enrollment.views import EnrollmentCrossDomainSessionAuth
|
||||
from openedx.core.djangoapps.commerce.utils import ecommerce_api_client
|
||||
from openedx.core.djangoapps.embargo import api as embargo_api
|
||||
from openedx.core.djangoapps.user_api.preferences.api import update_email_opt_in
|
||||
from openedx.core.lib.api.authentication import OAuth2AuthenticationAllowInactiveUser
|
||||
from openedx.core.lib.log_utils import audit_log
|
||||
from student.models import CourseEnrollment, RegistrationCookieConfiguration
|
||||
from util.json_request import JsonResponse
|
||||
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
SAILTHRU_CAMPAIGN_COOKIE = 'sailthru_bid'
|
||||
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
""" API v1 models. """
|
||||
import logging
|
||||
from itertools import groupby
|
||||
|
||||
import logging
|
||||
from django.db import transaction
|
||||
from opaque_keys import InvalidKeyError
|
||||
from opaque_keys.edx.keys import CourseKey
|
||||
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
|
||||
|
||||
from course_modes.models import CourseMode
|
||||
from lms.djangoapps.verify_student.models import VerificationDeadline
|
||||
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -3,14 +3,12 @@ from datetime import datetime
|
||||
|
||||
import pytz
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
from opaque_keys import InvalidKeyError
|
||||
from opaque_keys.edx.keys import CourseKey
|
||||
from rest_framework import serializers
|
||||
|
||||
from commerce.api.v1.models import Course
|
||||
from course_modes.models import CourseMode
|
||||
|
||||
from xmodule.modulestore.django import modulestore
|
||||
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
""" Commerce API v1 view tests. """
|
||||
from datetime import datetime, timedelta
|
||||
import itertools
|
||||
import json
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
import ddt
|
||||
import pytz
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import Permission
|
||||
from django.core.urlresolvers import reverse
|
||||
@@ -12,16 +13,15 @@ from django.test.utils import override_settings
|
||||
from edx_rest_api_client import exceptions
|
||||
from flaky import flaky
|
||||
from nose.plugins.attrib import attr
|
||||
import pytz
|
||||
from rest_framework.utils.encoders import JSONEncoder
|
||||
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
|
||||
from xmodule.modulestore.tests.factories import CourseFactory
|
||||
|
||||
from commerce.tests.mocks import mock_order_endpoint
|
||||
from commerce.tests.test_views import UserMixin
|
||||
from course_modes.models import CourseMode
|
||||
from student.tests.factories import UserFactory
|
||||
from lms.djangoapps.verify_student.models import VerificationDeadline
|
||||
from student.tests.factories import UserFactory
|
||||
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
|
||||
from xmodule.modulestore.tests.factories import CourseFactory
|
||||
|
||||
PASSWORD = 'test'
|
||||
JSON_CONTENT_TYPE = 'application/json'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
""" API v1 URLs. """
|
||||
from django.conf import settings
|
||||
from django.conf.urls import patterns, url, include
|
||||
from django.conf.urls import include, patterns, url
|
||||
|
||||
from commerce.api.v1 import views
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ from django.http import Http404
|
||||
from edx_rest_api_client import exceptions
|
||||
from edx_rest_framework_extensions.authentication import JwtAuthentication
|
||||
from rest_framework.authentication import SessionAuthentication
|
||||
from rest_framework.generics import RetrieveUpdateAPIView, ListAPIView
|
||||
from rest_framework.generics import ListAPIView, RetrieveUpdateAPIView
|
||||
from rest_framework.permissions import IsAuthenticated
|
||||
from rest_framework.views import APIView
|
||||
from rest_framework_oauth.authentication import OAuth2Authentication
|
||||
|
||||
Reference in New Issue
Block a user