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

Ned/remove unused imports

cms/djangoapps/contentstore/tests/test_item.py

@@ -1,4 +1,3 @@
-from contentstore.utils import get_modulestore, get_url_reverse
 from contentstore.tests.test_course_settings import CourseTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 from django.core.urlresolvers import reverse

cms/djangoapps/models/settings/course_details.py

@@ -153,9 +153,9 @@ class CourseDetails(object):
         if not raw_video:
             return None
 
-        keystring_matcher = re.search('(?<=embed/)[a-zA-Z0-9_-]+', raw_video)
+        keystring_matcher = re.search(r'(?<=embed/)[a-zA-Z0-9_-]+', raw_video)
         if keystring_matcher is None:
-            keystring_matcher = re.search('<?=\d+:[a-zA-Z0-9_-]+', raw_video)
+            keystring_matcher = re.search(r'<?=\d+:[a-zA-Z0-9_-]+', raw_video)
 
         if keystring_matcher:
             return keystring_matcher.group(0)

cms/djangoapps/models/settings/course_metadata.py

@@ -1,6 +1,5 @@
 from xmodule.modulestore import Location
 from contentstore.utils import get_modulestore
-from xmodule.x_module import XModuleDescriptor
 from xmodule.modulestore.inheritance import own_metadata
 from xblock.core import Scope
 from xmodule.course_module import CourseDescriptor

cms/envs/common.py

@@ -21,7 +21,7 @@ Longer TODO:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=W0401, W0614
+# pylint: disable=W0401, W0611, W0614
 
 import sys
 import lms.envs.common

cms/envs/dev_ike.py

@@ -7,9 +7,7 @@
 # FORCE_SCRIPT_NAME = '/cms'
 
 from .common import *
-from logsettings import get_logger_config
 from .dev import *
-import socket
 
 MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES'] = True
 

cms/urls.py

@@ -1,5 +1,8 @@
 from django.conf import settings
 from django.conf.urls import patterns, include, url
+
+# Import this file so it can do its work, even though we don't use the name.
+# pylint: disable=W0611
 from . import one_time_startup
 
 # Uncomment the next two lines to enable the admin:

common/djangoapps/cache_toolbox/core.py

@@ -12,7 +12,6 @@ from django.core.cache import cache
 from django.db import DEFAULT_DB_ALIAS
 
 from . import app_settings
-from xmodule.contentstore.content import StaticContent
 
 
 def get_instance(model, instance_or_pk, timeout=None, using=None):

common/djangoapps/course_groups/cohorts.py

@@ -3,7 +3,6 @@ This file contains the logic for cohort groups, as exposed internally to the
 forums, and to the cohort admin views.
 """
 
-from django.contrib.auth.models import User
 from django.http import Http404
 import logging
 import random
@@ -27,7 +26,7 @@ def local_random():
     """
     # ironic, isn't it?
     global _local_random
-    
+
     if _local_random is None:
         _local_random = random.Random()
 

common/djangoapps/course_groups/views.py

@@ -1,24 +1,18 @@
 from django_future.csrf import ensure_csrf_cookie
-from django.contrib.auth.decorators import login_required
 from django.views.decorators.http import require_POST
 from django.contrib.auth.models import User
-from django.core.context_processors import csrf
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.core.urlresolvers import reverse
-from django.http import HttpResponse, HttpResponseForbidden, Http404
-from django.shortcuts import redirect
+from django.http import HttpResponse
 import json
 import logging
 import re
 
 from courseware.courses import get_course_with_access
-from mitxmako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response
 
-from .models import CourseUserGroup
 from . import cohorts
 
-import track.views
-
 
 log = logging.getLogger(__name__)
 

common/djangoapps/mitxmako/makoloader.py

@@ -7,7 +7,6 @@ from django.template.loaders.filesystem import Loader as FilesystemLoader
 from django.template.loaders.app_directories import Loader as AppDirectoriesLoader
 
 from mitxmako.template import Template
-import mitxmako.middleware
 
 import tempdir
 

common/djangoapps/status/status.py

@@ -6,7 +6,6 @@ from django.conf import settings
 import json
 import logging
 import os
-import sys
 
 log = logging.getLogger(__name__)
 

common/djangoapps/student/management/commands/6002exportusers.py

@@ -11,12 +11,7 @@
 import datetime
 import json
 
-import os.path
-
-from lxml import etree
-
 from django.core.management.base import BaseCommand
-from django.conf import settings
 from django.contrib.auth.models import User
 
 from student.models import UserProfile

common/djangoapps/student/management/commands/6002importusers.py

@@ -3,17 +3,11 @@
 ## See export for more info
 
 
-import datetime
 import json
 
 import dateutil.parser
 
-import os.path
-
-from lxml import etree
-
 from django.core.management.base import BaseCommand
-from django.conf import settings
 from django.contrib.auth.models import User
 
 from student.models import UserProfile

common/djangoapps/student/management/commands/assigngroups.py

@@ -1,9 +1,4 @@
-import os.path
-
-from lxml import etree
-
 from django.core.management.base import BaseCommand
-from django.conf import settings
 from django.contrib.auth.models import User
 
 import mitxmako.middleware as middleware

common/djangoapps/student/management/commands/create_random_users.py

@@ -2,9 +2,7 @@
 ## A script to create some dummy users
 
 from django.core.management.base import BaseCommand
-from django.conf import settings
-from django.contrib.auth.models import User
-from student.models import UserProfile, CourseEnrollment
+from student.models import CourseEnrollment
 
 from student.views import _do_create_account, get_random_post_override
 

common/djangoapps/student/management/commands/emaillist.py

@@ -1,9 +1,4 @@
-import os.path
-
-from lxml import etree
-
 from django.core.management.base import BaseCommand
-from django.conf import settings
 from django.contrib.auth.models import User
 
 import mitxmako.middleware as middleware

common/djangoapps/student/management/commands/massemail.py

@@ -1,9 +1,4 @@
-import os.path
-
-from lxml import etree
-
 from django.core.management.base import BaseCommand
-from django.conf import settings
 from django.contrib.auth.models import User
 
 import mitxmako.middleware as middleware

common/djangoapps/student/management/commands/massemailtxt.py

@@ -1,11 +1,8 @@
 import os.path
 import time
 
-from lxml import etree
-
 from django.core.management.base import BaseCommand
 from django.conf import settings
-from django.contrib.auth.models import User
 
 import mitxmako.middleware as middleware
 

common/djangoapps/student/management/commands/pearson_dump.py

@@ -2,7 +2,7 @@ from optparse import make_option
 from json import dump
 from datetime import datetime
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 
 from student.models import TestCenterRegistration
 

common/djangoapps/student/management/commands/pearson_import_conf_zip.py

@@ -3,11 +3,8 @@ import csv
 from zipfile import ZipFile, is_zipfile
 from time import strptime, strftime
 
-from collections import OrderedDict
 from datetime import datetime
-from os.path import isdir
-from optparse import make_option
-from dogapi import dog_http_api, dog_stats_api
+from dogapi import dog_http_api
 
 from django.core.management.base import BaseCommand, CommandError
 from django.conf import settings

common/djangoapps/student/management/commands/set_staff.py

@@ -26,7 +26,7 @@ class Command(BaseCommand):
             raise CommandError('Usage is set_staff {0}'.format(self.args))
 
         for user in args:
-            if re.match('[^@]+@[^@]+\.[^@]+', user):
+            if re.match(r'[^@]+@[^@]+\.[^@]+', user):
                 try:
                     v = User.objects.get(email=user)
                 except:

common/djangoapps/student/management/commands/tests/test_pearson.py

@@ -14,7 +14,7 @@ from django.test import TestCase
 from django.core.management import call_command
 from nose.plugins.skip import SkipTest
 
-from student.models import User, TestCenterRegistration, TestCenterUser, get_testcenter_registration
+from student.models import User, TestCenterUser, get_testcenter_registration
 
 log = logging.getLogger(__name__)
 

common/djangoapps/student/management/commands/userinfo.py

@@ -1,9 +1,4 @@
-import os.path
-
-from lxml import etree
-
 from django.core.management.base import BaseCommand
-from django.conf import settings
 from django.contrib.auth.models import User
 
 import mitxmako.middleware as middleware

common/djangoapps/student/views.py

@@ -3,8 +3,8 @@ import feedparser
 import json
 import logging
 import random
+import re
 import string
-import sys
 import urllib
 import uuid
 import time
@@ -20,9 +20,9 @@ from django.core.mail import send_mail
 from django.core.urlresolvers import reverse
 from django.core.validators import validate_email, validate_slug, ValidationError
 from django.db import IntegrityError, transaction
-from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, HttpResponseNotAllowed, HttpResponseRedirect, Http404
+from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, HttpResponseNotAllowed, Http404
 from django.shortcuts import redirect
-from django_future.csrf import ensure_csrf_cookie, csrf_exempt
+from django_future.csrf import ensure_csrf_cookie
 from django.utils.http import cookie_date
 
 from mitxmako.shortcuts import render_to_response, render_to_string
@@ -39,14 +39,11 @@ from certificates.models import CertificateStatuses, certificate_status_for_stud
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore import Location
 
 from collections import namedtuple
 
 from courseware.courses import get_courses, sort_by_announcement
 from courseware.access import has_access
-from courseware.views import get_module_for_descriptor, jump_to
-from courseware.model_data import ModelDataCache
 
 from statsd import statsd
 from pytz import UTC
@@ -99,9 +96,8 @@ def course_from_id(course_id):
     course_loc = CourseDescriptor.id_to_location(course_id)
     return modulestore().get_instance(course_id, course_loc)
 
-import re
-day_pattern = re.compile('\s\d+,\s')
-multimonth_pattern = re.compile('\s?\-\s?\S+\s')
+day_pattern = re.compile(r'\s\d+,\s')
+multimonth_pattern = re.compile(r'\s?\-\s?\S+\s')
 
 
 def get_date_for_press(publish_date):

common/djangoapps/terrain/browser.py

@@ -4,7 +4,6 @@ Browser set up for acceptance tests.
 
 #pylint: disable=E1101
 #pylint: disable=W0613
-#pylint: disable=W0611
 
 from lettuce import before, after, world
 from splinter.browser import Browser
@@ -15,8 +14,9 @@ from selenium.common.exceptions import WebDriverException
 
 # Let the LMS and CMS do their one-time setup
 # For example, setting up mongo caches
-from lms import one_time_startup
-from cms import one_time_startup
+# These names aren't used, but do important work on import.
+from lms import one_time_startup        # pylint: disable=W0611
+from cms import one_time_startup        # pylint: disable=W0611
 
 # There is an import issue when using django-staticfiles with lettuce
 # Lettuce assumes that we are using django.contrib.staticfiles,

common/djangoapps/terrain/course_helpers.py

@@ -1,7 +1,7 @@
 # pylint: disable=C0111
 # pylint: disable=W0621
 
-from lettuce import world, step
+from lettuce import world
 from .factories import *
 from django.conf import settings
 from django.http import HttpRequest
@@ -15,7 +15,6 @@ from xmodule.templates import update_templates
 from bs4 import BeautifulSoup
 import os.path
 from urllib import quote_plus
-from lettuce.django import django_url
 
 
 @world.absorb

common/djangoapps/terrain/steps.py

@@ -15,13 +15,13 @@ from lettuce import world, step
 from .course_helpers import *
 from .ui_helpers import *
 from lettuce.django import django_url
-from nose.tools import assert_equals, assert_in
+from nose.tools import assert_equals
 
 from logging import getLogger
 logger = getLogger(__name__)
 
 
-@step(u'I wait (?:for )?"(\d+)" seconds?$')
+@step(r'I wait (?:for )?"(\d+)" seconds?$')
 def wait(step, seconds):
     world.wait(seconds)
 

common/djangoapps/track/middleware.py

@@ -1,7 +1,5 @@
 import json
 
-from django.conf import settings
-
 import views
 
 

common/djangoapps/util/models.py

@@ -1,3 +1 @@
-from django.db import models
-
 # Create your models here.

common/djangoapps/util/tests/test_memcache.py

@@ -4,7 +4,6 @@ Tests for memcache in util app
 
 from django.test import TestCase
 from django.core.cache import get_cache
-from django.conf import settings
 from util.memcache import safe_key
 
 

common/djangoapps/util/tests/test_submit_feedback.py

@@ -1,6 +1,5 @@
 """Tests for the Zendesk"""
 
-from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
 from django.http import Http404
 from django.test import TestCase

common/djangoapps/util/views.py

@@ -1,20 +1,12 @@
-import datetime
 import json
 import logging
-import pprint
 import sys
 
 from django.conf import settings
-from django.contrib.auth.models import User
-from django.core.context_processors import csrf
-from django.core.mail import send_mail
 from django.core.validators import ValidationError, validate_email
-from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponseNotAllowed, HttpResponseServerError
-from django.shortcuts import redirect
-from django_future.csrf import ensure_csrf_cookie
+from django.http import Http404, HttpResponse, HttpResponseNotAllowed
 from dogapi import dog_stats_api
-from mitxmako.shortcuts import render_to_response, render_to_string
-from urllib import urlencode
+from mitxmako.shortcuts import render_to_response
 import zendesk
 
 import calc

common/lib/capa/capa/capa_problem.py

@@ -103,8 +103,8 @@ class LoncapaProblem(object):
         self.input_state = state.get('input_state', {})
 
         # Convert startouttext and endouttext to proper <text></text>
-        problem_text = re.sub("startouttext\s*/", "text", problem_text)
-        problem_text = re.sub("endouttext\s*/", "/text", problem_text)
+        problem_text = re.sub(r"startouttext\s*/", "text", problem_text)
+        problem_text = re.sub(r"endouttext\s*/", "/text", problem_text)
         self.problem_text = problem_text
 
         # parse problem XML file into an element tree

common/lib/capa/capa/checker.py

@@ -10,7 +10,6 @@ import sys
 from path import path
 
 from cStringIO import StringIO
-from collections import defaultdict
 
 from calc import UndefinedVariable
 from capa.capa_problem import LoncapaProblem

common/lib/capa/capa/customrender.py

@@ -10,8 +10,6 @@ from .registry import TagRegistry
 
 import logging
 import re
-import shlex  # for splitting quoted strings
-import json
 
 from lxml import etree
 import xml.sax.saxutils as saxutils
@@ -28,7 +26,7 @@ class MathRenderer(object):
     tags = ['math']
 
     def __init__(self, system, xml):
-        '''
+        r'''
         Render math using latex-like formatting.
 
         Examples:
@@ -43,7 +41,7 @@ class MathRenderer(object):
         self.system = system
         self.xml = xml
 
-        mathstr = re.sub('\$(.*)\$', r'[mathjaxinline]\1[/mathjaxinline]', xml.text)
+        mathstr = re.sub(r'\$(.*)\$', r'[mathjaxinline]\1[/mathjaxinline]', xml.text)
         mtag = 'mathjax'
         if not r'\displaystyle' in mathstr:
             mtag += 'inline'

common/lib/capa/capa/inputtypes.py

@@ -856,7 +856,7 @@ class ImageInput(InputTypeBase):
         """
         if value is of the form [x,y] then parse it and send along coordinates of previous answer
         """
-        m = re.match('\[([0-9]+),([0-9]+)]',
+        m = re.match(r'\[([0-9]+),([0-9]+)]',
                      self.value.strip().replace(' ', ''))
         if m:
             # Note: we subtract 15 to compensate for the size of the dot on the screen.

common/lib/capa/capa/responsetypes.py

@@ -11,7 +11,6 @@ Used by capa_problem.py
 # standard library imports
 import abc
 import cgi
-import hashlib
 import inspect
 import json
 import logging
@@ -1903,8 +1902,7 @@ class ImageResponse(LoncapaResponse):
             if not given:  # No answer to parse. Mark as incorrect and move on
                 continue
             # parse given answer
-            m = re.match(
-                '\[([0-9]+),([0-9]+)]', given.strip().replace(' ', ''))
+            m = re.match(r'\[([0-9]+),([0-9]+)]', given.strip().replace(' ', ''))
             if not m:
                 raise Exception('[capamodule.capa.responsetypes.imageinput] '
                                 'error grading %s (input=%s)' % (aid, given))
@@ -1919,7 +1917,7 @@ class ImageResponse(LoncapaResponse):
                     # parse expected answer
                     # TODO: Compile regexp on file load
                     m = re.match(
-                        '[\(\[]([0-9]+),([0-9]+)[\)\]]-[\(\[]([0-9]+),([0-9]+)[\)\]]',
+                        r'[\(\[]([0-9]+),([0-9]+)[\)\]]-[\(\[]([0-9]+),([0-9]+)[\)\]]',
                         solution_rectangle.strip().replace(' ', ''))
                     if not m:
                         msg = 'Error in problem specification! cannot parse rectangle in %s' % (

common/lib/capa/capa/tests/test_html_render.py

@@ -2,7 +2,6 @@ import unittest
 from lxml import etree
 import os
 import textwrap
-import json
 
 import mock
 

common/lib/capa/capa/util.py

@@ -1,4 +1,4 @@
-from calc import evaluator, UndefinedVariable
+from calc import evaluator
 from cmath import isinf
 
 #-----------------------------------------------------------------------------

common/lib/chem/chem/chemcalc.py

@@ -1,16 +1,7 @@
 from __future__ import division
-import copy
 from fractions import Fraction
-import logging
-import math
-import operator
-import re
-import numpy
-import numbers
-import scipy.constants
 
-from pyparsing import (Literal, Keyword, Word, nums, StringEnd, Optional,
-                       Forward, OneOrMore, ParseException)
+from pyparsing import (Literal, StringEnd, OneOrMore, ParseException)
 import nltk
 from nltk.tree import Tree
 

common/lib/symmath/symmath/formula.py

@@ -10,7 +10,6 @@
 # Provides sympy representation.
 
 import os
-import sys
 import string
 import re
 import logging
@@ -25,8 +24,7 @@ from sympy.physics.quantum.state import *
 # from sympy.core.operations import LatticeOp
 # import sympy.physics.quantum.qubit
 
-import urllib
-from xml.sax.saxutils import escape, unescape
+from xml.sax.saxutils import unescape
 import sympy
 import unicodedata
 from lxml import etree
@@ -52,7 +50,7 @@ class dot(sympy.operations.LatticeOp):	 # my dot product
 
 
 def _print_dot(self, expr):
-    return '{((%s) \cdot (%s))}' % (expr.args[0], expr.args[1])
+    return r'{((%s) \cdot (%s))}' % (expr.args[0], expr.args[1])
 
 LatexPrinter._print_dot = _print_dot
 
@@ -204,7 +202,7 @@ class formula(object):
         return xml
 
     def preprocess_pmathml(self, xml):
-        '''
+        r'''
         Pre-process presentation MathML from ASCIIMathML to make it more
         acceptable for SnuggleTeX, and also to accomodate some sympy
         conventions (eg hat(i) for \hat{i}).

common/lib/symmath/symmath/symmath_check.py

@@ -8,10 +8,6 @@
 #
 # Takes in math expressions given as Presentation MathML (from ASCIIMathML), converts to Content MathML using SnuggleTeX
 
-import os
-import sys
-import string
-import re
 import traceback
 from .formula import *
 import logging

common/lib/xmodule/xmodule/modulestore/tests/factories.py

@@ -1,5 +1,4 @@
 from factory import Factory, lazy_attribute_sequence, lazy_attribute
-from time import gmtime
 from uuid import uuid4
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore

common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py

@@ -1,6 +1,6 @@
-from nose.tools import assert_equals, assert_raises, assert_not_equals, with_setup
+from nose.tools import assert_equals, assert_raises
 
-from xmodule.modulestore.exceptions import ItemNotFoundError, NoPathToItem
+from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore.search import path_to_location
 
 

common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py

@@ -1,6 +1,5 @@
 import pymongo
 
-from mock import Mock
 from nose.tools import assert_equals, assert_raises, assert_not_equals, assert_false
 from pprint import pprint
 

common/lib/xmodule/xmodule/modulestore/xml.py

@@ -38,7 +38,7 @@ log = logging.getLogger(__name__)
 # into the cms from xml
 def clean_out_mako_templating(xml_string):
     xml_string = xml_string.replace('%include', 'include')
-    xml_string = re.sub("(?m)^\s*%.*$", '', xml_string)
+    xml_string = re.sub(r"(?m)^\s*%.*$", '', xml_string)
     return xml_string
 
 

common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

@@ -1,13 +1,10 @@
 import json
 import logging
 from lxml import etree
-from lxml.html import rewrite_links
 from xmodule.timeinfo import TimeInfo
 from xmodule.capa_module import ComplexEncoder
-from xmodule.editing_module import EditingDescriptor
 from xmodule.progress import Progress
 from xmodule.stringify import stringify_children
-from xmodule.xml_module import XmlDescriptor
 import self_assessment_module
 import open_ended_module
 from .combined_open_ended_rubric import CombinedOpenEndedRubric, GRADER_TYPE_IMAGE_DICT, HUMAN_GRADER_TYPE, LEGEND_LIST

common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py

@@ -3,7 +3,6 @@ import json
 import logging
 import requests
 from requests.exceptions import RequestException, ConnectionError, HTTPError
-import sys
 
 from .combined_open_ended_rubric import CombinedOpenEndedRubric
 from lxml import etree

common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py

@@ -14,9 +14,7 @@ from urlparse import urlparse
 import requests
 from boto.s3.connection import S3Connection
 from boto.s3.key import Key
-import pickle
 import logging
-import re
 
 log = logging.getLogger(__name__)
 

common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py

@@ -11,10 +11,8 @@ from lxml import etree
 import capa.xqueue_interface as xqueue_interface
 
 from xmodule.capa_module import ComplexEncoder
-from xmodule.editing_module import EditingDescriptor
 from xmodule.progress import Progress
 from xmodule.stringify import stringify_children
-from xmodule.xml_module import XmlDescriptor
 from capa.util import *
 import openendedchild
 

common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py

@@ -3,14 +3,8 @@ import logging
 from lxml.html.clean import Cleaner, autolink_html
 import re
 
-from xmodule.capa_module import ComplexEncoder
 import open_ended_image_submission
-from xmodule.editing_module import EditingDescriptor
-from xmodule.html_checker import check_html
 from xmodule.progress import Progress
-from xmodule.stringify import stringify_children
-from xmodule.xml_module import XmlDescriptor
-from xmodule.modulestore import Location
 from capa.util import *
 from .peer_grading_service import PeerGradingService, MockPeerGradingService
 import controller_query_service

common/lib/xmodule/xmodule/progress.py

@@ -13,7 +13,6 @@ For most subclassing needs, you should only need to reimplement
 frac() and __str__().
 '''
 
-from collections import namedtuple
 import numbers
 
 

common/lib/xmodule/xmodule/schematic_module.py

@@ -1,4 +1,3 @@
-import json
 
 from .x_module import XModule, XModuleDescriptor
 

common/lib/xmodule/xmodule/template_module.py

@@ -3,7 +3,6 @@ from xmodule.raw_module import RawDescriptor
 from lxml import etree
 from mako.template import Template
 from xmodule.modulestore.django import modulestore
-import logging
 
 
 class CustomTagModule(XModule):

common/lib/xmodule/xmodule/tests/test_html_module.py

@@ -3,7 +3,6 @@ import unittest
 from mock import Mock
 
 from xmodule.html_module import HtmlModule
-from xmodule.modulestore import Location
 
 from . import get_test_system
 

common/lib/xmodule/xmodule/tests/test_peer_grading.py

@@ -2,10 +2,6 @@ import unittest
 from xmodule.modulestore import Location
 from .import get_test_system
 from test_util_open_ended import MockQueryDict, DummyModulestore
-import json
-
-from xmodule.peer_grading_module import PeerGradingModule, PeerGradingDescriptor
-from xmodule.open_ended_grading_classes.grading_service_module import GradingServiceError
 
 import logging
 

common/lib/xmodule/xmodule/tests/test_randomize_module.py

@@ -1,11 +1,6 @@
 import unittest
-from time import strptime
-from fs.memoryfs import MemoryFS
-
-from mock import Mock, patch
-
-from xmodule.modulestore.xml import ImportSystem, XMLModuleStore
 
+from .test_course_module import DummySystem as DummyImportSystem
 
 ORG = 'test_org'
 COURSE = 'test_course'
@@ -13,9 +8,6 @@ COURSE = 'test_course'
 START = '2013-01-01T01:00:00'
 
 
-from .test_course_module import DummySystem as DummyImportSystem
-
-
 class RandomizeModuleTestCase(unittest.TestCase):
     """Make sure the randomize module works"""
     @staticmethod

common/lib/xmodule/xmodule/tests/test_stringify.py

@@ -1,4 +1,4 @@
-from nose.tools import assert_equals, assert_true, assert_false
+from nose.tools import assert_equals
 from lxml import etree
 from xmodule.stringify import stringify_children
 
@@ -12,7 +12,7 @@ def test_stringify():
 
 
 def test_stringify_again():
-    html = """<html name="Voltage Source Answer" >A voltage source is non-linear!
+    html = r"""<html name="Voltage Source Answer" >A voltage source is non-linear!
 <div align="center">
     <img src="/static/images/circuits/voltage-source.png"/>
     \(V=V_C\)

common/lib/xmodule/xmodule/tests/test_util_open_ended.py

@@ -1,6 +1,6 @@
 from .import get_test_system
 from xmodule.modulestore import Location
-from xmodule.modulestore.xml import ImportSystem, XMLModuleStore
+from xmodule.modulestore.xml import XMLModuleStore
 from xmodule.tests.test_export import DATA_DIR
 
 OPEN_ENDED_GRADING_INTERFACE = {

common/lib/xmodule/xmodule/timelimit_module.py

@@ -1,4 +1,3 @@
-import json
 import logging
 
 from lxml import etree

lms/djangoapps/circuit/models.py

@@ -1,7 +1,4 @@
-import uuid
-
 from django.db import models
-from django.contrib.auth.models import User
 
 
 class ServerCircuit(models.Model):

lms/djangoapps/circuit/views.py

@@ -1,13 +1,10 @@
 import json
-import os
 
 import xml.etree.ElementTree
 
-from django.conf import settings
 from django.http import Http404
 from django.http import HttpResponse
-from django.shortcuts import redirect
-from mitxmako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response
 
 from .models import ServerCircuit
 

lms/djangoapps/course_wiki/views.py

@@ -49,7 +49,7 @@ def course_wiki_redirect(request, course_id):
     if not course_slug:
         log.exception("This course is improperly configured. The slug cannot be empty.")
         valid_slug = False
-    if re.match('^[-\w\.]+$', course_slug) is None:
+    if re.match(r'^[-\w\.]+$', course_slug) is None:
         log.exception("This course is improperly configured. The slug can only contain letters, numbers, periods or hyphens.")
         valid_slug = False
 

lms/djangoapps/courseware/access.py

@@ -2,7 +2,6 @@
 Ideally, it will be the only place that needs to know about any special settings
 like DISABLE_START_DATES"""
 import logging
-import time
 from datetime import datetime, timedelta
 from functools import partial
 

lms/djangoapps/courseware/courses.py

@@ -1,14 +1,9 @@
 from collections import defaultdict
 from fs.errors import ResourceNotFoundError
-from functools import wraps
 import logging
 import inspect
 
-from lxml.html import rewrite_links
-
 from path import path
-from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.http import Http404
 
 from .module_render import get_module
@@ -18,7 +13,6 @@ from xmodule.modulestore.django import modulestore
 from xmodule.contentstore.content import StaticContent
 from xmodule.modulestore.xml import XMLModuleStore
 from xmodule.modulestore.exceptions import ItemNotFoundError
-from xmodule.x_module import XModule
 from courseware.model_data import ModelDataCache
 from static_replace import replace_static_urls
 from courseware.access import has_access

lms/djangoapps/courseware/management/commands/clean_xml.py

@@ -2,15 +2,12 @@ import os
 import sys
 import traceback
 
-from filecmp import dircmp
 from fs.osfs import OSFS
 from path import path
-from lxml import etree
 
 from django.core.management.base import BaseCommand
 
 from xmodule.modulestore.xml import XMLModuleStore
-from xmodule.errortracker import make_error_tracker
 
 
 def traverse_tree(course):

lms/djangoapps/courseware/management/commands/metadata_to_json.py

@@ -2,7 +2,6 @@
 A script to walk a course xml tree, generate a dictionary of all the metadata,
 and print it out as a json dict.
 """
-import os
 import sys
 import json
 

lms/djangoapps/courseware/module_render.py

@@ -1,6 +1,5 @@
 import json
 import logging
-import pyparsing
 import re
 import sys
 import static_replace

lms/djangoapps/courseware/tabs.py

@@ -11,23 +11,16 @@ actually generates the CourseTab.
 
 from collections import namedtuple
 import logging
-import json
 
 from django.conf import settings
 from django.core.urlresolvers import reverse
 
-from fs.errors import ResourceNotFoundError
-
 from courseware.access import has_access
 
-from lxml.html import rewrite_links
 from .module_render import get_module
 from courseware.access import has_access
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.xml import XMLModuleStore
-from xmodule.x_module import XModule
-from student.models import unique_id_for_user
 from courseware.model_data import ModelDataCache
 
 from open_ended_grading import open_ended_notifications

lms/djangoapps/courseware/tests/test_access.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from mock import Mock
 
 from django.test import TestCase
 

lms/djangoapps/courseware/tests/test_masquerade.py

@@ -12,7 +12,7 @@ from django.test.utils import override_settings
 
 from django.core.urlresolvers import reverse
 
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group
 from courseware.access import _course_staff_group_name
 from courseware.tests.tests import LoginEnrollmentTestCase, TEST_DATA_XML_MODULESTORE, get_user
 from xmodule.modulestore.django import modulestore

lms/djangoapps/courseware/tests/test_module_render.py

@@ -8,7 +8,6 @@ from django.test import TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
 
-from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore.django import modulestore
 import courseware.module_render as render
 from courseware.tests.tests import LoginEnrollmentTestCase

lms/djangoapps/dashboard/models.py

@@ -1,3 +1 @@
-from django.db import models
-
 # Create your models here.

lms/djangoapps/dashboard/views.py

@@ -1,11 +1,8 @@
-# Create your views here.
-import json
-from datetime import datetime
 from django.http import Http404
 from mitxmako.shortcuts import render_to_response
 from django.db import connection
 
-from student.models import CourseEnrollment, CourseEnrollmentAllowed
+from student.models import CourseEnrollment
 from django.contrib.auth.models import User
 
 

lms/djangoapps/debug/models.py

@@ -1,3 +1 @@
-from django.db import models
-
 # Create your models here.

lms/djangoapps/debug/views.py

@@ -5,7 +5,7 @@ import traceback
 
 from django.http import Http404
 from django.contrib.auth.decorators import login_required
-from django_future.csrf import ensure_csrf_cookie, csrf_exempt
+from django_future.csrf import ensure_csrf_cookie
 from mitxmako.shortcuts import render_to_response
 
 from codejail.safe_exec import safe_exec

lms/djangoapps/django_comment_client/helpers.py

@@ -1,8 +1,5 @@
-from django.core.urlresolvers import reverse
 from django.conf import settings
-from mitxmako.shortcuts import render_to_string
 from .mustache_helpers import mustache_helpers
-from django.core.urlresolvers import reverse
 from functools import partial
 
 from .utils import *

lms/djangoapps/django_comment_client/management/commands/show_permissions.py

@@ -1,5 +1,4 @@
 from django.core.management.base import BaseCommand, CommandError
-from django_comment_common.models import Permission, Role
 from django.contrib.auth.models import User
 
 

lms/djangoapps/django_comment_client/mustache_helpers.py

@@ -1,7 +1,6 @@
 from .utils import url_for_tags as _url_for_tags
 
 import django.core.urlresolvers as urlresolvers
-import urllib
 import sys
 import inspect
 

lms/djangoapps/django_comment_client/permissions.py

@@ -1,8 +1,3 @@
-from django_comment_common.models import Role, Permission
-from django.db.models.signals import post_save
-from django.dispatch import receiver
-from student.models import CourseEnrollment
-
 import logging
 from util.cache import cache
 from django.core import cache

lms/djangoapps/django_comment_client/tests/test_models.py

@@ -1,5 +1,4 @@
 import django_comment_common.models as models
-import django_comment_client.permissions as permissions
 from django.test import TestCase
 
 
@@ -44,7 +43,7 @@ class RoleClassTestCase(TestCase):
 
 class PermissionClassTestCase(TestCase):
     def setUp(self):
-        self.permission = permissions.Permission.objects.get_or_create(name="test")[0]
+        self.permission = models.Permission.objects.get_or_create(name="test")[0]
 
     def testUnicode(self):
         self.assertEqual(str(self.permission), "test")

lms/djangoapps/foldit/models.py

@@ -1,11 +1,8 @@
 import logging
 
-from django.conf import settings
 from django.contrib.auth.models import User
 from django.db import models
 
-from student.models import unique_id_for_user
-
 
 log = logging.getLogger(__name__)
 

lms/djangoapps/foldit/tests.py

@@ -5,7 +5,6 @@ from functools import partial
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.conf import settings
 from django.core.urlresolvers import reverse
 
 from foldit.views import foldit_ops, verify_code

lms/djangoapps/foldit/views.py

@@ -50,7 +50,7 @@ def foldit_ops(request):
             # To allow for fixes without breaking this, the regex should only
             # match unquoted strings,
             a = re.compile(r':([a-zA-Z]*),')
-            puzzle_scores_json = re.sub(a, ':"\g<1>",', puzzle_scores_json)
+            puzzle_scores_json = re.sub(a, r':"\g<1>",', puzzle_scores_json)
             puzzle_scores = json.loads(puzzle_scores_json)
             responses.append(save_scores(request.user, puzzle_scores))
 

lms/djangoapps/instructor/management/commands/compute_grades.py

@@ -3,18 +3,10 @@
 # django management command: dump grades to csv files
 # for use by batch processes
 
-import os
-import sys
-import string
-import datetime
-import json
-
-#import student.models
 from instructor.offline_gradecalc import *
 from courseware.courses import get_course_by_id
 from xmodule.modulestore.django import modulestore
 
-from django.conf import settings
 from django.core.management.base import BaseCommand
 
 

lms/djangoapps/instructor/offline_gradecalc.py

@@ -6,16 +6,12 @@
 # The grades are stored in the OfflineComputedGrade table of the courseware model.
 
 import json
-import logging
 import time
 
-import courseware.models
-
-from collections import namedtuple
 from json import JSONEncoder
 from courseware import grades, models
 from courseware.courses import get_course_by_id
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import User
 
 
 class MyEncoder(JSONEncoder):

lms/djangoapps/instructor/tests/test_enrollment.py

@@ -9,7 +9,6 @@ from django.core.urlresolvers import reverse
 from courseware.access import _course_staff_group_name
 from courseware.tests.tests import LoginEnrollmentTestCase, TEST_DATA_XML_MODULESTORE, get_user
 from xmodule.modulestore.django import modulestore
-import xmodule.modulestore.django
 from student.models import CourseEnrollment, CourseEnrollmentAllowed
 from instructor.views import get_and_clean_student_list
 

lms/djangoapps/instructor/tests/test_gradebook.py

@@ -2,13 +2,11 @@
 Tests of the instructor dashboard gradebook
 """
 
-from django.test import TestCase
 from django.test.utils import override_settings
 from django.core.urlresolvers import reverse
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
-from student.tests.factories import UserFactory, CourseEnrollmentFactory, UserProfileFactory, AdminFactory
+from student.tests.factories import UserFactory, CourseEnrollmentFactory, AdminFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from mock import patch, DEFAULT
 from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
 from capa.tests.response_xml_factory import StringResponseXMLFactory
 from courseware.tests.factories import StudentModuleFactory

lms/djangoapps/instructor/tests/test_xss.py

@@ -3,7 +3,6 @@ Tests of various instructor dashboard features that include lists of students
 """
 
 from django.conf import settings
-from django.test import TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
 from markupsafe import escape

lms/djangoapps/instructor_task/tests/test_integration.py

@@ -17,7 +17,6 @@ from django.core.urlresolvers import reverse
 from capa.tests.response_xml_factory import (CodeResponseXMLFactory,
                                              CustomResponseXMLFactory)
 from xmodule.modulestore.tests.factories import ItemFactory
-from xmodule.modulestore.exceptions import ItemNotFoundError
 
 from courseware.model_data import StudentModule
 

lms/djangoapps/instructor_task/tests/test_tasks.py

@@ -19,7 +19,7 @@ from courseware.tests.factories import StudentModuleFactory
 from student.tests.factories import UserFactory
 
 from instructor_task.models import InstructorTask
-from instructor_task.tests.test_base import InstructorTaskModuleTestCase, TEST_COURSE_ORG, TEST_COURSE_NUMBER
+from instructor_task.tests.test_base import InstructorTaskModuleTestCase
 from instructor_task.tests.factories import InstructorTaskFactory
 from instructor_task.tasks import rescore_problem, reset_problem_attempts, delete_problem_state
 from instructor_task.tasks_helper import UpdateProblemModuleStateError, update_problem_module_state

lms/djangoapps/licenses/management/commands/generate_serial_numbers.py

@@ -1,6 +1,4 @@
-import os.path
 from uuid import uuid4
-from optparse import make_option
 
 from django.utils.html import escape
 from django.core.management.base import BaseCommand, CommandError

lms/djangoapps/licenses/management/commands/import_serial_numbers.py

@@ -1,5 +1,4 @@
 import os.path
-from optparse import make_option
 
 from django.utils.html import escape
 from django.core.management.base import BaseCommand, CommandError

lms/djangoapps/lms_migration/management/commands/create_groups.py

@@ -5,13 +5,10 @@
 # Create all staff_* groups for classes in data directory.
 
 import os
-import sys
-import string
-import re
 
 from django.core.management.base import BaseCommand
 from django.conf import settings
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group
 from path import path
 from lxml import etree
 

lms/djangoapps/lms_migration/management/commands/create_user.py

@@ -7,7 +7,6 @@
 import os
 import sys
 import string
-import re
 import datetime
 from getpass import getpass
 import json

lms/djangoapps/lms_migration/management/commands/manage_course_groups.py

@@ -4,17 +4,9 @@
 #
 # interactively list and edit membership in course staff and instructor groups
 
-import os
-import sys
-import string
 import re
-import datetime
-from getpass import getpass
-import json
-import readline
 
 from django.core.management.base import BaseCommand
-from django.conf import settings
 from django.contrib.auth.models import User, Group
 
 #-----------------------------------------------------------------------------

lms/djangoapps/lms_migration/migrate.py

@@ -5,7 +5,6 @@
 import json
 import logging
 import os
-from pprint import pprint
 import xmodule.modulestore.django as xmodule_django
 from xmodule.modulestore.django import modulestore
 

lms/djangoapps/notes/tests.py

@@ -9,9 +9,7 @@ from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 
 import collections
-import unittest
 import json
-import logging
 
 from . import utils, api, models
 

lms/djangoapps/notes/views.py

@@ -4,7 +4,6 @@ from mitxmako.shortcuts import render_to_response
 from courseware.courses import get_course_with_access
 from notes.models import Note
 from notes.utils import notes_enabled_for_course
-import json
 
 
 @login_required

lms/djangoapps/open_ended_grading/staff_grading.py

@@ -5,7 +5,6 @@ LMS part of instructor grading:
 - calls the instructor grading service
 """
 
-import json
 import logging
 
 log = logging.getLogger(__name__)