From 87495891b6f5dba606028b2ab36a92b824c7549c Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Fri, 7 Mar 2014 11:51:59 -0500 Subject: [PATCH] Fix some simple pep8 and pylint violations --- common/lib/capa/capa/inputtypes.py | 22 ++++---- .../plugins/markdownedx/mdx_video.py | 56 +++++++++---------- .../commands/tests/test_clean_history.py | 45 ++++++++------- 3 files changed, 64 insertions(+), 59 deletions(-) diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py index d638b41350..81a65613e9 100644 --- a/common/lib/capa/capa/inputtypes.py +++ b/common/lib/capa/capa/inputtypes.py @@ -627,7 +627,6 @@ class FileSubmission(InputTypeBase): template = "filesubmission.html" tags = ['filesubmission'] - @staticmethod def parse_files(files): """ @@ -684,21 +683,21 @@ class CodeInput(InputTypeBase): # non-codemirror editor. ] - @classmethod def get_attributes(cls): """ Convert options to a convenient format. """ - return [Attribute('rows', '30'), - Attribute('cols', '80'), - Attribute('hidden', ''), + return [ + Attribute('rows', '30'), + Attribute('cols', '80'), + Attribute('hidden', ''), - # For CodeMirror - Attribute('mode', 'python'), - Attribute('linenumbers', 'true'), - # Template expects tabsize to be an int it can do math with - Attribute('tabsize', 4, transform=int), + # For CodeMirror + Attribute('mode', 'python'), + Attribute('linenumbers', 'true'), + # Template expects tabsize to be an int it can do math with + Attribute('tabsize', 4, transform=int), ] def setup_code_response_rendering(self): @@ -753,7 +752,6 @@ class MatlabInput(CodeInput): template = "matlabinput.html" tags = ['matlabinput'] - def setup(self): """ Handle matlab-specific parsing @@ -1049,7 +1047,7 @@ class ChemicalEquationInput(InputTypeBase): Can set size of text field. """ return [Attribute('size', '20'), - Attribute('label', ''),] + Attribute('label', ''), ] def _extra_context(self): """ diff --git a/lms/djangoapps/course_wiki/plugins/markdownedx/mdx_video.py b/lms/djangoapps/course_wiki/plugins/markdownedx/mdx_video.py index f27b1b63ba..b378fa5ac4 100755 --- a/lms/djangoapps/course_wiki/plugins/markdownedx/mdx_video.py +++ b/lms/djangoapps/course_wiki/plugins/markdownedx/mdx_video.py @@ -132,7 +132,7 @@ try: # Markdown 2.1.0 changed from 2.0.3. We try importing the new version first, # but import the 2.0.3 version if it fails from markdown.util import etree -except: +except: # pylint: disable=bare-except from markdown import etree @@ -172,21 +172,21 @@ class VideoExtension(markdown.Extension): def extendMarkdown(self, md, md_globals): self.add_inline(md, 'bliptv', Bliptv, - r'([^(]|^)http://(\w+\.|)blip.tv/file/get/(?P\S+.flv)') + r'([^(]|^)http://(\w+\.|)blip.tv/file/get/(?P\S+.flv)') self.add_inline(md, 'dailymotion', Dailymotion, - r'([^(]|^)http://www\.dailymotion\.com/(?P\S+)') + r'([^(]|^)http://www\.dailymotion\.com/(?P\S+)') self.add_inline(md, 'gametrailers', Gametrailers, - r'([^(]|^)http://www.gametrailers.com/video/[a-z0-9-]+/(?P\d+)') + r'([^(]|^)http://www.gametrailers.com/video/[a-z0-9-]+/(?P\d+)') self.add_inline(md, 'metacafe', Metacafe, - r'([^(]|^)http://www\.metacafe\.com/watch/(?P\S+)/') + r'([^(]|^)http://www\.metacafe\.com/watch/(?P\S+)/') self.add_inline(md, 'veoh', Veoh, - r'([^(]|^)http://www\.veoh\.com/\S*(#watch%3D|watch/)(?P\w+)') + r'([^(]|^)http://www\.veoh\.com/\S*(#watch%3D|watch/)(?P\w+)') self.add_inline(md, 'vimeo', Vimeo, - r'([^(]|^)http://(www.|)vimeo\.com/(?P\d+)\S*') + r'([^(]|^)http://(www.|)vimeo\.com/(?P\d+)\S*') self.add_inline(md, 'yahoo', Yahoo, - r'([^(]|^)http://video\.yahoo\.com/watch/(?P\d+)/(?P\d+)') + r'([^(]|^)http://video\.yahoo\.com/watch/(?P\d+)/(?P\d+)') self.add_inline(md, 'youtube', Youtube, - r'([^(]|^)http://www\.youtube\.com/watch\?\S*v=(?P[A-Za-z0-9_&=-]+)\S*') + r'([^(]|^)http://www\.youtube\.com/watch\?\S*v=(?P[A-Za-z0-9_&=-]+)\S*') class Bliptv(markdown.inlinepatterns.Pattern): @@ -247,7 +247,7 @@ class Yahoo(markdown.inlinepatterns.Pattern): param = etree.Element('param') param.set('name', 'flashVars') param.set('value', "id=%s&vid=%s" % (m.group('yahooid'), - m.group('yahoovid'))) + m.group('yahoovid'))) obj.append(param) return obj @@ -261,24 +261,24 @@ class Youtube(markdown.inlinepatterns.Pattern): def flash_object(url, width, height): - obj = etree.Element('object') - obj.set('type', 'application/x-shockwave-flash') - obj.set('width', width) - obj.set('height', height) - obj.set('data', url) - param = etree.Element('param') - param.set('name', 'movie') - param.set('value', url) - obj.append(param) - param = etree.Element('param') - param.set('name', 'allowFullScreen') - param.set('value', 'true') - obj.append(param) - #param = etree.Element('param') - #param.set('name', 'allowScriptAccess') - #param.set('value', 'sameDomain') - #obj.append(param) - return obj + obj = etree.Element('object') + obj.set('type', 'application/x-shockwave-flash') + obj.set('width', width) + obj.set('height', height) + obj.set('data', url) + param = etree.Element('param') + param.set('name', 'movie') + param.set('value', url) + obj.append(param) + param = etree.Element('param') + param.set('name', 'allowFullScreen') + param.set('value', 'true') + obj.append(param) + #param = etree.Element('param') + #param.set('name', 'allowScriptAccess') + #param.set('value', 'sameDomain') + #obj.append(param) + return obj def makeExtension(configs=None): diff --git a/lms/djangoapps/courseware/management/commands/tests/test_clean_history.py b/lms/djangoapps/courseware/management/commands/tests/test_clean_history.py index 2a70556ffe..cf12feab60 100644 --- a/lms/djangoapps/courseware/management/commands/tests/test_clean_history.py +++ b/lms/djangoapps/courseware/management/commands/tests/test_clean_history.py @@ -14,12 +14,14 @@ from courseware.management.commands.clean_history import StudentModuleHistoryCle # In lots of places in this file, smhc == StudentModuleHistoryCleaner + def parse_date(sdate): """Parse a string date into a datetime.""" parsed = dateutil.parser.parse(sdate) parsed = parsed.replace(tzinfo=dateutil.tz.gettz('UTC')) return parsed + class SmhcSayStubbed(StudentModuleHistoryCleaner): """StudentModuleHistoryCleaner, but with .say() stubbed for testing.""" def __init__(self, **kwargs): @@ -110,7 +112,8 @@ class HistoryCleanerTest(TransactionTestCase): """ cursor = connection.cursor() - cursor.executemany(""" + cursor.executemany( + """ INSERT INTO courseware_studentmodulehistory (id, created, student_module_id) VALUES (%s, %s, %s) @@ -191,8 +194,8 @@ class HistoryCleanerNoDbTest(HistoryCleanerTest): def test_a_bunch_of_rows(self): smhc = SmhcDbMocked() smhc.set_rows([ - ( 4, "2013-07-13 16:30:00.000"), # keep - ( 8, "2013-07-13 16:30:01.100"), + (4, "2013-07-13 16:30:00.000"), # keep + (8, "2013-07-13 16:30:01.100"), (15, "2013-07-13 16:30:01.200"), (16, "2013-07-13 16:30:01.300"), # keep (23, "2013-07-13 16:30:02.400"), @@ -212,8 +215,8 @@ class HistoryCleanerWitDbTest(HistoryCleanerTest): # Cleaning a student_module_id with no history leaves the db unchanged. smhc = SmhcSayStubbed() self.write_history([ - ( 4, "2013-07-13 16:30:00.000", 11), # keep - ( 8, "2013-07-13 16:30:01.100", 11), + (4, "2013-07-13 16:30:00.000", 11), # keep + (8, "2013-07-13 16:30:01.100", 11), (15, "2013-07-13 16:30:01.200", 11), (16, "2013-07-13 16:30:01.300", 11), # keep (23, "2013-07-13 16:30:02.400", 11), @@ -225,8 +228,8 @@ class HistoryCleanerWitDbTest(HistoryCleanerTest): smhc.clean_one_student_module(22) self.assert_said(smhc, "No history for student_module_id 22") self.assert_history([ - ( 4, "2013-07-13 16:30:00.000", 11), # keep - ( 8, "2013-07-13 16:30:01.100", 11), + (4, "2013-07-13 16:30:00.000", 11), # keep + (8, "2013-07-13 16:30:01.100", 11), (15, "2013-07-13 16:30:01.200", 11), (16, "2013-07-13 16:30:01.300", 11), # keep (23, "2013-07-13 16:30:02.400", 11), @@ -239,8 +242,8 @@ class HistoryCleanerWitDbTest(HistoryCleanerTest): # Cleaning a student_module_id with 8 records, 4 to delete. smhc = SmhcSayStubbed() self.write_history([ - ( 4, "2013-07-13 16:30:00.000", 11), # keep - ( 8, "2013-07-13 16:30:01.100", 11), + (4, "2013-07-13 16:30:00.000", 11), # keep + (8, "2013-07-13 16:30:01.100", 11), (15, "2013-07-13 16:30:01.200", 11), (16, "2013-07-13 16:30:01.300", 11), # keep (17, "2013-07-13 16:30:01.310", 22), # other student_module_id! @@ -253,7 +256,7 @@ class HistoryCleanerWitDbTest(HistoryCleanerTest): smhc.clean_one_student_module(11) self.assert_said(smhc, "Deleting 4 rows of 8 for student_module_id 11") self.assert_history([ - ( 4, "2013-07-13 16:30:00.000", 11), # keep + (4, "2013-07-13 16:30:00.000", 11), # keep (16, "2013-07-13 16:30:01.300", 11), # keep (17, "2013-07-13 16:30:01.310", 22), # other student_module_id! (98, "2013-07-13 16:30:02.600", 11), # keep @@ -261,12 +264,12 @@ class HistoryCleanerWitDbTest(HistoryCleanerTest): ]) def test_a_bunch_of_rows_dry_run(self): - # Cleaning a student_module_id with 8 records, 4 to delete, + # Cleaning a student_module_id with 8 records, 4 to delete, # but don't really do it. smhc = SmhcSayStubbed(dry_run=True) self.write_history([ - ( 4, "2013-07-13 16:30:00.000", 11), # keep - ( 8, "2013-07-13 16:30:01.100", 11), + (4, "2013-07-13 16:30:00.000", 11), # keep + (8, "2013-07-13 16:30:01.100", 11), (15, "2013-07-13 16:30:01.200", 11), (16, "2013-07-13 16:30:01.300", 11), # keep (23, "2013-07-13 16:30:02.400", 11), @@ -278,8 +281,8 @@ class HistoryCleanerWitDbTest(HistoryCleanerTest): smhc.clean_one_student_module(11) self.assert_said(smhc, "Would have deleted 4 rows of 8 for student_module_id 11") self.assert_history([ - ( 4, "2013-07-13 16:30:00.000", 11), # keep - ( 8, "2013-07-13 16:30:01.100", 11), + (4, "2013-07-13 16:30:00.000", 11), # keep + (8, "2013-07-13 16:30:01.100", 11), (15, "2013-07-13 16:30:01.200", 11), (16, "2013-07-13 16:30:01.300", 11), # keep (23, "2013-07-13 16:30:02.400", 11), @@ -400,7 +403,8 @@ class HistoryCleanerMainTest(HistoryCleanerTest): (1, "2013-07-15 11:47:00.000", 1), ]) smhc.main() - self.assert_said(smhc, + self.assert_said( + smhc, 'Last student_module_id is 1', 'No stored state', '(not really cleaning 0)', @@ -420,7 +424,8 @@ class HistoryCleanerMainTest(HistoryCleanerTest): (5, "2013-07-15 15:04:00.000", 26), ]) smhc.main() - self.assert_said(smhc, + self.assert_said( + smhc, 'Last student_module_id is 26', 'Loaded stored state: {"next_student_module_id": 25}', '(not really cleaning 25)', @@ -441,7 +446,8 @@ class HistoryCleanerMainTest(HistoryCleanerTest): (8, "2013-07-15 15:04:00.000", 29), ]) smhc.main(batch_size=3) - self.assert_said(smhc, + self.assert_said( + smhc, 'Last student_module_id is 29', 'Loaded stored state: {"next_student_module_id": 25}', '(not really cleaning 25)', @@ -467,7 +473,8 @@ class HistoryCleanerMainTest(HistoryCleanerTest): (8, "2013-07-15 15:04:00.000", 29), ]) smhc.main(batch_size=3) - self.assert_said(smhc, + self.assert_said( + smhc, 'Last student_module_id is 29', 'Loaded stored state: {"next_student_module_id": 25}', '(not really cleaning 25)',