From 20e2ee9a5780bf7880642625368cbe6edba62fea Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@edx.org>
Date: Sat, 29 Nov 2014 23:04:33 -0500
Subject: [PATCH] s/pylint: disable=E0611/pylint: disable=no-name-in-module/
---
cms/djangoapps/contentstore/features/advanced_settings.py | 2 +-
cms/djangoapps/contentstore/features/checklists.py | 2 +-
cms/djangoapps/contentstore/features/component.py | 2 +-
.../contentstore/features/component_settings_editor_helpers.py | 2 +-
cms/djangoapps/contentstore/features/course-outline.py | 2 +-
cms/djangoapps/contentstore/features/course-settings.py | 2 +-
cms/djangoapps/contentstore/features/course-team.py | 2 +-
cms/djangoapps/contentstore/features/course-updates.py | 2 +-
cms/djangoapps/contentstore/features/grading.py | 2 +-
cms/djangoapps/contentstore/features/pages.py | 2 +-
cms/djangoapps/contentstore/features/problem-editor.py | 2 +-
cms/djangoapps/contentstore/features/upload.py | 2 +-
cms/djangoapps/contentstore/features/video_editor.py | 2 +-
cms/djangoapps/contentstore/features/video_handout.py | 2 +-
common/djangoapps/static_replace/test/test_static_replace.py | 2 +-
common/djangoapps/terrain/steps.py | 2 +-
common/djangoapps/util/tests/test_date_utils.py | 2 +-
.../lib/xmodule/xmodule/modulestore/tests/test_modulestore.py | 2 +-
common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py | 2 +-
common/lib/xmodule/xmodule/tests/test_stringify.py | 2 +-
common/lib/xmodule/xmodule/tests/test_xml_module.py | 2 +-
lms/djangoapps/courseware/features/homepage.py | 2 +-
lms/djangoapps/courseware/features/openended.py | 2 +-
lms/djangoapps/django_comment_client/base/tests.py | 2 +-
lms/djangoapps/django_comment_client/forum/tests.py | 2 +-
lms/djangoapps/instructor/features/bulk_email.py | 2 +-
lms/djangoapps/instructor/features/common.py | 2 +-
lms/djangoapps/instructor/features/data_download.py | 2 +-
lms/djangoapps/licenses/tests.py | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/cms/djangoapps/contentstore/features/advanced_settings.py b/cms/djangoapps/contentstore/features/advanced_settings.py
index 242fde629ac..f85659bfa95 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 9b1d4276740..aad13a31202 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 04d5680ef4c..daf73187ce3 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 4cd814acd85..743f54f8297 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 141aaa17241..17c71b85e5a 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 bc307e5072d..c2aaae49898 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 855a6d143a3..130f05b0f54 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 6285c616783..6a39a29fee4 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 e10fb39a4f6..10ea72b7944 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 36d3a85df19..0c6c89844d7 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 c7b3dd3069b..a1135d06c73 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 bd483ca3a74..5ae85ddb192 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 687f65e8986..8cac89b5982 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 9f3aa2c090b..ccf74680d72 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 7dc3d7f3cb1..b74965277f0 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 0a5db237541..f8b6daef345 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 0bf52b8ac6f..579c476c048 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 0b428ca333f..ebc6892729a 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 ab2afc1bc86..6fbe8747e2a 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 10abaf72f5b..8bdf59f5ba9 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 36d22c0fba5..1d85d428b01 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 37858a132b4..d10ec77f257 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 9b48aed1951..2b517c40fe1 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 67b1eb91a42..3595eef3483 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 c435b2dc86e..9a2d3b54c0f 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 654de88ded3..415a26c1024 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 c3736b49dd1..92402d38426 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 4a072b78fee..a8734621c6f 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 c3bb8ca7a39..ef99ff501b0 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
--
GitLab