Unescaped HTML {0}
'.format(id_num)} - for id_num in range(0, 5)] + for id_num in range(5)] xml = self.render_to_xml(self.context) # Expect that each option description is visible # with unescaped HTML. # Since the HTML is unescaped, we can traverse the XML tree - for id_num in range(0, 5): + for id_num in range(5): xpath = "//span[@data-id='{0}']/p/b".format(id_num) self.assert_has_text(xml, xpath, 'HTML {0}'.format(id_num), exact=False) @@ -689,7 +689,7 @@ class OptionInputTemplateTest(TemplateTestCase): # Create options 0-4, and select option 2 self.context['options'] = [(id_num, 'Option {0}'.format(id_num)) - for id_num in range(0, 5)] + for id_num in range(5)] self.context['value'] = 2 xml = self.render_to_xml(self.context) @@ -701,7 +701,7 @@ class OptionInputTemplateTest(TemplateTestCase): # Should have each of the options, with the correct description # The description HTML should NOT be escaped # (that's why we descend into the tag) - for id_num in range(0, 5): + for id_num in range(5): xpath = "//option[@value='{0}']/b".format(id_num) self.assert_has_text(xml, xpath, 'Option {0}'.format(id_num)) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_libraries.py b/common/lib/xmodule/xmodule/modulestore/tests/test_libraries.py index a2f1f0e369..21a22b9f21 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_libraries.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_libraries.py @@ -144,7 +144,7 @@ class TestLibraries(MixedSplitTestCase): def test_get_libraries(self): """ Test get_libraries() """ - libraries = [LibraryFactory.create(modulestore=self.store) for _ in range(0, 3)] + libraries = [LibraryFactory.create(modulestore=self.store) for _ in range(3)] lib_dict = dict([(lib.location.library_key, lib) for lib in libraries]) lib_list = self.store.get_libraries() diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_copy_from_template.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_copy_from_template.py index bfdd7d0fea..a3f88ab348 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_copy_from_template.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_copy_from_template.py @@ -107,7 +107,7 @@ class TestSplitCopyTemplate(MixedSplitTestCase): # We do the following twice because different methods get used inside # split modulestore on first vs. subsequent publish - for __ in range(0, 2): + for __ in range(2): # Publish: self.store.publish(problem_key_in_course, self.user_id) # Test that the defaults values are there. diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py index d99884f392..db9f77f68e 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py @@ -665,8 +665,8 @@ class CombinedOpenEndedV1Module(object): last_post_assessment = task.latest_post_assessment(self.system, short_feedback=False, join_feedback=False) if isinstance(last_post_assessment, list): eval_list = [] - for i in xrange(0, len(last_post_assessment)): - eval_list.append(task.format_feedback_with_evaluation(self.system, last_post_assessment[i])) + for assess in last_post_assessment: + eval_list.append(task.format_feedback_with_evaluation(self.system, assess)) last_post_evaluation = "".join(eval_list) else: last_post_evaluation = task.format_feedback_with_evaluation(self.system, last_post_assessment) @@ -1017,7 +1017,7 @@ class CombinedOpenEndedV1Module(object): ugettext = self.system.service(self, "i18n").ugettext status_list = [] current_task_human_name = "" - for i in xrange(0, len(self.task_xml)): + for i in xrange(len(self.task_xml)): human_task_name = self.extract_human_name_from_task(self.task_xml[i]) human_task_name = ugettext(human_task_name) # pylint: disable=translation-of-non-string # Extract the name of the current task for screen readers. @@ -1080,16 +1080,16 @@ class CombinedOpenEndedV1Module(object): if self.is_scored: # Finds the maximum score of all student attempts and keeps it. score_mat = [] - for i in xrange(0, len(self.task_states)): + for i in xrange(len(self.task_states)): # For each task, extract all student scores on that task (each attempt for each task) last_response = self.get_last_response(i) score = last_response.get('all_scores', None) if score is not None: # Convert none scores and weight scores properly - for z in xrange(0, len(score)): - if score[z] is None: - score[z] = 0 - score[z] *= float(weight) + for j in xrange(len(score)): + if score[j] is None: + score[j] = 0 + score[j] *= float(weight) score_mat.append(score) if len(score_mat) > 0: @@ -1219,7 +1219,7 @@ class CombinedOpenEndedV1Descriptor(object): def parse_task(k): """Assumes that xml_object has child k""" - return [stringify_children(xml_object.xpath(k)[i]) for i in xrange(0, len(xml_object.xpath(k)))] + return [stringify_children(xml_object.xpath(k)[i]) for i in xrange(len(xml_object.xpath(k)))] def parse(k): """Assumes that xml_object has child k""" diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py index 16ea4acba8..7baee20b5b 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py @@ -59,9 +59,9 @@ class CombinedOpenEndedRubric(object): try: rubric_categories = self.extract_categories(rubric_xml) if score_list and len(score_list) == len(rubric_categories): - for i in xrange(0, len(rubric_categories)): + for i in xrange(len(rubric_categories)): category = rubric_categories[i] - for j in xrange(0, len(category['options'])): + for j in xrange(len(category['options'])): if score_list[i] == j: rubric_categories[i]['options'][j]['selected'] = True rubric_scores = [cat['score'] for cat in rubric_categories] @@ -315,23 +315,22 @@ class CombinedOpenEndedRubric(object): score_lists = [] score_type_list = [] feedback_type_list = [] - for i in xrange(0, len(scores)): + for i in xrange(len(scores)): score_cont_list = scores[i] - for j in xrange(0, len(score_cont_list)): + for j in xrange(len(score_cont_list)): score_list = score_cont_list[j] score_lists.append(score_list) score_type_list.append(score_types[i][j]) feedback_type_list.append(feedback_types[i][j]) score_list_len = len(score_lists[0]) - for i in xrange(0, len(score_lists)): - score_list = score_lists[i] + for score_list in score_lists: if len(score_list) != score_list_len: return success, "" score_tuples = [] - for i in xrange(0, len(score_lists)): - for j in xrange(0, len(score_lists[i])): + for i in xrange(len(score_lists)): + for j in xrange(len(score_lists[i])): tuple = [1, j, score_lists[i][j], [], []] score_tuples, tup_ind = CombinedOpenEndedRubric.check_for_tuple_matches(score_tuples, tuple) score_tuples[tup_ind][0] += 1 @@ -353,9 +352,9 @@ class CombinedOpenEndedRubric(object): category = tuple[1] score = tuple[2] tup_ind = -1 - for t in xrange(0, len(tuples)): - if tuples[t][1] == category and tuples[t][2] == score: - tup_ind = t + for ind in xrange(len(tuples)): + if tuples[ind][1] == category and tuples[ind][2] == score: + tup_ind = ind break if tup_ind == -1: diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py index c0f050e1fc..d6e6ffa57f 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py @@ -574,7 +574,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): feedback_dicts = [] grader_ids = [] submission_ids = [] - for i in xrange(0, len(score_result['score'])): + for i in xrange(len(score_result['score'])): new_score_result = { 'score': score_result['score'][i], 'feedback': score_result['feedback'][i], @@ -817,7 +817,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): """None if not available""" if not self.child_history: return None - return [self.score_for_attempt(index) for index in xrange(0, len(self.child_history))] + return [self.score_for_attempt(index) for index in xrange(len(self.child_history))] def score_for_attempt(self, index): """ diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py index f0ac9052b5..fb459e0f91 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py @@ -213,7 +213,7 @@ class OpenEndedChild(object): """None if not available""" if not self.child_history: return None - return [self.child_history[i].get('score') for i in xrange(0, len(self.child_history))] + return [child_hist.get('score') for child_hist in self.child_history] def latest_post_assessment(self, system): """Empty string if not available""" diff --git a/common/test/acceptance/tests/studio/test_studio_library.py b/common/test/acceptance/tests/studio/test_studio_library.py index 447b853454..51954d7a06 100644 --- a/common/test/acceptance/tests/studio/test_studio_library.py +++ b/common/test/acceptance/tests/studio/test_studio_library.py @@ -141,7 +141,7 @@ class LibraryEditPageTest(StudioLibraryTest): Then 10 are displayed. """ self.assertEqual(len(self.lib_page.xblocks), 0) - for _ in range(0, 10): + for _ in range(10): add_component(self.lib_page, "problem", "Multiple Choice") self.assertEqual(len(self.lib_page.xblocks), 10) add_component(self.lib_page, "problem", "Multiple Choice") diff --git a/lms/djangoapps/courseware/tests/test_recommender.py b/lms/djangoapps/courseware/tests/test_recommender.py index af832f9d71..5eb1e76b39 100644 --- a/lms/djangoapps/courseware/tests/test_recommender.py +++ b/lms/djangoapps/courseware/tests/test_recommender.py @@ -148,7 +148,7 @@ class TestRecommender(ModuleStoreTestCase, LoginEnrollmentTestCase): if xblock_name is None: xblock_name = TestRecommender.XBLOCK_NAMES[0] url = self.get_handler_url(handler, xblock_name) - for _ in range(0, times): + for _ in range(times): self.client.post(url, json.dumps({'id': resource_id}), '') def call_event(self, handler, resource, xblock_name=None): @@ -460,7 +460,7 @@ class TestRecommenderVoteWithResources(TestRecommenderWithResources): Vote a resource thrice """ resource = {"id": self.resource_id, 'event': test_case['event']} - for _ in range(0, 2): + for _ in range(2): self.call_event('handle_vote', resource) # Test self.check_event_response_by_key('handle_vote', resource, 'newVotes', test_case['new_votes']) @@ -552,7 +552,7 @@ class TestRecommenderStaffFeedbackWithResources(TestRecommenderWithResources): Endorse a resource once/twice/thrice """ resource = {"id": self.resource_id, 'reason': ''} - for _ in range(0, test_case['times'] - 1): + for _ in range(test_case['times'] - 1): self.call_event('endorse_resource', resource) # Test self.check_event_response_by_key('endorse_resource', resource, test_case['key'], test_case['val']) @@ -567,7 +567,7 @@ class TestRecommenderStaffFeedbackWithResources(TestRecommenderWithResources): Remove a resource once/twice/thrice """ resource = {"id": self.resource_id, 'reason': ''} - for _ in range(0, test_case['times'] - 1): + for _ in range(test_case['times'] - 1): self.call_event('remove_resource', resource) # Test self.check_event_response_by_http_status('remove_resource', resource, test_case['status']) diff --git a/lms/djangoapps/instructor/tests/utils.py b/lms/djangoapps/instructor/tests/utils.py index b2444fe1b1..c964295961 100644 --- a/lms/djangoapps/instructor/tests/utils.py +++ b/lms/djangoapps/instructor/tests/utils.py @@ -55,11 +55,11 @@ class FakeEmail(FakeInfo): super(FakeEmail, self).__init__() self.id = unicode(email_id) # pylint: disable=invalid-name # Select a random data for create field - year = random.choice(range(1950, 2000)) - month = random.choice(range(1, 12)) - day = random.choice(range(1, 28)) - hour = random.choice(range(0, 23)) - minute = random.choice(range(0, 59)) + year = random.randint(1950, 2000) + month = random.randint(1, 12) + day = random.randint(1, 28) + hour = random.randint(0, 23) + minute = random.randint(0, 59) self.created = datetime.datetime(year, month, day, hour, minute, tzinfo=utc) diff --git a/lms/djangoapps/mobile_api/video_outlines/tests.py b/lms/djangoapps/mobile_api/video_outlines/tests.py index b6d1ecf2c5..f83e0711a1 100644 --- a/lms/djangoapps/mobile_api/video_outlines/tests.py +++ b/lms/djangoapps/mobile_api/video_outlines/tests.py @@ -144,12 +144,12 @@ class TestVideoAPIMixin(object): """ path = course_outline[outline_index]['path'] self.assertEqual(len(path), len(path_list)) - for i in range(0, len(path_list)): + for i in range(len(path_list)): self.assertEqual(path_list[i], path[i]['name']) #named_path will be deprecated eventually named_path = course_outline[outline_index]['named_path'] self.assertEqual(len(named_path), len(path_list)) - for i in range(0, len(path_list)): + for i in range(len(path_list)): self.assertEqual(path_list[i], named_path[i]) def _setup_course_partitions(self, scheme_id='random', is_cohorted=False): diff --git a/lms/djangoapps/open_ended_grading/staff_grading_service.py b/lms/djangoapps/open_ended_grading/staff_grading_service.py index 5b57df0399..203c9298b9 100644 --- a/lms/djangoapps/open_ended_grading/staff_grading_service.py +++ b/lms/djangoapps/open_ended_grading/staff_grading_service.py @@ -319,7 +319,7 @@ def get_problem_list(request, course_id): u'If not, please do so and return to this page.' ) valid_problem_list = [] - for i in xrange(0, len(problem_list)): + for i in xrange(len(problem_list)): # Needed to ensure that the 'location' key can be accessed. try: problem_list[i] = json.loads(problem_list[i]) diff --git a/lms/djangoapps/open_ended_grading/views.py b/lms/djangoapps/open_ended_grading/views.py index 487e9ecb1d..03fe8ec592 100644 --- a/lms/djangoapps/open_ended_grading/views.py +++ b/lms/djangoapps/open_ended_grading/views.py @@ -247,7 +247,7 @@ def combined_notifications(request, course_id): notification_tuples = open_ended_notifications.NOTIFICATION_TYPES notification_list = [] - for response_num in xrange(0, len(notification_tuples)): + for response_num in xrange(len(notification_tuples)): tag = notification_tuples[response_num][0] if tag in response: url_name = notification_tuples[response_num][1] diff --git a/openedx/core/djangoapps/user_api/tests/test_partition_schemes.py b/openedx/core/djangoapps/user_api/tests/test_partition_schemes.py index 02ca2eadd6..794f837a31 100644 --- a/openedx/core/djangoapps/user_api/tests/test_partition_schemes.py +++ b/openedx/core/djangoapps/user_api/tests/test_partition_schemes.py @@ -52,7 +52,7 @@ class TestRandomUserPartitionScheme(PartitionTestCase): group1_id = RandomUserPartitionScheme.get_group_for_user(self.MOCK_COURSE_ID, self.user, self.user_partition) # make sure we get the same group back out every time - for __ in range(0, 10): + for __ in range(10): group2_id = RandomUserPartitionScheme.get_group_for_user(self.MOCK_COURSE_ID, self.user, self.user_partition) self.assertEqual(group1_id, group2_id) diff --git a/pylintrc b/pylintrc index 064af8d330..680947da4a 100644 --- a/pylintrc +++ b/pylintrc @@ -30,6 +30,7 @@ load-plugins = edx_lint.pylint [MESSAGES CONTROL] disable = locally-disabled, + locally-enabled, too-few-public-methods, bad-builtin, star-args, @@ -150,4 +151,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = Exception -# 05a77c494ca87a2939bd5db9ef4988ea248c417e +# 0f5810dfd8c52cdd91c425550319ae6040a8fe3e diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 567b457273..4862d9779d 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -47,7 +47,7 @@ git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c -e git+https://github.com/pmitros/RecommenderXBlock.git@518234bc354edbfc2651b9e534ddb54f96080779#egg=recommender-xblock -e git+https://github.com/edx/edx-milestones.git@547f2250ee49e73ce8d7ff4e78ecf1b049892510#egg=edx-milestones -e git+https://github.com/edx/edx-search.git@e8b7c262adb500dbb0eced5434a26d9fa2d99dc3#egg=edx-search -git+https://github.com/edx/edx-lint.git@8bf82a32ecb8598c415413df66f5232ab8d974e9#egg=edx_lint==0.2.1 +git+https://github.com/edx/edx-lint.git@ed8c8d2a0267d4d42f43642d193e25f8bd575d9b#egg=edx_lint==0.2.3 -e git+https://github.com/edx/xblock-utils.git@db22bc40fd2a75458a3c66d057f88aff5a7383e6#egg=xblock-utils -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive -e git+https://github.com/edx/edx-reverification-block.git@03da85753d5f563a22c1282c0e89fcb2e828b8c1#egg=edx-reverification-block