From b2867a694d7a4cf58f2d4304806e19dcbcfc64d9 Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@edx.org>
Date: Thu, 10 Jul 2014 13:38:09 -0400
Subject: [PATCH] Quality cleanup

---
 common/lib/xmodule/xmodule/contentstore/content.py            | 1 -
 common/lib/xmodule/xmodule/modulestore/__init__.py            | 4 ++--
 .../xmodule/xmodule/modulestore/tests/persistent_factories.py | 4 +++-
 common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/contentstore/content.py b/common/lib/xmodule/xmodule/contentstore/content.py
index cb438cd742..37608b4182 100644
--- a/common/lib/xmodule/xmodule/contentstore/content.py
+++ b/common/lib/xmodule/xmodule/contentstore/content.py
@@ -12,7 +12,6 @@ from urllib import urlencode
 
 from opaque_keys.edx.locations import AssetLocation
 from opaque_keys.edx.keys import CourseKey
-from .django import contentstore
 from PIL import Image
 
 
diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index bc8d2f32e6..8616edf8f8 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -459,8 +459,8 @@ class ModuleStoreReadBase(ModuleStoreRead):
             return next(
                 (
                     c.id for c in self.get_courses()
-                    if c.id.org.lower() == course_id.org.lower() and \
-                    c.id.course.lower() == course_id.course.lower() and \
+                    if c.id.org.lower() == course_id.org.lower() and
+                    c.id.course.lower() == course_id.course.lower() and
                     c.id.run.lower() == course_id.run.lower()
                 ),
                 None
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/persistent_factories.py b/common/lib/xmodule/xmodule/modulestore/tests/persistent_factories.py
index 23ef9fa757..7a71a02389 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/persistent_factories.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/persistent_factories.py
@@ -1,9 +1,11 @@
+"""Provides factories for Split."""
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.course_module import CourseDescriptor
 from xmodule.x_module import XModuleDescriptor
 import factory
 from factory.helpers import lazy_attribute
-
+# Factories don't have __init__ methods, and are self documenting
+# pylint: disable=W0232, C0111
 
 class SplitFactory(factory.Factory):
     """
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
index 0aeb008c75..64cef57f78 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
@@ -26,7 +26,7 @@ from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.mongo import MongoModuleStore, MongoKeyValueStore
 from xmodule.modulestore.draft import DraftModuleStore
 from opaque_keys.edx.locations import SlashSeparatedCourseKey, AssetLocation
-from opaque_keys.edx.keys import UsageKey, CourseKey
+from opaque_keys.edx.keys import UsageKey
 from xmodule.modulestore.xml_exporter import export_to_xml
 from xmodule.modulestore.xml_importer import import_from_xml, perform_xlint
 from xmodule.contentstore.mongo import MongoContentStore