fix various pop8/pylint violations. switch hasattr() to getattr()

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -153,13 +153,12 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         module_store = modulestore('direct')
         found = False
 
-        item = None
         items = module_store.get_items(['i4x', 'edX', 'full', 'poll_question', None, None])
         found = len(items) > 0
 
         self.assertTrue(found)
         # check that there's actually content in the 'question' field
-        self.assertGreater(len(items[0].question),0)
+        self.assertGreater(len(items[0].question), 0)
 
     def test_xlint_fails(self):
         err_cnt = perform_xlint('common/test/data', ['full'])
@@ -172,7 +171,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
 
         sequential = module_store.get_item(Location(['i4x', 'edX', 'full', 'sequential', 'Administrivia_and_Circuit_Elements', None]))
 
-        chapter = module_store.get_item(Location(['i4x', 'edX', 'full', 'chapter','Week_1', None]))
+        chapter = module_store.get_item(Location(['i4x', 'edX', 'full', 'chapter', 'Week_1', None]))
 
         # make sure the parent no longer points to the child object which was deleted
         self.assertTrue(sequential.location.url() in chapter.children)
@@ -190,7 +189,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
 
         self.assertFalse(found)
 
-        chapter = module_store.get_item(Location(['i4x', 'edX', 'full', 'chapter','Week_1', None]))
+        chapter = module_store.get_item(Location(['i4x', 'edX', 'full', 'chapter', 'Week_1', None]))
 
         # make sure the parent no longer points to the child object which was deleted
         self.assertFalse(sequential.location.url() in chapter.children)
@@ -213,7 +212,6 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
 
         module_store = modulestore('direct')
-        content_store = contentstore()
 
         source_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
         course = module_store.get_item(source_location)
@@ -363,7 +361,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         for descriptor in items:
             # don't try to look at private verticals. Right now we're running
             # the service in non-draft aware
-            if hasattr(descriptor, 'is_draft'):
+            if getattr(descriptor, 'is_draft', False):
                 print "Checking {0}....".format(descriptor.location.url())
                 resp = self.client.get(reverse('edit_unit', kwargs={'location': descriptor.location.url()}))
                 self.assertEqual(resp.status_code, 200)
@@ -372,21 +370,20 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         vertical = draft_store.get_item(Location(['i4x', 'edX', 'full',
                                                   'vertical', 'vertical_66', None]), depth=1)
 
-        self.assertTrue(hasattr(vertical, 'is_draft'))
+        self.assertTrue(getattr(vertical, 'is_draft', False))
         for child in vertical.get_children():
-            self.assertTrue(hasattr(child, 'is_draft'))
+            self.assertTrue(getattr(child, 'is_draft', False))
 
         # verify that we have the private vertical
         test_private_vertical = draft_store.get_item(Location(['i4x', 'edX', 'full',
                                                                'vertical', 'vertical_66', None]))
 
-        self.assertTrue(hasattr(test_private_vertical, 'is_draft'))
+        self.assertTrue(getattr(test_private_vertical, 'is_draft', False))
 
         shutil.rmtree(root_dir)
 
     def test_course_handouts_rewrites(self):
         module_store = modulestore('direct')
-        content_store = contentstore()
 
         # import a test course
         import_from_xml(module_store, 'common/test/data/', ['full'])
@@ -422,8 +419,8 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
                                   'Administrivia_and_Circuit_Elements', None]) in course.system.module_data)
 
         # make sure we don't have a specific vertical which should be at depth=3
-        self.assertFalse(Location(['i4x', 'edX', 'full', 'vertical', 'vertical_58',
-            None]) in course.system.module_data)
+        self.assertFalse(Location(['i4x', 'edX', 'full', 'vertical', 'vertical_58', None])
+                         in course.system.module_data)
 
     def test_export_course_with_unknown_metadata(self):
         module_store = modulestore('direct')
@@ -449,12 +446,13 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         try:
             export_to_xml(module_store, content_store, location, root_dir, 'test_export')
             exported = True
-        except Exception,e:
+        except Exception:
             print 'Exception thrown: {0}'.format(traceback.format_exc())
             pass
 
         self.assertTrue(exported)
 
+
 class ContentStoreTest(ModuleStoreTestCase):
     """
     Tests for the CMS ContentStore application.