Merge pull request #5560 from edx/benp/improve-pylint-violations

pylint cleanup.

cms/djangoapps/contentstore/views/tests/test_course_updates.py

@@ -18,9 +18,9 @@ class CourseUpdateTest(CourseTestCase):
         kwargs = {'provided_id': str(provided_id)} if provided_id else None
         return reverse_course_url('course_info_update_handler', course_key, kwargs=kwargs)
 
-    '''The do all and end all of unit test cases.'''
+    # The do all and end all of unit test cases.
     def test_course_update(self):
-        '''Go through each interface and ensure it works.'''
+        """Go through each interface and ensure it works."""
         def get_response(content, date):
             """
             Helper method for making call to server and returning response.

cms/djangoapps/contentstore/views/tests/test_import_export.py

@@ -217,6 +217,7 @@ class ImportTestCase(CourseTestCase):
         """
 
         def try_tar(tarpath):
+            """ Attempt to tar an unacceptable file """
             with open(tarpath) as tar:
                 args = {"name": tarpath, "course-data": [tar]}
                 resp = self.client.post(self.url, args)
@@ -307,10 +308,10 @@ class ExportTestCase(CourseTestCase):
 
         self._verify_export_failure(u'/container/{}'.format(vertical.location))
 
-    def _verify_export_failure(self, expectedText):
+    def _verify_export_failure(self, expected_text):
         """ Export failure helper method. """
         resp = self.client.get(self.url, HTTP_ACCEPT='application/x-tgz')
         self.assertEquals(resp.status_code, 200)
         self.assertIsNone(resp.get('Content-Disposition'))
         self.assertContains(resp, 'Unable to create xml for module')
-        self.assertContains(resp, expectedText)
+        self.assertContains(resp, expected_text)

common/djangoapps/student/tests/test_email.py

@@ -15,7 +15,6 @@ from django.conf import settings
 from edxmako.shortcuts import render_to_string
 from edxmako.tests import mako_middleware_process_request
 from util.request import safe_get_host
-from textwrap import dedent
 
 
 class TestException(Exception):

common/djangoapps/student/tests/test_enrollment.py

 """
 Tests for student enrollment.
 """
-from datetime import datetime, timedelta
-import pytz
 import ddt
 import unittest
 

common/djangoapps/student/tests/test_recent_enrollments.py

@@ -4,7 +4,6 @@ Tests for the recently enrolled messaging within the Dashboard.
 import datetime
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from django.test import Client
 from opaque_keys.edx import locator
 from pytz import UTC
 import unittest

common/djangoapps/terrain/stubs/tests/test_xqueue_stub.py

@@ -6,8 +6,6 @@ import mock
 import unittest
 import json
 import requests
-import time
-import copy
 from ..xqueue import StubXQueueService, StubXQueueHandler
 
 

common/djangoapps/track/tests/test_middleware.py

-import re
-
 from mock import patch
 from mock import sentinel