Commit 46d69eba by Ned Batchelder

Merge pull request #12088 from edx/ned/remove-unused-imports

Remove unused imports
parents f2c8582c fac216c3
# pylint: disable=missing-docstring # pylint: disable=missing-docstring
from lettuce import world, step from lettuce import world, step
from selenium.webdriver.common.keys import Keys
from xmodule.modulestore.django import modulestore
SELECTORS = { SELECTORS = {
'spinner': '.video-wrapper .spinner', 'spinner': '.video-wrapper .spinner',
......
...@@ -13,7 +13,6 @@ from .prompt import query_yes_no ...@@ -13,7 +13,6 @@ from .prompt import query_yes_no
from contentstore.utils import delete_course_and_groups from contentstore.utils import delete_course_and_groups
from opaque_keys.edx.keys import CourseKey from opaque_keys.edx.keys import CourseKey
from opaque_keys import InvalidKeyError from opaque_keys import InvalidKeyError
from opaque_keys.edx.locations import SlashSeparatedCourseKey
from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.django import modulestore from xmodule.modulestore.django import modulestore
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
Unittests for deleting a course in an chosen modulestore Unittests for deleting a course in an chosen modulestore
""" """
import unittest
import mock import mock
from opaque_keys.edx.locations import SlashSeparatedCourseKey from opaque_keys.edx.locations import SlashSeparatedCourseKey
......
...@@ -7,7 +7,7 @@ from lazy.lazy import lazy ...@@ -7,7 +7,7 @@ from lazy.lazy import lazy
import time import time
from datetime import datetime from datetime import datetime
from dateutil.tz import tzutc from dateutil.tz import tzutc
from mock import patch, call from mock import patch
from pytz import UTC from pytz import UTC
from uuid import uuid4 from uuid import uuid4
from unittest import skip from unittest import skip
......
import unittest
from xmodule import templates from xmodule import templates
from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
......
...@@ -3,7 +3,6 @@ import collections ...@@ -3,7 +3,6 @@ import collections
from datetime import datetime, timedelta from datetime import datetime, timedelta
import mock import mock
import ddt
from pytz import UTC from pytz import UTC
from django.test import TestCase from django.test import TestCase
from django.test.utils import override_settings from django.test.utils import override_settings
......
...@@ -16,7 +16,6 @@ from xmodule.modulestore.django import modulestore ...@@ -16,7 +16,6 @@ from xmodule.modulestore.django import modulestore
from xblock.core import XBlock from xblock.core import XBlock
from xblock.django.request import webob_to_django_response, django_to_webob_request from xblock.django.request import webob_to_django_response, django_to_webob_request
from xblock.exceptions import NoSuchHandlerError from xblock.exceptions import NoSuchHandlerError
from xblock.fields import Scope
from xblock.plugin import PluginMissingError from xblock.plugin import PluginMissingError
from xblock.runtime import Mixologist from xblock.runtime import Mixologist
...@@ -28,7 +27,6 @@ from opaque_keys.edx.keys import UsageKey ...@@ -28,7 +27,6 @@ from opaque_keys.edx.keys import UsageKey
from student.auth import has_course_author_access from student.auth import has_course_author_access
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from models.settings.course_grading import CourseGradingModel
from xblock_django.models import XBlockDisableConfig from xblock_django.models import XBlockDisableConfig
__all__ = [ __all__ = [
......
...@@ -3,7 +3,6 @@ Entrance Exams view module -- handles all requests related to entrance exam mana ...@@ -3,7 +3,6 @@ Entrance Exams view module -- handles all requests related to entrance exam mana
Intended to be utilized as an AJAX callback handler, versus a proper view/screen Intended to be utilized as an AJAX callback handler, versus a proper view/screen
""" """
from functools import wraps from functools import wraps
import json
import logging import logging
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
......
...@@ -5,7 +5,6 @@ multiple courses. ...@@ -5,7 +5,6 @@ multiple courses.
""" """
from __future__ import absolute_import from __future__ import absolute_import
import json
import logging import logging
from contentstore.views.item import create_xblock_info from contentstore.views.item import create_xblock_info
......
...@@ -78,7 +78,6 @@ choice for most environments but you may be happy with the trade-offs of the ...@@ -78,7 +78,6 @@ choice for most environments but you may be happy with the trade-offs of the
""" """
from django.contrib.auth import SESSION_KEY
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth.middleware import AuthenticationMiddleware from django.contrib.auth.middleware import AuthenticationMiddleware
from logging import getLogger from logging import getLogger
......
...@@ -18,7 +18,6 @@ from mock import patch ...@@ -18,7 +18,6 @@ from mock import patch
from xmodule.contentstore.django import contentstore from xmodule.contentstore.django import contentstore
from xmodule.modulestore.django import modulestore from xmodule.modulestore.django import modulestore
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.xml_importer import import_course_from_xml from xmodule.modulestore.xml_importer import import_course_from_xml
from contentserver.middleware import parse_range_header, HTTP_DATE_FORMAT, StaticContentServer from contentserver.middleware import parse_range_header, HTTP_DATE_FORMAT, StaticContentServer
......
...@@ -11,7 +11,7 @@ import ddt ...@@ -11,7 +11,7 @@ import ddt
from django.conf import settings from django.conf import settings
from django.test.utils import override_settings from django.test.utils import override_settings
from django.core.cache import cache from django.core.cache import cache
from django.db import connection, transaction from django.db import connection
from student.tests.factories import UserFactory from student.tests.factories import UserFactory
from xmodule.modulestore.tests.factories import CourseFactory from xmodule.modulestore.tests.factories import CourseFactory
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
A tiny app that checks for a status message. A tiny app that checks for a status message.
""" """
from django.conf import settings
import logging import logging
from .models import GlobalStatusMessage from .models import GlobalStatusMessage
......
import json import json
import django.db
import unittest import unittest
from student.tests.factories import UserFactory, RegistrationFactory, PendingEmailChangeFactory from student.tests.factories import UserFactory, RegistrationFactory, PendingEmailChangeFactory
......
...@@ -73,7 +73,6 @@ from django.contrib.auth.models import User ...@@ -73,7 +73,6 @@ from django.contrib.auth.models import User
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.http import HttpResponseBadRequest from django.http import HttpResponseBadRequest
from django.shortcuts import redirect from django.shortcuts import redirect
from django.utils.translation import ugettext as _
from social.apps.django_app.default import models from social.apps.django_app.default import models
from social.exceptions import AuthException from social.exceptions import AuthException
from social.pipeline import partial from social.pipeline import partial
......
...@@ -3,9 +3,7 @@ Support for inheritance of fields down an XBlock hierarchy. ...@@ -3,9 +3,7 @@ Support for inheritance of fields down an XBlock hierarchy.
""" """
from __future__ import absolute_import from __future__ import absolute_import
from datetime import datetime
from django.conf import settings from django.conf import settings
from pytz import UTC
from xmodule.partitions.partitions import UserPartition from xmodule.partitions.partitions import UserPartition
from xblock.fields import Scope, Boolean, String, Float, XBlockMixin, Dict, Integer, List from xblock.fields import Scope, Boolean, String, Float, XBlockMixin, Dict, Integer, List
......
...@@ -16,7 +16,6 @@ from xmodule.contentstore.mongo import MongoContentStore ...@@ -16,7 +16,6 @@ from xmodule.contentstore.mongo import MongoContentStore
from xmodule.contentstore.content import StaticContent from xmodule.contentstore.content import StaticContent
from xmodule.exceptions import NotFoundError from xmodule.exceptions import NotFoundError
import ddt import ddt
from __builtin__ import delattr
from xmodule.modulestore.tests.mongo_connection import MONGO_PORT_NUM, MONGO_HOST from xmodule.modulestore.tests.mongo_connection import MONGO_PORT_NUM, MONGO_HOST
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
......
...@@ -11,7 +11,7 @@ and then for each combination of modulestores, performing the sequence: ...@@ -11,7 +11,7 @@ and then for each combination of modulestores, performing the sequence:
4) Compare all modules in the source and destination modulestores to make sure that they line up 4) Compare all modules in the source and destination modulestores to make sure that they line up
""" """
from contextlib import contextmanager, nested
import itertools import itertools
import os import os
from path import Path as path from path import Path as path
...@@ -25,11 +25,8 @@ from mock import patch ...@@ -25,11 +25,8 @@ from mock import patch
from xmodule.tests import CourseComparisonTest from xmodule.tests import CourseComparisonTest
from xmodule.modulestore.xml_importer import import_course_from_xml from xmodule.modulestore.xml_importer import import_course_from_xml
from xmodule.modulestore.xml_exporter import export_course_to_xml from xmodule.modulestore.xml_exporter import export_course_to_xml
from xmodule.modulestore.tests.mongo_connection import MONGO_PORT_NUM, MONGO_HOST
from xmodule.modulestore.tests.utils import mock_tab_from_json from xmodule.modulestore.tests.utils import mock_tab_from_json
from xmodule.modulestore.inheritance import InheritanceMixin
from xmodule.partitions.tests.test_partitions import PartitionTestCase from xmodule.partitions.tests.test_partitions import PartitionTestCase
from xmodule.x_module import XModuleMixin
from xmodule.modulestore.tests.utils import ( from xmodule.modulestore.tests.utils import (
MongoContentstoreBuilder, MODULESTORE_SETUPS, SPLIT_MODULESTORE_SETUP, MongoContentstoreBuilder, MODULESTORE_SETUPS, SPLIT_MODULESTORE_SETUP,
CONTENTSTORE_SETUPS, TEST_DATA_DIR CONTENTSTORE_SETUPS, TEST_DATA_DIR
......
...@@ -15,10 +15,8 @@ from xmodule.modulestore.store_utilities import draft_node_constructor, get_draf ...@@ -15,10 +15,8 @@ from xmodule.modulestore.store_utilities import draft_node_constructor, get_draf
from xmodule.modulestore import LIBRARY_ROOT from xmodule.modulestore import LIBRARY_ROOT
from fs.osfs import OSFS from fs.osfs import OSFS
from json import dumps from json import dumps
import json
import os import os
from path import Path as path
import shutil
from xmodule.modulestore.draft_and_published import DIRECT_ONLY_CATEGORIES from xmodule.modulestore.draft_and_published import DIRECT_ONLY_CATEGORIES
from opaque_keys.edx.locator import CourseLocator, LibraryLocator from opaque_keys.edx.locator import CourseLocator, LibraryLocator
......
...@@ -7,7 +7,6 @@ import collections ...@@ -7,7 +7,6 @@ import collections
import json import json
import logging import logging
from pkg_resources import resource_string from pkg_resources import resource_string
import warnings
from lxml import etree from lxml import etree
from xblock.core import XBlock from xblock.core import XBlock
......
...@@ -5,12 +5,9 @@ Tests of XML export ...@@ -5,12 +5,9 @@ Tests of XML export
import ddt import ddt
import lxml.etree import lxml.etree
import mock import mock
import os
import pytz import pytz
import shutil import shutil
import tarfile
import unittest import unittest
import uuid
from datetime import datetime, timedelta, tzinfo from datetime import datetime, timedelta, tzinfo
from fs.osfs import OSFS from fs.osfs import OSFS
...@@ -26,7 +23,6 @@ from opaque_keys.edx.locations import Location ...@@ -26,7 +23,6 @@ from opaque_keys.edx.locations import Location
from xmodule.modulestore import EdxJSONEncoder from xmodule.modulestore import EdxJSONEncoder
from xmodule.modulestore.xml import XMLModuleStore from xmodule.modulestore.xml import XMLModuleStore
from xmodule.tests import DATA_DIR from xmodule.tests import DATA_DIR
from xmodule.tests.helpers import directories_equal
from xmodule.x_module import XModuleMixin from xmodule.x_module import XModuleMixin
......
...@@ -2,11 +2,9 @@ ...@@ -2,11 +2,9 @@
""" """
Module contains utils specific for video_module but not for transcripts. Module contains utils specific for video_module but not for transcripts.
""" """
import json
from collections import OrderedDict from collections import OrderedDict
import logging import logging
import urllib
import requests
from urllib import urlencode from urllib import urlencode
from urlparse import parse_qs, urlsplit, urlunsplit, urlparse from urlparse import parse_qs, urlsplit, urlunsplit, urlparse
...@@ -14,8 +12,6 @@ from django.conf import settings ...@@ -14,8 +12,6 @@ from django.conf import settings
from django.core.validators import URLValidator from django.core.validators import URLValidator
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from requests.exceptions import RequestException
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
......
""" """
Course Group Configurations page. Course Group Configurations page.
""" """
from bok_choy.promise import EmptyPromise
from ..common.utils import confirm_prompt from ..common.utils import confirm_prompt
from .course_page import CoursePage from .course_page import CoursePage
......
""" """
Test courseware search Test courseware search
""" """
import os
import json import json
import uuid import uuid
......
""" """
Test courseware search Test courseware search
""" """
import os
import json import json
from ..helpers import remove_file from ..helpers import remove_file
......
...@@ -4,7 +4,6 @@ import datetime ...@@ -4,7 +4,6 @@ import datetime
import json import json
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import ddt import ddt
import unittest
from ..helpers import EventsTestMixin from ..helpers import EventsTestMixin
from .test_video_module import VideoBaseTest from .test_video_module import VideoBaseTest
......
...@@ -14,7 +14,7 @@ file and check it in at the same time as your model changes. To do that, ...@@ -14,7 +14,7 @@ file and check it in at the same time as your model changes. To do that,
import logging import logging
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db import models, transaction from django.db import models
from openedx.core.lib.html_to_text import html_to_text from openedx.core.lib.html_to_text import html_to_text
from openedx.core.lib.mail_utils import wrap_message from openedx.core.lib.mail_utils import wrap_message
......
...@@ -5,7 +5,7 @@ by the individual custom courses feature. ...@@ -5,7 +5,7 @@ by the individual custom courses feature.
import json import json
import logging import logging
from django.db import transaction, IntegrityError from django.db import transaction
import request_cache import request_cache
......
...@@ -12,17 +12,12 @@ from student.roles import ( ...@@ -12,17 +12,12 @@ from student.roles import (
CourseInstructorRole, CourseInstructorRole,
CourseStaffRole, CourseStaffRole,
) )
from student.tests.factories import ( from student.tests.factories import AdminFactory
AdminFactory,
CourseEnrollmentFactory,
UserFactory
)
from student.models import CourseEnrollment, CourseEnrollmentException from student.models import CourseEnrollment, CourseEnrollmentException
from xmodule.modulestore.tests.django_utils import ( from xmodule.modulestore.tests.django_utils import (
ModuleStoreTestCase, ModuleStoreTestCase,
SharedModuleStoreTestCase,
TEST_DATA_SPLIT_MODULESTORE TEST_DATA_SPLIT_MODULESTORE
) )
from xmodule.modulestore.tests.factories import CourseFactory from xmodule.modulestore.tests.factories import CourseFactory
......
...@@ -41,7 +41,6 @@ from instructor.views.api import _split_input_list ...@@ -41,7 +41,6 @@ from instructor.views.api import _split_input_list
from instructor.views.gradebook_api import get_grade_book_page from instructor.views.gradebook_api import get_grade_book_page
from instructor.enrollment import ( from instructor.enrollment import (
enroll_email, enroll_email,
unenroll_email,
get_email_params, get_email_params,
) )
......
...@@ -55,7 +55,6 @@ from django.contrib.auth.models import User ...@@ -55,7 +55,6 @@ from django.contrib.auth.models import User
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.db import models, transaction from django.db import models, transaction
from django.db.models import Count from django.db.models import Count
from django.db.models.signals import post_save
from django.dispatch import receiver from django.dispatch import receiver
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django_extensions.db.fields import CreationDateTimeField from django_extensions.db.fields import CreationDateTimeField
......
...@@ -12,7 +12,6 @@ from certificates.models import ( ...@@ -12,7 +12,6 @@ from certificates.models import (
ExampleCertificateSet, ExampleCertificateSet,
CertificateHtmlViewConfiguration, CertificateHtmlViewConfiguration,
CertificateTemplateAsset, CertificateTemplateAsset,
EligibleCertificateManager,
GeneratedCertificate, GeneratedCertificate,
CertificateStatuses, CertificateStatuses,
) )
......
""" Tests for commerce views. """ """ Tests for commerce views. """
import json
from uuid import uuid4
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import ddt import ddt
......
...@@ -7,7 +7,7 @@ import openedx.core.djangoapps.user_api.course_tag.api as course_tag_api ...@@ -7,7 +7,7 @@ import openedx.core.djangoapps.user_api.course_tag.api as course_tag_api
from openedx.core.djangoapps.user_api.partition_schemes import RandomUserPartitionScheme from openedx.core.djangoapps.user_api.partition_schemes import RandomUserPartitionScheme
from student.tests.factories import CourseEnrollmentFactory from student.tests.factories import CourseEnrollmentFactory
from xmodule.partitions.partitions import Group, UserPartition from xmodule.partitions.partitions import Group, UserPartition
from xmodule.modulestore.tests.factories import check_mongo_calls, check_mongo_calls_range from xmodule.modulestore.tests.factories import check_mongo_calls
from ...api import get_course_blocks from ...api import get_course_blocks
from ..user_partitions import UserPartitionTransformer, _get_user_partition_groups from ..user_partitions import UserPartitionTransformer, _get_user_partition_groups
......
...@@ -14,7 +14,7 @@ from opaque_keys.edx.locator import CourseLocator ...@@ -14,7 +14,7 @@ from opaque_keys.edx.locator import CourseLocator
from xmodule.error_module import ErrorDescriptor from xmodule.error_module import ErrorDescriptor
from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, check_mongo_calls from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
from xmodule.modulestore.xml import CourseLocationManager from xmodule.modulestore.xml import CourseLocationManager
from xmodule.tests import get_test_system from xmodule.tests import get_test_system
......
...@@ -6,7 +6,7 @@ from django.conf import settings ...@@ -6,7 +6,7 @@ from django.conf import settings
from django.http import Http404 from django.http import Http404
from rest_framework.authentication import SessionAuthentication from rest_framework.authentication import SessionAuthentication
from rest_framework_oauth.authentication import OAuth2Authentication from rest_framework_oauth.authentication import OAuth2Authentication
from rest_framework.exceptions import AuthenticationFailed, ParseError from rest_framework.exceptions import AuthenticationFailed
from rest_framework.generics import RetrieveAPIView, ListAPIView from rest_framework.generics import RetrieveAPIView, ListAPIView
from rest_framework.permissions import IsAuthenticated from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response from rest_framework.response import Response
......
...@@ -28,7 +28,7 @@ from xmodule.course_module import ( ...@@ -28,7 +28,7 @@ from xmodule.course_module import (
CATALOG_VISIBILITY_ABOUT, CATALOG_VISIBILITY_ABOUT,
) )
from xmodule.error_module import ErrorDescriptor from xmodule.error_module import ErrorDescriptor
from xmodule.x_module import XModule, DEPRECATION_VSCOMPAT_EVENT from xmodule.x_module import XModule
from xmodule.split_test_module import get_split_user_partitions from xmodule.split_test_module import get_split_user_partitions
from xmodule.partitions.partitions import NoSuchUserPartitionError, NoSuchUserPartitionGroupError from xmodule.partitions.partitions import NoSuchUserPartitionError, NoSuchUserPartitionGroupError
...@@ -54,8 +54,6 @@ from util.milestones_helpers import ( ...@@ -54,8 +54,6 @@ from util.milestones_helpers import (
) )
from ccx_keys.locator import CCXLocator from ccx_keys.locator import CCXLocator
import dogstats_wrapper as dog_stats_api
from courseware.access_response import ( from courseware.access_response import (
MilestoneError, MilestoneError,
MobileAvailabilityError, MobileAvailabilityError,
......
""" """
This file contains all entrance exam related utils/logic. This file contains all entrance exam related utils/logic.
""" """
from django.conf import settings
from courseware.access import has_access from courseware.access import has_access
from courseware.model_data import FieldDataCache, ScoresClient from courseware.model_data import FieldDataCache, ScoresClient
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
from lettuce import world, step from lettuce import world, step
from common import course_location from common import course_location
from problems_setup import PROBLEM_DICT from problems_setup import PROBLEM_DICT
from nose.tools import assert_in
@step(u'I am viewing a course with multiple sections') @step(u'I am viewing a course with multiple sections')
......
...@@ -3,9 +3,8 @@ ...@@ -3,9 +3,8 @@
from optparse import make_option from optparse import make_option
from textwrap import dedent from textwrap import dedent
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand
from xmodule.modulestore.django import modulestore
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
......
...@@ -16,7 +16,7 @@ from django.core.management import call_command ...@@ -16,7 +16,7 @@ from django.core.management import call_command
from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.django import modulestore from xmodule.modulestore.django import modulestore
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, mixed_store_config from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.django_utils import ( from xmodule.modulestore.tests.django_utils import (
TEST_DATA_MONGO_MODULESTORE, TEST_DATA_SPLIT_MODULESTORE TEST_DATA_MONGO_MODULESTORE, TEST_DATA_SPLIT_MODULESTORE
) )
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
import datetime import datetime
import pytz import pytz
from dateutil.tz import tzutc
from django.test.utils import override_settings from django.test.utils import override_settings
from mock import patch from mock import patch
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
Test cases for tabs. Test cases for tabs.
""" """
from django.conf import settings
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.http import Http404 from django.http import Http404
from mock import MagicMock, Mock, patch from mock import MagicMock, Mock, patch
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Video xmodule tests in mongo.""" """Video xmodule tests in mongo."""
import ddt import ddt
import itertools
import json import json
from collections import OrderedDict from collections import OrderedDict
from path import Path as path from path import Path as path
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
""" """
Tests courseware views.py Tests courseware views.py
""" """
import cgi
from urllib import urlencode from urllib import urlencode
import ddt import ddt
import json import json
......
...@@ -14,7 +14,7 @@ except ImportError: ...@@ -14,7 +14,7 @@ except ImportError:
import dogstats_wrapper as dog_stats_api import dogstats_wrapper as dog_stats_api
from django.contrib.auth.models import User from django.contrib.auth.models import User
from xblock.fields import Scope, ScopeBase from xblock.fields import Scope
from courseware.models import StudentModule, BaseStudentModuleHistory from courseware.models import StudentModule, BaseStudentModuleHistory
from edx_user_state_client.interface import XBlockUserStateClient, XBlockUserState from edx_user_state_client.interface import XBlockUserStateClient, XBlockUserState
......
...@@ -10,21 +10,16 @@ from util.date_utils import get_time_display, DEFAULT_DATE_TIME_FORMAT ...@@ -10,21 +10,16 @@ from util.date_utils import get_time_display, DEFAULT_DATE_TIME_FORMAT
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from django.conf import settings from django.conf import settings
from django.contrib.auth.hashers import check_password
from django.contrib.auth.models import User
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.test.client import Client from django.test.client import Client
from django.test.utils import override_settings from django.test.utils import override_settings
from django.utils.timezone import utc as UTC from django.utils.timezone import utc as UTC
from django.utils.translation import ugettext as _
import mongoengine import mongoengine
from opaque_keys.edx.locations import SlashSeparatedCourseKey from opaque_keys.edx.locations import SlashSeparatedCourseKey
from dashboard.models import CourseImportLog from dashboard.models import CourseImportLog
from dashboard.sysadmin import Users
from dashboard.git_import import GitImportError from dashboard.git_import import GitImportError
from datetime import datetime from datetime import datetime
from external_auth.models import ExternalAuthMap
from student.roles import CourseStaffRole, GlobalStaff from student.roles import CourseStaffRole, GlobalStaff
from student.tests.factories import UserFactory from student.tests.factories import UserFactory
from xmodule.modulestore.django import modulestore from xmodule.modulestore.django import modulestore
......
...@@ -8,8 +8,7 @@ from django.forms import ( ...@@ -8,8 +8,7 @@ from django.forms import (
ChoiceField, ChoiceField,
Form, Form,
IntegerField, IntegerField,
NullBooleanField, )
Select)
from opaque_keys import InvalidKeyError from opaque_keys import InvalidKeyError
from opaque_keys.edx.locator import CourseLocator from opaque_keys.edx.locator import CourseLocator
......
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from opaque_keys import InvalidKeyError
from opaque_keys.edx.keys import CourseKey from opaque_keys.edx.keys import CourseKey
from courseware.courses import get_course from courseware.courses import get_course
......
...@@ -4,7 +4,7 @@ Views related to EdxNotes. ...@@ -4,7 +4,7 @@ Views related to EdxNotes.
import json import json
import logging import logging
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.http import HttpResponse, HttpResponseBadRequest, Http404 from django.http import HttpResponse, Http404
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.views.decorators.http import require_GET from django.views.decorators.http import require_GET
......
...@@ -15,7 +15,6 @@ from django.utils.translation import override as override_language ...@@ -15,7 +15,6 @@ from django.utils.translation import override as override_language
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from ccx_keys.locator import CCXLocator from ccx_keys.locator import CCXLocator
from student.tests.factories import UserFactory from student.tests.factories import UserFactory
from xmodule.modulestore.django import modulestore
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
from lms.djangoapps.ccx.tests.factories import CcxFactory from lms.djangoapps.ccx.tests.factories import CcxFactory
......
...@@ -18,7 +18,7 @@ from celery import Task, current_task ...@@ -18,7 +18,7 @@ from celery import Task, current_task
from celery.states import SUCCESS, FAILURE from celery.states import SUCCESS, FAILURE
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.files.storage import DefaultStorage from django.core.files.storage import DefaultStorage
from django.db import transaction, reset_queries from django.db import reset_queries
from django.db.models import Q from django.db.models import Q
import dogstats_wrapper as dog_stats_api import dogstats_wrapper as dog_stats_api
from pytz import UTC from pytz import UTC
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
Tests of the LMS XBlock Runtime and associated utilities Tests of the LMS XBlock Runtime and associated utilities
""" """
from django.contrib.auth.models import User
from django.conf import settings from django.conf import settings
from ddt import ddt, data from ddt import ddt, data
from django.test import TestCase from django.test import TestCase
......
...@@ -14,7 +14,7 @@ import logging ...@@ -14,7 +14,7 @@ import logging
from xmodule_django.models import CourseKeyField, UsageKeyField from xmodule_django.models import CourseKeyField, UsageKeyField
from provider.utils import short_token, long_token from provider.utils import short_token
log = logging.getLogger("edx.lti_provider") log = logging.getLogger("edx.lti_provider")
......
""" """
Views for course info API Views for course info API
""" """
from django.http import Http404
from rest_framework import generics from rest_framework import generics
from rest_framework.response import Response from rest_framework.response import Response
......
...@@ -3,7 +3,7 @@ Script for retiring order that went through cybersource but weren't ...@@ -3,7 +3,7 @@ Script for retiring order that went through cybersource but weren't
marked as "purchased" in the db marked as "purchased" in the db
""" """
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand
from shoppingcart.models import Order from shoppingcart.models import Order
from shoppingcart.exceptions import UnexpectedOrderItemStatus, InvalidStatusToRetire from shoppingcart.exceptions import UnexpectedOrderItemStatus, InvalidStatusToRetire
......
...@@ -6,7 +6,6 @@ import json ...@@ -6,7 +6,6 @@ import json
from collections import OrderedDict from collections import OrderedDict
from django.test.client import Client from django.test.client import Client
from django.contrib.auth.models import User
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from survey.models import SurveyForm, SurveyAnswer from survey.models import SurveyForm, SurveyAnswer
......
""" Tests for course_team reindex command """ """ Tests for course_team reindex command """
import ddt import ddt
import mock
from mock import patch from mock import patch
from django.core.management import call_command, CommandError from django.core.management import call_command, CommandError
......
...@@ -26,7 +26,7 @@ from django.core.exceptions import ObjectDoesNotExist ...@@ -26,7 +26,7 @@ from django.core.exceptions import ObjectDoesNotExist
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.core.cache import cache from django.core.cache import cache
from django.dispatch import receiver from django.dispatch import receiver
from django.db import models, transaction, IntegrityError from django.db import models, transaction
from django.utils.translation import ugettext as _, ugettext_lazy from django.utils.translation import ugettext as _, ugettext_lazy
from boto.s3.connection import S3Connection from boto.s3.connection import S3Connection
......
...@@ -23,7 +23,7 @@ from django.utils.decorators import method_decorator ...@@ -23,7 +23,7 @@ from django.utils.decorators import method_decorator
from django.utils.translation import ugettext as _, ugettext_lazy from django.utils.translation import ugettext as _, ugettext_lazy
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
from django.views.decorators.http import require_POST from django.views.decorators.http import require_POST
from django.views.generic.base import View, RedirectView from django.views.generic.base import View
import analytics import analytics
from eventtracking import tracker from eventtracking import tracker
......
""" """
Command to load course overviews. Command to load course overviews.
""" """
import logging import logging
from optparse import make_option
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from opaque_keys import InvalidKeyError from opaque_keys import InvalidKeyError
......
...@@ -6,7 +6,7 @@ import json ...@@ -6,7 +6,7 @@ import json
import logging import logging
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db import models, transaction, IntegrityError from django.db import models, transaction
from util.db import outer_atomic from util.db import outer_atomic
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.db.models.signals import pre_delete from django.db.models.signals import pre_delete
......
""" """
Helper methods for testing cohorts. Helper methods for testing cohorts.
""" """
import factory
from factory import post_generation, Sequence from factory import post_generation, Sequence
from factory.django import DjangoModelFactory from factory.django import DjangoModelFactory
import json import json
......
...@@ -5,7 +5,6 @@ import datetime ...@@ -5,7 +5,6 @@ import datetime
import logging import logging
from django.conf import settings from django.conf import settings
from opaque_keys import InvalidKeyError
import pytz import pytz
from rest_framework import serializers from rest_framework import serializers
from rest_framework.exceptions import PermissionDenied from rest_framework.exceptions import PermissionDenied
......
...@@ -19,7 +19,7 @@ from openedx.core.lib.api.authentication import ( ...@@ -19,7 +19,7 @@ from openedx.core.lib.api.authentication import (
SessionAuthenticationAllowInactiveUser, SessionAuthenticationAllowInactiveUser,
) )
from openedx.core.lib.api.parsers import TypedFileUploadParser from openedx.core.lib.api.parsers import TypedFileUploadParser
from openedx.core.lib.api.permissions import IsUserInUrl, IsUserInUrlOrStaff from openedx.core.lib.api.permissions import IsUserInUrl
from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin
from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_image_names, set_has_profile_image from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_image_names, set_has_profile_image
from .exceptions import ImageValidationError from .exceptions import ImageValidationError
......
...@@ -4,7 +4,6 @@ from django.test import TestCase ...@@ -4,7 +4,6 @@ from django.test import TestCase
import mock import mock
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from openedx.core.djangoapps.programs.models import ProgramsApiConfig
from openedx.core.djangoapps.programs.tests.mixins import ProgramsApiConfigMixin from openedx.core.djangoapps.programs.tests.mixins import ProgramsApiConfigMixin
......
...@@ -9,7 +9,6 @@ import uuid ...@@ -9,7 +9,6 @@ import uuid
from django.test.client import RequestFactory from django.test.client import RequestFactory
from courseware.models import StudentModule # pylint: disable=import-error
from lms.djangoapps.lms_xblock.runtime import quote_slashes from lms.djangoapps.lms_xblock.runtime import quote_slashes
from xblock.fragment import Fragment from xblock.fragment import Fragment
from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore import ModuleStoreEnum
...@@ -23,7 +22,6 @@ from openedx.core.lib.xblock_utils import ( ...@@ -23,7 +22,6 @@ from openedx.core.lib.xblock_utils import (
replace_jump_to_id_urls, replace_jump_to_id_urls,
replace_course_urls, replace_course_urls,
replace_static_urls, replace_static_urls,
grade_histogram,
sanitize_html_id sanitize_html_id
) )
......
...@@ -11,7 +11,7 @@ set -e ...@@ -11,7 +11,7 @@ set -e
############################################################################### ###############################################################################
# Violations thresholds for failing the build # Violations thresholds for failing the build
export PYLINT_THRESHOLD=4500 export PYLINT_THRESHOLD=4175
export JSHINT_THRESHOLD=9080 export JSHINT_THRESHOLD=9080
doCheckVars() { doCheckVars() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment