s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/

cms/envs/acceptance.py

@@ -5,7 +5,7 @@ so that we can run the lettuce acceptance tests.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .test import *
 from lms.envs.sauce import *

cms/envs/aws.py

@@ -4,7 +4,7 @@ This is the default template for our main set of AWS servers.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 import json
 

cms/envs/aws_migrate.py

@@ -6,7 +6,7 @@ LMS with enough privileges to modify the database schema.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 # Import everything from .aws so that our settings are based on those.
 from .aws import *

cms/envs/bok_choy.py

@@ -15,7 +15,7 @@ from path import path
 os.environ['SERVICE_VARIANT'] = 'bok_choy'
 os.environ['CONFIG_ROOT'] = path(__file__).abspath().dirname()  # pylint: disable=no-value-for-parameter
 
-from .aws import *  # pylint: disable=wildcard-import, W0614
+from .aws import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 ######################### Testing overrides ####################################
 

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, W0614
+# pylint: disable=wildcard-import, W0611, unused-wildcard-import
 
 import imp
 import os

cms/envs/debug_upload.py

@@ -2,7 +2,7 @@
 A new cms ENV configuration to use a slow upload file handler to help test
 progress bars in uploads
 """
-# pylint: disable=W0614
+# pylint: disable=unused-wildcard-import
 from .dev import *  # pylint: disable=wildcard-import
 
 FILE_UPLOAD_HANDLERS = (

cms/envs/dev.py

@@ -3,7 +3,7 @@ This config file runs the simplest dev environment"""
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 from logsettings import get_logger_config

cms/envs/dev_dbperf.py

@@ -4,7 +4,7 @@ This configuration is to turn on the Django Toolbar stats for DB access stats, f
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .dev import *
 

cms/envs/dev_ike.py

@@ -1,6 +1,6 @@
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 # dev environment for ichuang/mit
 

cms/envs/dev_shared_preview.py

@@ -5,7 +5,7 @@ the same process between preview and published
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .dev import *
 

cms/envs/dev_with_worker.py

@@ -10,7 +10,7 @@ django_admin.py celery worker
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from dev import *
 

cms/envs/microsite_test.py

@@ -3,7 +3,7 @@ This is a localdev test for the Microsite processing pipeline
 """
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .dev import *
 

cms/envs/test.py

@@ -10,7 +10,7 @@ sessions. Assumes structure:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 import os

common/djangoapps/terrain/steps.py

@@ -6,7 +6,7 @@
 # pylint: disable=wildcard-import
 
 # Disable the "Unused import %s from wildcard import" warning
-# pylint: disable=W0614
+# pylint: disable=unused-wildcard-import
 
 # Disable the "unused argument" warning because lettuce uses "step"
 # pylint: disable=unused-argument

lms/envs/acceptance.py

@@ -5,7 +5,7 @@ so that we can run the lettuce acceptance tests.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .test import *
 from .sauce import *

lms/envs/aws.py

@@ -9,7 +9,7 @@ Common traits:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 import json
 

lms/envs/aws_migrate.py

@@ -6,7 +6,7 @@ LMS with enough privileges to modify the database schema.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 # Import everything from .aws so that our settings are based on those.
 from .aws import *

lms/envs/bok_choy.py

@@ -18,7 +18,7 @@ TEST_ROOT = CONFIG_ROOT.dirname().dirname() / "test_root"
 os.environ['SERVICE_VARIANT'] = 'bok_choy'
 os.environ['CONFIG_ROOT'] = CONFIG_ROOT
 
-from .aws import *  # pylint: disable=wildcard-import, W0614
+from .aws import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 
 ######################### Testing overrides ####################################

lms/envs/cms/aws.py

@@ -4,7 +4,7 @@ Settings for the LMS that runs alongside the CMS on AWS
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from ..aws import *
 

lms/envs/cms/dev.py

@@ -4,7 +4,7 @@ Settings for the LMS that runs alongside the CMS on AWS
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from ..dev import *
 

lms/envs/cms/microsite_test.py

@@ -3,7 +3,7 @@ This is a localdev test for the Microsite processing pipeline
 """
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .dev import *
 from ..dev import ENV_ROOT, FEATURES

lms/envs/common.py

@@ -22,8 +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, W0614, invalid-name
-
+# pylint: disable=wildcard-import, W0611, unused-wildcard-import, invalid-name
 
 import sys
 import os

lms/envs/content.py

@@ -5,7 +5,7 @@ between dev machines and AWS machines.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .aws import *
 

lms/envs/dev.py

@@ -10,7 +10,7 @@ sessions. Assumes structure:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 from logsettings import get_logger_config

lms/envs/dev_ike.py

@@ -10,7 +10,7 @@ sessions. Assumes structure:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 from .dev import *

lms/envs/dev_int.py

@@ -12,7 +12,7 @@ use *.dev domains instead for local testing.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .dev import *
 

lms/envs/dev_with_worker.py

@@ -10,7 +10,7 @@ django_admin.py celery worker
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from dev import *
 

lms/envs/devgroups/courses.py

@@ -1,7 +1,7 @@
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from ..dev import *
 

lms/envs/devgroups/h_cs50.py

@@ -1,7 +1,7 @@
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .courses import *
 

lms/envs/devgroups/m_6002.py

@@ -1,7 +1,7 @@
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .courses import *
 

lms/envs/devgroups/portal.py

@@ -5,7 +5,7 @@ get shared sessions)
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from courses import *
 

lms/envs/discussionsettings.py

@@ -1,5 +1,5 @@
 
 # We intentionally define variables that aren't used
-# pylint: disable=W0614
+# pylint: disable=unused-wildcard-import
 
 DISCUSSION_ALLOWED_UPLOAD_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')

lms/envs/edx4edx_aws.py

@@ -1,6 +1,6 @@
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 # Settings for edx4edx production instance
 from .aws import *

lms/envs/load_test.py

@@ -4,7 +4,7 @@ Settings for load testing.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .aws import *
 

lms/envs/sauce.py

@@ -5,7 +5,7 @@ so that we can run the lettuce acceptance tests on SauceLabs.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 import os

lms/envs/static.py

@@ -10,7 +10,7 @@ sessions. Assumes structure:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 from logsettings import get_logger_config

lms/envs/test.py

@@ -10,7 +10,7 @@ sessions. Assumes structure:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 import os