s/pylint: disable=W0611/pylint: disable=unused-import/

cms/envs/common.py

@@ -22,7 +22,7 @@ Longer TODO:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0611, unused-wildcard-import
+# pylint: disable=wildcard-import, unused-import, unused-wildcard-import
 
 import imp
 import os

common/djangoapps/student/helpers.py

@@ -5,7 +5,7 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from opaque_keys.edx.keys import CourseKey
 from course_modes.models import CourseMode
-from third_party_auth import (  # pylint: disable=W0611
+from third_party_auth import (  # pylint: disable=unused-import
     pipeline, provider,
     is_enabled as third_party_auth_enabled
 )

lms/envs/common.py

@@ -22,7 +22,7 @@ Longer TODO:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0611, unused-wildcard-import, invalid-name
+# pylint: disable=wildcard-import, unused-import, unused-wildcard-import, invalid-name
 
 import sys
 import os