diff --git a/cms/djangoapps/contentstore/features/advanced_settings.py b/cms/djangoapps/contentstore/features/advanced_settings.py index 242fde629ac7fad3321429e746203263ab11f2b0..f85659bfa9588bb18dc63e697bb2de52a896cb11 100644 --- a/cms/djangoapps/contentstore/features/advanced_settings.py +++ b/cms/djangoapps/contentstore/features/advanced_settings.py @@ -2,7 +2,7 @@ # pylint: disable=redefined-outer-name from lettuce import world, step -from nose.tools import assert_false, assert_equal, assert_regexp_matches # pylint: disable=E0611 +from nose.tools import assert_false, assert_equal, assert_regexp_matches # pylint: disable=no-name-in-module from common import type_in_codemirror, press_the_notification_button, get_codemirror_value KEY_CSS = '.key h3.title' diff --git a/cms/djangoapps/contentstore/features/checklists.py b/cms/djangoapps/contentstore/features/checklists.py index 9b1d4276740f7a8e9eef23c54d3d71b512ea743b..aad13a3120217850ffd3cf130ebebae69784214b 100644 --- a/cms/djangoapps/contentstore/features/checklists.py +++ b/cms/djangoapps/contentstore/features/checklists.py @@ -2,7 +2,7 @@ # pylint: disable=redefined-outer-name from lettuce import world, step -from nose.tools import assert_true, assert_equal # pylint: disable=E0611 +from nose.tools import assert_true, assert_equal # pylint: disable=no-name-in-module from terrain.steps import reload_the_page from selenium.common.exceptions import StaleElementReferenceException diff --git a/cms/djangoapps/contentstore/features/component.py b/cms/djangoapps/contentstore/features/component.py index 04d5680ef4c19d660dca202d3b8484f304e29c44..daf73187ce34bca2e3d3e79b0ee03ce45e692841 100644 --- a/cms/djangoapps/contentstore/features/component.py +++ b/cms/djangoapps/contentstore/features/component.py @@ -6,7 +6,7 @@ # pylint: disable=W0613 from lettuce import world, step -from nose.tools import assert_true, assert_in, assert_equal # pylint: disable=E0611 +from nose.tools import assert_true, assert_in, assert_equal # pylint: disable=no-name-in-module DISPLAY_NAME = "Display Name" diff --git a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py index 4cd814acd85cce4bee5106e988a89fc3d179850c..743f54f829776bf8541ecabcd6f19252a219742d 100644 --- a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py +++ b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py @@ -2,7 +2,7 @@ # pylint: disable=missing-docstring from lettuce import world -from nose.tools import assert_equal, assert_in # pylint: disable=E0611 +from nose.tools import assert_equal, assert_in # pylint: disable=no-name-in-module from terrain.steps import reload_the_page from common import type_in_codemirror from selenium.webdriver.common.keys import Keys diff --git a/cms/djangoapps/contentstore/features/course-outline.py b/cms/djangoapps/contentstore/features/course-outline.py index 141aaa172411a220be47bba52252b54961c802da..17c71b85e5acbc8b97ce6b2f18b58d32e411cb1a 100644 --- a/cms/djangoapps/contentstore/features/course-outline.py +++ b/cms/djangoapps/contentstore/features/course-outline.py @@ -3,7 +3,7 @@ from lettuce import world, step from common import * -from nose.tools import assert_true, assert_false, assert_equal # pylint: disable=E0611 +from nose.tools import assert_true, assert_false, assert_equal # pylint: disable=no-name-in-module from logging import getLogger logger = getLogger(__name__) diff --git a/cms/djangoapps/contentstore/features/course-settings.py b/cms/djangoapps/contentstore/features/course-settings.py index bc307e5072daf1d43e5ccc44a33ef3685b78040d..c2aaae49898a96901c5ae895dbad9c611a059e6b 100644 --- a/cms/djangoapps/contentstore/features/course-settings.py +++ b/cms/djangoapps/contentstore/features/course-settings.py @@ -7,7 +7,7 @@ from selenium.webdriver.common.keys import Keys from common import type_in_codemirror, upload_file from django.conf import settings -from nose.tools import assert_true, assert_false, assert_equal # pylint: disable=E0611 +from nose.tools import assert_true, assert_false, assert_equal # pylint: disable=no-name-in-module TEST_ROOT = settings.COMMON_TEST_DATA_ROOT diff --git a/cms/djangoapps/contentstore/features/course-team.py b/cms/djangoapps/contentstore/features/course-team.py index 855a6d143a3afb33f83cbf3672842ca0e08904c6..130f05b0f54f0fceef411d2ad67224fcf3d5e4c6 100644 --- a/cms/djangoapps/contentstore/features/course-team.py +++ b/cms/djangoapps/contentstore/features/course-team.py @@ -2,7 +2,7 @@ # pylint: disable=redefined-outer-name from lettuce import world, step -from nose.tools import assert_in # pylint: disable=E0611 +from nose.tools import assert_in # pylint: disable=no-name-in-module @step(u'(I am viewing|s?he views) the course team settings$') diff --git a/cms/djangoapps/contentstore/features/course-updates.py b/cms/djangoapps/contentstore/features/course-updates.py index 6285c6167831e2cee64892b3efa781367c90351c..6a39a29fee47aab720cc11c2e2ecd082f0424ab0 100644 --- a/cms/djangoapps/contentstore/features/course-updates.py +++ b/cms/djangoapps/contentstore/features/course-updates.py @@ -4,7 +4,7 @@ from lettuce import world, step from selenium.webdriver.common.keys import Keys from common import type_in_codemirror, get_codemirror_value -from nose.tools import assert_in # pylint: disable=E0611 +from nose.tools import assert_in # pylint: disable=no-name-in-module @step(u'I go to the course updates page') diff --git a/cms/djangoapps/contentstore/features/grading.py b/cms/djangoapps/contentstore/features/grading.py index e10fb39a4f6422fd47e8e4e08073c9a8bf22e288..10ea72b79441bf20463d59fb0943501a1d142ba9 100644 --- a/cms/djangoapps/contentstore/features/grading.py +++ b/cms/djangoapps/contentstore/features/grading.py @@ -7,7 +7,7 @@ from terrain.steps import reload_the_page from selenium.common.exceptions import InvalidElementStateException from opaque_keys.edx.locations import SlashSeparatedCourseKey from contentstore.utils import reverse_course_url -from nose.tools import assert_in, assert_not_in, assert_equal, assert_not_equal # pylint: disable=E0611 +from nose.tools import assert_in, assert_not_in, assert_equal, assert_not_equal # pylint: disable=no-name-in-module @step(u'I am viewing the grading settings') diff --git a/cms/djangoapps/contentstore/features/pages.py b/cms/djangoapps/contentstore/features/pages.py index 36d3a85df19ae027933022dd94265963f259b765..0c6c89844d7ea727d3e1a7bb87df5834e18c62f3 100644 --- a/cms/djangoapps/contentstore/features/pages.py +++ b/cms/djangoapps/contentstore/features/pages.py @@ -3,7 +3,7 @@ # pylint: disable=W0613 from lettuce import world, step -from nose.tools import assert_equal, assert_in # pylint: disable=E0611 +from nose.tools import assert_equal, assert_in # pylint: disable=no-name-in-module CSS_FOR_TAB_ELEMENT = "li[data-tab-id='{0}'] input.toggle-checkbox" diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py index c7b3dd3069b28f6be6eab1e292c305988af5455f..a1135d06c73c5c4f8ccad358c8b1ca53764982fb 100644 --- a/cms/djangoapps/contentstore/features/problem-editor.py +++ b/cms/djangoapps/contentstore/features/problem-editor.py @@ -3,7 +3,7 @@ import json from lettuce import world, step -from nose.tools import assert_equal, assert_true # pylint: disable=E0611 +from nose.tools import assert_equal, assert_true # pylint: disable=no-name-in-module from common import type_in_codemirror, open_new_course from advanced_settings import change_value, ADVANCED_MODULES_KEY from course_import import import_file diff --git a/cms/djangoapps/contentstore/features/upload.py b/cms/djangoapps/contentstore/features/upload.py index bd483ca3a743460287fdec03c5a10aab55367adb..5ae85ddb1924cd5224d3bbc0f0b80b6efb42ed55 100644 --- a/cms/djangoapps/contentstore/features/upload.py +++ b/cms/djangoapps/contentstore/features/upload.py @@ -10,7 +10,7 @@ import random import os from django.contrib.auth.models import User from student.models import CourseEnrollment -from nose.tools import assert_equal, assert_not_equal # pylint: disable=E0611 +from nose.tools import assert_equal, assert_not_equal # pylint: disable=no-name-in-module TEST_ROOT = settings.COMMON_TEST_DATA_ROOT ASSET_NAMES_CSS = 'td.name-col > span.title > a.filename' diff --git a/cms/djangoapps/contentstore/features/video_editor.py b/cms/djangoapps/contentstore/features/video_editor.py index 687f65e898664765a15a2b7999e610db16ecf308..8cac89b5982c0efba9ada8b52c0551f97bebc552 100644 --- a/cms/djangoapps/contentstore/features/video_editor.py +++ b/cms/djangoapps/contentstore/features/video_editor.py @@ -4,7 +4,7 @@ import requests from lettuce import world, step -from nose.tools import assert_true, assert_equal, assert_in, assert_not_equal # pylint: disable=E0611 +from nose.tools import assert_true, assert_equal, assert_in, assert_not_equal # pylint: disable=no-name-in-module from terrain.steps import reload_the_page from django.conf import settings from common import upload_file, attach_file diff --git a/cms/djangoapps/contentstore/features/video_handout.py b/cms/djangoapps/contentstore/features/video_handout.py index 9f3aa2c090beddfed6fa2304a4d0523854cdcb86..ccf74680d72655af6859cb0eb9df00a6f352921a 100644 --- a/cms/djangoapps/contentstore/features/video_handout.py +++ b/cms/djangoapps/contentstore/features/video_handout.py @@ -3,7 +3,7 @@ # pylint: disable=missing-docstring from lettuce import world, step -from nose.tools import assert_true # pylint: disable=E0611 +from nose.tools import assert_true # pylint: disable=no-name-in-module from video_editor import RequestHandlerWithSessionId, success_upload_file diff --git a/common/djangoapps/static_replace/test/test_static_replace.py b/common/djangoapps/static_replace/test/test_static_replace.py index 7dc3d7f3cb1c8437fabcc3f7f187609721b0f4a3..b74965277f05bd357018b96a632036c27be45638 100644 --- a/common/djangoapps/static_replace/test/test_static_replace.py +++ b/common/djangoapps/static_replace/test/test_static_replace.py @@ -1,6 +1,6 @@ import re -from nose.tools import assert_equals, assert_true, assert_false # pylint: disable=E0611 +from nose.tools import assert_equals, assert_true, assert_false # pylint: disable=no-name-in-module from static_replace import (replace_static_urls, replace_course_urls, _url_replace_regex) from mock import patch, Mock diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py index 0a5db237541a72cb0d4be857412f33146e16412e..f8b6daef3455d46a9cd4743e592d7d83fa4fd99f 100644 --- a/common/djangoapps/terrain/steps.py +++ b/common/djangoapps/terrain/steps.py @@ -19,7 +19,7 @@ import lettuce.django from lettuce import world, step from .course_helpers import * from .ui_helpers import * -from nose.tools import assert_equals # pylint: disable=E0611 +from nose.tools import assert_equals # pylint: disable=no-name-in-module from opaque_keys.edx.locations import SlashSeparatedCourseKey diff --git a/common/djangoapps/util/tests/test_date_utils.py b/common/djangoapps/util/tests/test_date_utils.py index 0bf52b8ac6fa622d5b2bae90fdf42189be1dc65c..579c476c048ff81bc1c6ddf52342cb3cb6e0be8c 100644 --- a/common/djangoapps/util/tests/test_date_utils.py +++ b/common/djangoapps/util/tests/test_date_utils.py @@ -8,7 +8,7 @@ import unittest import ddt from mock import patch -from nose.tools import assert_equals, assert_false # pylint: disable=E0611 +from nose.tools import assert_equals, assert_false # pylint: disable=no-name-in-module from pytz import UTC from util.date_utils import ( diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py index 0b428ca333f119b727efe07abb202c30dfef506c..ebc6892729a7dd65773387cb768f29e4b85bd071 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py @@ -1,4 +1,4 @@ -from nose.tools import assert_equals, assert_true, assert_false # pylint: disable=E0611 +from nose.tools import assert_equals, assert_true, assert_false # pylint: disable=no-name-in-module def check_has_course_method(modulestore, locator, locator_key_fields): diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py index ab2afc1bc866912a06f9a1a19ce647a187a69d9d..6fbe8747e2ac2d4c1e22fd996722d01990573323 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py @@ -1,6 +1,6 @@ # pylint: disable=E1101 # pylint: disable=W0212 -# pylint: disable=E0611 +# pylint: disable=no-name-in-module from nose.tools import assert_equals, assert_raises, \ assert_not_equals, assert_false, assert_true, assert_greater, assert_is_instance, assert_is_none # pylint: enable=E0611 diff --git a/common/lib/xmodule/xmodule/tests/test_stringify.py b/common/lib/xmodule/xmodule/tests/test_stringify.py index 10abaf72f5b670c2d0603025c6c2f34d6419f471..8bdf59f5ba9b7cf76d9ae7204d1fa9fcc970402e 100644 --- a/common/lib/xmodule/xmodule/tests/test_stringify.py +++ b/common/lib/xmodule/xmodule/tests/test_stringify.py @@ -1,4 +1,4 @@ -from nose.tools import assert_equals # pylint: disable=E0611 +from nose.tools import assert_equals # pylint: disable=no-name-in-module from lxml import etree from xmodule.stringify import stringify_children diff --git a/common/lib/xmodule/xmodule/tests/test_xml_module.py b/common/lib/xmodule/xmodule/tests/test_xml_module.py index 36d22c0fba5e1c6043710dd739c36e8c8e84bc0b..1d85d428b01f40a3d1d7b415f2fb2aa1d22785ad 100644 --- a/common/lib/xmodule/xmodule/tests/test_xml_module.py +++ b/common/lib/xmodule/xmodule/tests/test_xml_module.py @@ -4,7 +4,7 @@ import unittest from mock import Mock -from nose.tools import assert_equals, assert_not_equals, assert_true, assert_false, assert_in, assert_not_in # pylint: disable=E0611 +from nose.tools import assert_equals, assert_not_equals, assert_true, assert_false, assert_in, assert_not_in # pylint: disable=no-name-in-module from xblock.field_data import DictFieldData from xblock.fields import Scope, String, Dict, Boolean, Integer, Float, Any, List diff --git a/lms/djangoapps/courseware/features/homepage.py b/lms/djangoapps/courseware/features/homepage.py index 37858a132b4de0203c810d9242aaee432402d6da..d10ec77f2579263a71d581adee943e3be42c3800 100644 --- a/lms/djangoapps/courseware/features/homepage.py +++ b/lms/djangoapps/courseware/features/homepage.py @@ -2,7 +2,7 @@ # pylint: disable=redefined-outer-name from lettuce import world, step -from nose.tools import assert_equals, assert_greater # pylint: disable=E0611 +from nose.tools import assert_equals, assert_greater # pylint: disable=no-name-in-module @step(u'I should see the following links and ids') diff --git a/lms/djangoapps/courseware/features/openended.py b/lms/djangoapps/courseware/features/openended.py index 9b48aed1951e9d119cc1a6574b60d48ceb1d76dd..2b517c40fe148a06fd687283b878b8c09957b431 100644 --- a/lms/djangoapps/courseware/features/openended.py +++ b/lms/djangoapps/courseware/features/openended.py @@ -3,7 +3,7 @@ from lettuce import world, step from lettuce.django import django_url -from nose.tools import assert_equals, assert_in # pylint: disable=E0611 +from nose.tools import assert_equals, assert_in # pylint: disable=no-name-in-module from logging import getLogger logger = getLogger(__name__) diff --git a/lms/djangoapps/django_comment_client/base/tests.py b/lms/djangoapps/django_comment_client/base/tests.py index 67b1eb91a42bf642f684e1d8bedecdfd314d64eb..3595eef348331c19ca799915ed987e6c4abe5be9 100644 --- a/lms/djangoapps/django_comment_client/base/tests.py +++ b/lms/djangoapps/django_comment_client/base/tests.py @@ -7,7 +7,7 @@ from django.contrib.auth.models import User from django.core.management import call_command from django.core.urlresolvers import reverse from mock import patch, ANY, Mock -from nose.tools import assert_true, assert_equal # pylint: disable=E0611 +from nose.tools import assert_true, assert_equal # pylint: disable=no-name-in-module from opaque_keys.edx.locations import SlashSeparatedCourseKey from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE diff --git a/lms/djangoapps/django_comment_client/forum/tests.py b/lms/djangoapps/django_comment_client/forum/tests.py index c435b2dc86e24cf114e8df59f4b1b09a0c93ec77..9a2d3b54c0fd41bbce8d9d7bc0fad1b916f46adc 100644 --- a/lms/djangoapps/django_comment_client/forum/tests.py +++ b/lms/djangoapps/django_comment_client/forum/tests.py @@ -21,7 +21,7 @@ from django_comment_client.utils import strip_none from courseware.tests.modulestore_config import TEST_DATA_DIR from courseware.courses import UserNotEnrolled -from nose.tools import assert_true # pylint: disable=E0611 +from nose.tools import assert_true # pylint: disable=no-name-in-module from mock import patch, Mock, ANY, call from course_groups.models import CourseUserGroup diff --git a/lms/djangoapps/instructor/features/bulk_email.py b/lms/djangoapps/instructor/features/bulk_email.py index 654de88ded386f7261f655317de118cf33accebe..415a26c102401d66ab0d9a89854f2ddc638c67ec 100644 --- a/lms/djangoapps/instructor/features/bulk_email.py +++ b/lms/djangoapps/instructor/features/bulk_email.py @@ -7,7 +7,7 @@ Define steps for bulk email acceptance test. from lettuce import world, step from lettuce.django import mail -from nose.tools import assert_in, assert_equal # pylint: disable=E0611 +from nose.tools import assert_in, assert_equal # pylint: disable=no-name-in-module from django.core.management import call_command from django.conf import settings diff --git a/lms/djangoapps/instructor/features/common.py b/lms/djangoapps/instructor/features/common.py index c3736b49dd15eb6a0f0f4cef669f5496e526c6a9..92402d384261e82213319491ae0f4585f496649b 100644 --- a/lms/djangoapps/instructor/features/common.py +++ b/lms/djangoapps/instructor/features/common.py @@ -9,7 +9,7 @@ from __future__ import absolute_import from lettuce import world, step from mock import patch -from nose.tools import assert_in # pylint: disable=E0611 +from nose.tools import assert_in # pylint: disable=no-name-in-module from courseware.tests.factories import StaffFactory, InstructorFactory diff --git a/lms/djangoapps/instructor/features/data_download.py b/lms/djangoapps/instructor/features/data_download.py index 4a072b78fee78fcab66b9c1db6297142157b3624..a8734621c6f88e825b983d08b50c2bfd756c3a5e 100644 --- a/lms/djangoapps/instructor/features/data_download.py +++ b/lms/djangoapps/instructor/features/data_download.py @@ -7,7 +7,7 @@ acceptance tests. # pylint: disable=redefined-outer-name from lettuce import world, step -from nose.tools import assert_in, assert_regexp_matches # pylint: disable=E0611 +from nose.tools import assert_in, assert_regexp_matches # pylint: disable=no-name-in-module from terrain.steps import reload_the_page from django.utils import http diff --git a/lms/djangoapps/licenses/tests.py b/lms/djangoapps/licenses/tests.py index c3bb8ca7a3969e937db1f4f43941ec00113eef64..ef99ff501b061eaf48b16c819946b1db9429f6bf 100644 --- a/lms/djangoapps/licenses/tests.py +++ b/lms/djangoapps/licenses/tests.py @@ -13,7 +13,7 @@ from django.test.client import Client from django.test.utils import override_settings from django.core.management import call_command from django.core.urlresolvers import reverse -from nose.tools import assert_true # pylint: disable=E0611 +from nose.tools import assert_true # pylint: disable=no-name-in-module from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE from licenses.models import CourseSoftware, UserLicense