WIP: Correct Pylint violations

cms/djangoapps/contentstore/git_export_utils.py

@@ -157,7 +157,9 @@ def export_to_git(course_id, repo, user='', rdir=None):
         ident = GIT_EXPORT_DEFAULT_IDENT
     time_stamp = timezone.now()
     cwd = os.path.abspath(rdirp)
-    commit_msg = 'Export from Studio at {1}'.format(user, time_stamp)
+    commit_msg = "Export from Studio at {time_stamp}".format(
+        time_stamp=time_stamp,
+    )
     try:
         cmd_log(['git', 'config', 'user.email', ident['email']], cwd)
         cmd_log(['git', 'config', 'user.name', ident['name']], cwd)

cms/djangoapps/contentstore/management/commands/create_course.py

@@ -40,7 +40,12 @@ def parse_args(self, *args):
         try:
             user = user_from_str(args[1])
         except User.DoesNotExist:
-            raise CommandError("No user {} found: expected args are ".format(args[1], self.args))
+            raise CommandError(
+                "No user {user} found: expected args are {args}".format(
+                    user=args[1],
+                    args=self.args,
+                ),
+            )
 
         org = args[2]
         course = args[3]

cms/djangoapps/contentstore/management/commands/import.py

@@ -37,7 +37,7 @@ def handle(self, *args, **options):
         self.stdout.write("Importing.  Data_dir={data}, course_dirs={courses}\n".format(
             data=data_dir,
             courses=course_dirs,
-            dis=do_import_static))
+        ))
         mstore = modulestore()
 
         course_items = import_from_xml(

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -1728,8 +1728,10 @@ def test_rerun_with_permission_denied(self):
     def test_rerun_error(self):
         error_message = "Mock Error Message"
         with mock.patch(
-                'xmodule.modulestore.mixed.MixedModuleStore.clone_course',
-                mock.Mock(side_effect=Exception(error_message))
+            'xmodule.modulestore.mixed.MixedModuleStore.clone_course',
+            mock.Mock(
+                side_effect=Exception(error_message),
+            ),
         ):
             source_course = CourseFactory.create()
             destination_course_key = self.post_rerun_request(source_course.id)

cms/djangoapps/contentstore/tests/test_core_caching.py

@@ -3,7 +3,7 @@
 from django.test import TestCase
 
 
-class Content:
+class Content(object):
     def __init__(self, location, content):
         self.location = location
         self.content = content

cms/djangoapps/contentstore/tests/test_course_listing.py

@@ -11,7 +11,7 @@
 from django.test import RequestFactory
 
 from contentstore.views.course import _accessible_courses_list, _accessible_courses_list_from_groups, AccessListFallback
-from contentstore.utils import delete_course_and_groups, reverse_course_url
+from contentstore.utils import delete_course_and_groups
 from contentstore.tests.utils import AjaxEnabledTestClient
 from student.tests.factories import UserFactory
 from student.roles import CourseInstructorRole, CourseStaffRole, GlobalStaff, OrgStaffRole, OrgInstructorRole

cms/djangoapps/contentstore/tests/test_orphan.py

@@ -4,7 +4,6 @@
 import json
 from contentstore.tests.utils import CourseTestCase
 from student.models import CourseEnrollment
-from xmodule.modulestore.django import modulestore
 from contentstore.utils import reverse_course_url
 
 

cms/djangoapps/contentstore/tests/test_transcripts_utils.py

@@ -6,8 +6,6 @@
 import textwrap
 from mock import patch, Mock
 
-from pymongo import MongoClient
-
 from django.test.utils import override_settings
 from django.conf import settings
 from django.utils import translation

cms/djangoapps/contentstore/tests/test_utils.py

@@ -16,7 +16,6 @@
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
 from xmodule.modulestore.django import modulestore
-from opaque_keys.edx.locator import CourseLocator
 
 
 class LMSLinksTestCase(TestCase):

cms/djangoapps/contentstore/tests/utils.py

@@ -7,7 +7,6 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.test.client import Client
-from django.test.utils import override_settings
 from opaque_keys.edx.locations import SlashSeparatedCourseKey, AssetLocation
 
 from contentstore.utils import reverse_url
@@ -17,7 +16,6 @@
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.inheritance import own_metadata
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.tests.django_utils import TEST_DATA_MOCK_MODULESTORE
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from xmodule.modulestore.xml_importer import import_from_xml
 

cms/djangoapps/contentstore/views/assets.py

@@ -331,7 +331,7 @@ def _update_asset(request, course_key, asset_key):
                 contentstore().delete(thumbnail_content.get_id())
                 # remove from any caching
                 del_cached_content(thumbnail_location)
-            except:
+            except Exception:
                 logging.warning('Could not delete thumbnail: %s', thumbnail_location)
 
         # delete the original

cms/djangoapps/contentstore/views/component.py

@@ -29,11 +29,12 @@
 from django.utils.translation import ugettext as _
 from models.settings.course_grading import CourseGradingModel
 
-__all__ = ['OPEN_ENDED_COMPONENT_TYPES',
-           'ADVANCED_COMPONENT_POLICY_KEY',
-           'container_handler',
-           'component_handler'
-           ]
+__all__ = [
+    'OPEN_ENDED_COMPONENT_TYPES',
+    'ADVANCED_COMPONENT_POLICY_KEY',
+    'container_handler',
+    'component_handler'
+]
 
 log = logging.getLogger(__name__)
 
@@ -331,7 +332,6 @@ def create_template_dict(name, cat, boilerplate_name=None, is_common=False):
                         "Advanced component %s does not exist. It will not be added to the Studio new component menu.",
                         category
                     )
-                    pass
     else:
         log.error(
             "Improper format for course advanced keys! %s",

cms/djangoapps/contentstore/views/course.py

@@ -653,8 +653,15 @@ def _create_or_rerun_course(request):
                 'course number so that it is unique.'),
         })
     except InvalidKeyError as error:
-        return JsonResponse({
-            "ErrMsg": _("Unable to create course '{name}'.\n\n{err}").format(name=display_name, err=error.message)}
+        return JsonResponse(
+            {
+                'ErrMsg': _(
+                    "Unable to create course '{name}'.\n\n{err}"
+                ).format(
+                    name=display_name,
+                    err=error.message,
+                ),
+            },
         )
 
 
@@ -804,7 +811,7 @@ def course_info_update_handler(request, course_key_string, provided_id=None):
     elif request.method == 'DELETE':
         try:
             return JsonResponse(delete_course_update(usage_key, request.json, provided_id, request.user))
-        except:
+        except Exception:
             return HttpResponseBadRequest(
                 "Failed to delete",
                 content_type="text/plain"
@@ -813,7 +820,7 @@ def course_info_update_handler(request, course_key_string, provided_id=None):
     elif request.method in ('POST', 'PUT'):
         try:
             return JsonResponse(update_course_updates(usage_key, request.json, provided_id, request.user))
-        except:
+        except Exception:
             return HttpResponseBadRequest(
                 "Failed to save",
                 content_type="text/plain"

cms/djangoapps/contentstore/views/entrance_exam.py

@@ -8,7 +8,6 @@
 from django.contrib.auth.decorators import login_required
 from django_future.csrf import ensure_csrf_cookie
 from django.http import HttpResponse
-from django.test import RequestFactory
 
 from contentstore.views.helpers import create_xblock
 from contentstore.views.item import delete_item

cms/djangoapps/contentstore/views/item.py

@@ -24,7 +24,7 @@
 from xblock.fragment import Fragment
 
 import xmodule
-from xmodule.tabs import StaticTab, CourseTabList
+from xmodule.tabs import CourseTabList
 from xmodule.modulestore import ModuleStoreEnum, EdxJSONEncoder
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError, InvalidLocationError
@@ -47,7 +47,7 @@
 from edxmako.shortcuts import render_to_string
 from models.settings.course_grading import CourseGradingModel
 from cms.lib.xblock.runtime import handler_url, local_resource_url
-from opaque_keys.edx.keys import UsageKey, CourseKey
+from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import LibraryUsageLocator
 from cms.lib.xblock.authoring_mixin import VISIBILITY_VIEW
 

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

@@ -6,7 +6,6 @@
 from mock import Mock
 from xblock.core import XBlock
 
-from django.test import TestCase
 from django.test.client import RequestFactory
 
 from xblock.core import XBlockAside

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

@@ -3,7 +3,6 @@
 import json
 from contentstore.views import tabs
 from contentstore.tests.utils import CourseTestCase
-from django.test import TestCase
 from xmodule.x_module import STUDENT_VIEW
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase

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

@@ -6,7 +6,6 @@
 from uuid import uuid4
 import copy
 import textwrap
-from pymongo import MongoClient
 
 from django.core.urlresolvers import reverse
 from django.test.utils import override_settings

cms/djangoapps/contentstore/views/videos.py

@@ -319,9 +319,9 @@ def videos_post(course, request):
         edx_video_id = unicode(uuid4())
         key = storage_service_key(bucket, file_name=edx_video_id)
         for metadata_name, value in [
-            ("course_video_upload_token", course_video_upload_token),
-            ("client_video_id", file_name),
-            ("course_key", unicode(course.id)),
+                ('course_video_upload_token', course_video_upload_token),
+                ('client_video_id', file_name),
+                ('course_key', unicode(course.id)),
         ]:
             key.set_metadata(metadata_name, value)
         upload_url = key.generate_url(

cms/djangoapps/contentstore/views/xblock.py

@@ -25,7 +25,7 @@ def xblock_resource(request, block_type, uri):  # pylint: disable=unused-argumen
     except IOError:
         log.info('Failed to load xblock resource', exc_info=True)
         raise Http404
-    except Exception:  # pylint: disable-msg=broad-except
+    except Exception:  # pylint: disable=broad-except
         log.error('Failed to load xblock resource', exc_info=True)
         raise Http404
 

cms/djangoapps/course_creators/admin.py

@@ -107,7 +107,7 @@ def send_user_notification_callback(sender, **kwargs):
 
     try:
         user.email_user(subject, message, studio_request_email)
-    except:
+    except Exception:
         log.warning("Unable to send course creator status e-mail to %s", user.email)
 
 

cms/djangoapps/models/settings/course_grading.py

@@ -37,13 +37,14 @@ def fetch_grader(course_key, index):
 
         # return empty model
         else:
-            return {"id": index,
-                    "type": "",
-                    "min_count": 0,
-                    "drop_count": 0,
-                    "short_label": None,
-                    "weight": 0
-                    }
+            return {
+                'id': index,
+                'type': '',
+                'min_count': 0,
+                'drop_count': 0,
+                'short_label': None,
+                'weight': 0,
+            }
 
     @staticmethod
     def update_from_json(course_key, jsondict, user):
@@ -194,12 +195,13 @@ def convert_set_grace_period(descriptor):
     @staticmethod
     def parse_grader(json_grader):
         # manual to clear out kruft
-        result = {"type": json_grader["type"],
-                  "min_count": int(json_grader.get('min_count', 0)),
-                  "drop_count": int(json_grader.get('drop_count', 0)),
-                  "short_label": json_grader.get('short_label', None),
-                  "weight": float(json_grader.get('weight', 0)) / 100.0
-                  }
+        result = {
+            'type': json_grader['type'],
+            'min_count': int(json_grader.get('min_count', 0)),
+            'drop_count': int(json_grader.get('drop_count', 0)),
+            'short_label': json_grader.get('short_label', None),
+            'weight': float(json_grader.get('weight', 0)) / 100.0,
+        }
 
         return result
 

cms/envs/common.py

@@ -136,9 +136,6 @@
     # Prerequisite courses feature flag
     'ENABLE_PREREQUISITE_COURSES': False,
 
-    # Toggle course milestones app/feature
-    'MILESTONES_APP': False,
-
     # Toggle course entrance exams feature
     'ENTRANCE_EXAMS': False,