Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10170 from mitocw/gdm_fix_pylint_lms.djangoapps.ccx

Browse Source 
Fixed pylint violation for files in lms/djangoapps/ccx
This commit is contained in:
Sarina Canelake
2015-10-16 15:24:58 -04:00
parent d367f7ad1c 220c1e2934
commit a72425c81d
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/djangoapps/ccx/tests/test_views.py
View File

@@ -10,23 +10,22 @@ from mock import patch, MagicMock
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from capa.tests.response_xml_factory import StringResponseXMLFactory from capa.tests.response_xml_factory import StringResponseXMLFactory
from courseware.courses import get_course_by_id # pyline: disable=import-error from courseware.courses import get_course_by_id
from courseware.field_overrides import OverrideFieldData # pylint: disable=import-error from courseware.tests.factories import StudentModuleFactory
from courseware.tests.factories import StudentModuleFactory # pylint: disable=import-error from courseware.tests.helpers import LoginEnrollmentTestCase
from courseware.tests.helpers import LoginEnrollmentTestCase # pylint: disable=import-error
from courseware.tabs import get_course_tab_list from courseware.tabs import get_course_tab_list
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.utils.timezone import UTC from django.utils.timezone import UTC
from django.test.utils import override_settings from django.test.utils import override_settings
from django.test import RequestFactory from django.test import RequestFactory
from edxmako.shortcuts import render_to_response # pylint: disable=import-error from edxmako.shortcuts import render_to_response
from request_cache.middleware import RequestCache from request_cache.middleware import RequestCache
from student.roles import CourseCcxCoachRole # pylint: disable=import-error from student.roles import CourseCcxCoachRole
from student.models import ( from student.models import (
CourseEnrollment, CourseEnrollment,
CourseEnrollmentAllowed, CourseEnrollmentAllowed,
) )
from student.tests.factories import ( # pylint: disable=import-error from student.tests.factories import (
AdminFactory, AdminFactory,
CourseEnrollmentFactory, CourseEnrollmentFactory,
UserFactory, UserFactory,
@@ -638,7 +637,8 @@ class TestCCXGrades(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
metadata={'graded': True, 'format': 'Homework'}) metadata={'graded': True, 'format': 'Homework'})
for _ in xrange(4) for _ in xrange(4)
] ]
problems = [ # making problems available at class level for possible future use in tests
cls.problems = [
[ [
ItemFactory.create( ItemFactory.create(
parent=section, parent=section,

9
lms/djangoapps/ccx/views.py
View File

@@ -36,12 +36,12 @@ from courseware.module_render import get_module_for_descriptor
from edxmako.shortcuts import render_to_response from edxmako.shortcuts import render_to_response
from opaque_keys.edx.keys import CourseKey from opaque_keys.edx.keys import CourseKey
from ccx_keys.locator import CCXLocator from ccx_keys.locator import CCXLocator
from student.roles import CourseCcxCoachRole # pylint: disable=import-error from student.roles import CourseCcxCoachRole
from student.models import CourseEnrollment from student.models import CourseEnrollment
from instructor.offline_gradecalc import student_grades # pylint: disable=import-error from instructor.offline_gradecalc import student_grades
from instructor.views.api import _split_input_list # pylint: disable=import-error from instructor.views.api import _split_input_list
from instructor.views.tools import get_student_from_identifier # pylint: disable=import-error from instructor.views.tools import get_student_from_identifier
from instructor.enrollment import ( from instructor.enrollment import (
enroll_email, enroll_email,
unenroll_email, unenroll_email,
@@ -50,7 +50,6 @@ from instructor.enrollment import (
from .models import CustomCourseForEdX from .models import CustomCourseForEdX
from .overrides import ( from .overrides import (
clear_override_for_ccx,
get_override_for_ccx, get_override_for_ccx,
override_field_for_ccx, override_field_for_ccx,
clear_ccx_field_info_from_ccx_map, clear_ccx_field_info_from_ccx_map,