From 1bd213bebad4130f267e22acd759ddebc84a37db Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Mon, 10 Feb 2014 14:07:50 -0500 Subject: [PATCH] Remove unused imports. --- lms/djangoapps/course_wiki/tests/tests.py | 2 -- lms/djangoapps/courseware/access.py | 3 +-- lms/djangoapps/courseware/admin.py | 1 - lms/djangoapps/courseware/courses.py | 1 - .../courseware/management/commands/export_course.py | 1 - .../courseware/mock_lti_server/server_start.py | 1 - .../courseware/mock_lti_server/test_mock_lti_server.py | 3 --- lms/djangoapps/courseware/tests/test_microsites.py | 1 - .../courseware/tests/test_submitting_problems.py | 1 - lms/djangoapps/courseware/views.py | 8 +++----- lms/djangoapps/django_comment_client/base/views.py | 2 -- lms/djangoapps/django_comment_client/helpers.py | 8 -------- lms/djangoapps/foldit/tests.py | 2 +- .../management/tests/test_openended_commands.py | 2 +- lms/djangoapps/instructor/views/instructor_dashboard.py | 1 - lms/djangoapps/instructor/views/legacy.py | 1 - lms/djangoapps/shoppingcart/models.py | 3 +-- lms/djangoapps/shoppingcart/tests/test_models.py | 4 +--- lms/djangoapps/shoppingcart/tests/test_views.py | 2 +- lms/djangoapps/shoppingcart/urls.py | 2 +- lms/djangoapps/verify_student/models.py | 2 -- lms/djangoapps/verify_student/tests/test_models.py | 9 ++------- lms/djangoapps/verify_student/tests/test_views.py | 2 +- lms/djangoapps/verify_student/urls.py | 3 +-- lms/djangoapps/verify_student/views.py | 3 --- lms/envs/acceptance.py | 2 +- 26 files changed, 15 insertions(+), 55 deletions(-) diff --git a/lms/djangoapps/course_wiki/tests/tests.py b/lms/djangoapps/course_wiki/tests/tests.py index 93954dab61..55fc47e9dd 100644 --- a/lms/djangoapps/course_wiki/tests/tests.py +++ b/lms/djangoapps/course_wiki/tests/tests.py @@ -1,8 +1,6 @@ from django.core.urlresolvers import reverse from django.test.utils import override_settings -import xmodule.modulestore.django - from courseware.tests.tests import LoginEnrollmentTestCase from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE from xmodule.modulestore.django import modulestore diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py index 8f78991572..c30c5566dc 100644 --- a/lms/djangoapps/courseware/access.py +++ b/lms/djangoapps/courseware/access.py @@ -3,10 +3,9 @@ Ideally, it will be the only place that needs to know about any special settings like DISABLE_START_DATES""" import logging from datetime import datetime, timedelta -from functools import partial from django.conf import settings -from django.contrib.auth.models import Group, AnonymousUser +from django.contrib.auth.models import AnonymousUser from xmodule.course_module import CourseDescriptor from xmodule.error_module import ErrorDescriptor diff --git a/lms/djangoapps/courseware/admin.py b/lms/djangoapps/courseware/admin.py index 147630dbc5..78c9fc826f 100644 --- a/lms/djangoapps/courseware/admin.py +++ b/lms/djangoapps/courseware/admin.py @@ -4,7 +4,6 @@ django admin pages for courseware model from courseware.models import StudentModule, OfflineComputedGrade, OfflineComputedGradeLog from ratelimitbackend import admin -from django.contrib.auth.models import User admin.site.register(StudentModule) diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py index 119e2e33d6..7ff21dc09f 100644 --- a/lms/djangoapps/courseware/courses.py +++ b/lms/djangoapps/courseware/courses.py @@ -2,7 +2,6 @@ from collections import defaultdict from fs.errors import ResourceNotFoundError import logging import inspect -import re from path import path from django.http import Http404 diff --git a/lms/djangoapps/courseware/management/commands/export_course.py b/lms/djangoapps/courseware/management/commands/export_course.py index c2d54972a4..cb7d6150f1 100644 --- a/lms/djangoapps/courseware/management/commands/export_course.py +++ b/lms/djangoapps/courseware/management/commands/export_course.py @@ -16,7 +16,6 @@ from path import path from django.core.management.base import BaseCommand, CommandError from xmodule.modulestore.django import modulestore -from xmodule.contentstore.django import contentstore from xmodule.modulestore.xml_exporter import export_to_xml diff --git a/lms/djangoapps/courseware/mock_lti_server/server_start.py b/lms/djangoapps/courseware/mock_lti_server/server_start.py index 568d830472..8e37350b4b 100644 --- a/lms/djangoapps/courseware/mock_lti_server/server_start.py +++ b/lms/djangoapps/courseware/mock_lti_server/server_start.py @@ -4,7 +4,6 @@ Mock LTI server for manual testing. Used for manual testing and testing on sandbox. """ -import threading from mock_lti_server import MockLTIServer server_port = 8034 diff --git a/lms/djangoapps/courseware/mock_lti_server/test_mock_lti_server.py b/lms/djangoapps/courseware/mock_lti_server/test_mock_lti_server.py index c60e095c15..34d6f6d37c 100644 --- a/lms/djangoapps/courseware/mock_lti_server/test_mock_lti_server.py +++ b/lms/djangoapps/courseware/mock_lti_server/test_mock_lti_server.py @@ -1,12 +1,9 @@ """ Test for Mock_LTI_Server """ -import mock from mock import Mock import unittest import threading -import textwrap -import urllib import requests from mock_lti_server import MockLTIServer diff --git a/lms/djangoapps/courseware/tests/test_microsites.py b/lms/djangoapps/courseware/tests/test_microsites.py index b8d3a1659e..4293e2bc8e 100644 --- a/lms/djangoapps/courseware/tests/test_microsites.py +++ b/lms/djangoapps/courseware/tests/test_microsites.py @@ -3,7 +3,6 @@ Tests related to the Microsites feature """ from django.core.urlresolvers import reverse from django.test.utils import override_settings -from unittest import skip from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory diff --git a/lms/djangoapps/courseware/tests/test_submitting_problems.py b/lms/djangoapps/courseware/tests/test_submitting_problems.py index 6221211e44..b11bb3898a 100644 --- a/lms/djangoapps/courseware/tests/test_submitting_problems.py +++ b/lms/djangoapps/courseware/tests/test_submitting_problems.py @@ -17,7 +17,6 @@ from django.test.utils import override_settings # Need access to internal func to put users in the right group from courseware import grades -from courseware.model_data import FieldDataCache from courseware.models import StudentModule from xmodule.modulestore.django import modulestore, editable_modulestore diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py index a47ebac017..6fe9714965 100644 --- a/lms/djangoapps/courseware/views.py +++ b/lms/djangoapps/courseware/views.py @@ -1,7 +1,6 @@ import logging import urllib -from functools import partial from collections import defaultdict from django.conf import settings @@ -10,7 +9,7 @@ from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse from django.contrib.auth.models import User from django.contrib.auth.decorators import login_required -from django.http import Http404, HttpResponse, HttpResponseRedirect +from django.http import Http404, HttpResponse from django.shortcuts import redirect from edxmako.shortcuts import render_to_response, render_to_string from django_future.csrf import ensure_csrf_cookie @@ -20,12 +19,11 @@ from markupsafe import escape from courseware import grades from courseware.access import has_access -from courseware.courses import (get_courses, get_course_with_access, - get_courses_by_university, sort_by_announcement) +from courseware.courses import get_courses, get_course_with_access, sort_by_announcement import courseware.tabs as tabs from courseware.masquerade import setup_masquerade from courseware.model_data import FieldDataCache -from .module_render import toc_for_course, get_module_for_descriptor, get_module +from .module_render import toc_for_course, get_module_for_descriptor from courseware.models import StudentModule, StudentModuleHistory from course_modes.models import CourseMode diff --git a/lms/djangoapps/django_comment_client/base/views.py b/lms/djangoapps/django_comment_client/base/views.py index 63a7f9a8a2..619e20636e 100644 --- a/lms/djangoapps/django_comment_client/base/views.py +++ b/lms/djangoapps/django_comment_client/base/views.py @@ -17,7 +17,6 @@ from django.views.decorators.http import require_POST, require_GET from django.views.decorators import csrf from django.core.files.storage import get_storage_class from django.utils.translation import ugettext as _ -from django.contrib.auth.models import User from edxmako.shortcuts import render_to_string from courseware.courses import get_course_with_access, get_course_by_id @@ -26,7 +25,6 @@ from course_groups.cohorts import get_cohort_id, is_commentable_cohorted from django_comment_client.utils import JsonResponse, JsonError, extract, add_courseware_context from django_comment_client.permissions import check_permissions_by_view, cached_has_permission -from django_comment_common.models import Role from courseware.access import has_access log = logging.getLogger(__name__) diff --git a/lms/djangoapps/django_comment_client/helpers.py b/lms/djangoapps/django_comment_client/helpers.py index 2d5f87ee19..ce5f4d74a8 100644 --- a/lms/djangoapps/django_comment_client/helpers.py +++ b/lms/djangoapps/django_comment_client/helpers.py @@ -1,13 +1,6 @@ from django.conf import settings -from .mustache_helpers import mustache_helpers -from functools import partial from mako.template import Template -from .utils import extend_content, merge_dict, render_mustache -import django_comment_client.settings as cc_settings - -import pystache_custom as pystache -import urllib import os @@ -30,4 +23,3 @@ def include_mustache_templates(): for file_name in os.listdir(mustache_dir) if is_valid_file_name(file_name) ) - diff --git a/lms/djangoapps/foldit/tests.py b/lms/djangoapps/foldit/tests.py index c97cd2b59d..4e30fe7007 100644 --- a/lms/djangoapps/foldit/tests.py +++ b/lms/djangoapps/foldit/tests.py @@ -9,7 +9,7 @@ from django.core.urlresolvers import reverse from foldit.views import foldit_ops, verify_code from foldit.models import PuzzleComplete, Score from student.models import unique_id_for_user -from student.tests.factories import CourseEnrollmentFactory, UserFactory, UserProfileFactory +from student.tests.factories import CourseEnrollmentFactory, UserFactory from datetime import datetime, timedelta from pytz import UTC diff --git a/lms/djangoapps/instructor/management/tests/test_openended_commands.py b/lms/djangoapps/instructor/management/tests/test_openended_commands.py index 60f53c125b..48b09583cb 100644 --- a/lms/djangoapps/instructor/management/tests/test_openended_commands.py +++ b/lms/djangoapps/instructor/management/tests/test_openended_commands.py @@ -2,7 +2,7 @@ from datetime import datetime import json -from mock import patch, ANY +from mock import patch from pytz import UTC from django.test.utils import override_settings diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py index 94fb3658eb..0f4bad1520 100644 --- a/lms/djangoapps/instructor/views/instructor_dashboard.py +++ b/lms/djangoapps/instructor/views/instructor_dashboard.py @@ -1,7 +1,6 @@ """ Instructor Dashboard Views """ -from functools import partial from django.utils.translation import ugettext as _ from django_future.csrf import ensure_csrf_cookie diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py index a656ac7187..b62bad05e5 100644 --- a/lms/djangoapps/instructor/views/legacy.py +++ b/lms/djangoapps/instructor/views/legacy.py @@ -9,7 +9,6 @@ import re import requests from collections import defaultdict, OrderedDict -from functools import partial from markupsafe import escape from requests.status_codes import codes from StringIO import StringIO diff --git a/lms/djangoapps/shoppingcart/models.py b/lms/djangoapps/shoppingcart/models.py index c25ebacdba..5c98a36feb 100644 --- a/lms/djangoapps/shoppingcart/models.py +++ b/lms/djangoapps/shoppingcart/models.py @@ -6,7 +6,6 @@ from decimal import Decimal import pytz import logging import smtplib -import unicodecsv from boto.exception import BotoServerError # this is a super-class of SESError and catches connection errors from django.dispatch import receiver @@ -34,7 +33,7 @@ from util.query import use_read_replica_if_available from verify_student.models import SoftwareSecurePhotoVerification from .exceptions import (InvalidCartItem, PurchasedCallbackException, ItemAlreadyInCartException, - AlreadyEnrolledInCourseException, CourseDoesNotExistException, ReportException) + AlreadyEnrolledInCourseException, CourseDoesNotExistException) from microsite_configuration.middleware import MicrositeConfiguration diff --git a/lms/djangoapps/shoppingcart/tests/test_models.py b/lms/djangoapps/shoppingcart/tests/test_models.py index c130ecf632..ef210f18df 100644 --- a/lms/djangoapps/shoppingcart/tests/test_models.py +++ b/lms/djangoapps/shoppingcart/tests/test_models.py @@ -2,8 +2,6 @@ Tests for the Shopping Cart Models """ import smtplib -import StringIO -from textwrap import dedent from boto.exception import BotoServerError # this is a super-class of SESError and catches connection errors from mock import patch, MagicMock, sentinel @@ -17,7 +15,7 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE from shoppingcart.models import (Order, OrderItem, CertificateItem, InvalidCartItem, PaidCourseRegistration, - OrderItemSubclassPK, PaidCourseRegistrationAnnotation) + OrderItemSubclassPK) from student.tests.factories import UserFactory from student.models import CourseEnrollment from course_modes.models import CourseMode diff --git a/lms/djangoapps/shoppingcart/tests/test_views.py b/lms/djangoapps/shoppingcart/tests/test_views.py index b18ebe6e8c..9799b6ddda 100644 --- a/lms/djangoapps/shoppingcart/tests/test_views.py +++ b/lms/djangoapps/shoppingcart/tests/test_views.py @@ -20,7 +20,7 @@ from student.models import CourseEnrollment from course_modes.models import CourseMode from edxmako.shortcuts import render_to_response from shoppingcart.processors import render_purchase_form_html -from mock import patch, Mock, sentinel +from mock import patch, Mock from shoppingcart.views import initialize_report diff --git a/lms/djangoapps/shoppingcart/urls.py b/lms/djangoapps/shoppingcart/urls.py index f37e72be8b..b9eb7eb7a5 100644 --- a/lms/djangoapps/shoppingcart/urls.py +++ b/lms/djangoapps/shoppingcart/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import patterns, url from django.conf import settings urlpatterns = patterns('shoppingcart.views', # nopep8 diff --git a/lms/djangoapps/verify_student/models.py b/lms/djangoapps/verify_student/models.py index 2fab204615..d731483ad0 100644 --- a/lms/djangoapps/verify_student/models.py +++ b/lms/djangoapps/verify_student/models.py @@ -10,8 +10,6 @@ photo verification process as generic as possible. """ from datetime import datetime, timedelta from email.utils import formatdate -from hashlib import md5 -import base64 import functools import json import logging diff --git a/lms/djangoapps/verify_student/tests/test_models.py b/lms/djangoapps/verify_student/tests/test_models.py index beac953dec..4a3a3e39a9 100644 --- a/lms/djangoapps/verify_student/tests/test_models.py +++ b/lms/djangoapps/verify_student/tests/test_models.py @@ -2,11 +2,8 @@ from datetime import timedelta, datetime import json from xmodule.modulestore.tests.factories import CourseFactory -from nose.tools import ( - assert_in, assert_is_none, assert_equals, assert_not_equals, assert_raises, - assert_true, assert_false -) -from mock import MagicMock, patch +from nose.tools import assert_is_none, assert_equals, assert_raises, assert_true, assert_false +from mock import patch import pytz from django.test import TestCase from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE @@ -20,8 +17,6 @@ from verify_student.models import ( SoftwareSecurePhotoVerification, VerificationException, ) from reverification.tests.factories import MidcourseReverificationWindowFactory -from util.testing import UrlResetMixin -import verify_student.models FAKE_SETTINGS = { "SOFTWARE_SECURE": { diff --git a/lms/djangoapps/verify_student/tests/test_views.py b/lms/djangoapps/verify_student/tests/test_views.py index 4ddef86f18..4b990984d9 100644 --- a/lms/djangoapps/verify_student/tests/test_views.py +++ b/lms/djangoapps/verify_student/tests/test_views.py @@ -10,7 +10,7 @@ verify_student/start?course_id=MITx/6.002x/2013_Spring # create """ import urllib -from mock import patch, Mock, ANY +from mock import patch, Mock import pytz from datetime import timedelta, datetime diff --git a/lms/djangoapps/verify_student/urls.py b/lms/djangoapps/verify_student/urls.py index 799264cda1..ee52a03720 100644 --- a/lms/djangoapps/verify_student/urls.py +++ b/lms/djangoapps/verify_student/urls.py @@ -1,5 +1,4 @@ -from django.conf.urls import include, patterns, url -from django.views.generic import TemplateView +from django.conf.urls import patterns, url from verify_student import views diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py index f8e5b464e9..2cafa4cd64 100644 --- a/lms/djangoapps/verify_student/views.py +++ b/lms/djangoapps/verify_student/views.py @@ -6,8 +6,6 @@ import json import logging import decimal import datetime -import crum -from track.views import server_track from pytz import UTC from edxmako.shortcuts import render_to_response @@ -21,7 +19,6 @@ from django.views.decorators.http import require_POST from django.views.generic.base import View from django.utils.decorators import method_decorator from django.utils.translation import ugettext as _ -from django.utils.http import urlencode from django.contrib.auth.decorators import login_required from course_modes.models import CourseMode diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py index b1d49b5237..dbda538975 100644 --- a/lms/envs/acceptance.py +++ b/lms/envs/acceptance.py @@ -19,7 +19,7 @@ import logging logging.basicConfig(filename=TEST_ROOT / "log" / "lms_acceptance.log", level=logging.ERROR) import os -from random import choice, randint +from random import choice import string