diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index d8fb8a606b..62a42cb3f6 100644 --- a/cms/envs/acceptance.py +++ b/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 * diff --git a/cms/envs/aws.py b/cms/envs/aws.py index b43a00254a..c73f8d0472 100644 --- a/cms/envs/aws.py +++ b/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 diff --git a/cms/envs/aws_migrate.py b/cms/envs/aws_migrate.py index 7986d929fa..e14834ec2d 100644 --- a/cms/envs/aws_migrate.py +++ b/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 * diff --git a/cms/envs/bok_choy.py b/cms/envs/bok_choy.py index 6eab6cd22d..f623571533 100644 --- a/cms/envs/bok_choy.py +++ b/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 #################################### diff --git a/cms/envs/common.py b/cms/envs/common.py index 1fc2423825..5b23f751c2 100644 --- a/cms/envs/common.py +++ b/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 diff --git a/cms/envs/debug_upload.py b/cms/envs/debug_upload.py index f4ef6aab8a..e9282c6888 100644 --- a/cms/envs/debug_upload.py +++ b/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 = ( diff --git a/cms/envs/dev.py b/cms/envs/dev.py index 5bfbc0048d..a82da4cfcd 100644 --- a/cms/envs/dev.py +++ b/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 diff --git a/cms/envs/dev_dbperf.py b/cms/envs/dev_dbperf.py index 9942280ba1..610a974e3f 100644 --- a/cms/envs/dev_dbperf.py +++ b/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 * diff --git a/cms/envs/dev_ike.py b/cms/envs/dev_ike.py index 13d474a59b..c593bdcdeb 100644 --- a/cms/envs/dev_ike.py +++ b/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 diff --git a/cms/envs/dev_shared_preview.py b/cms/envs/dev_shared_preview.py index cf5e021ac8..98c8fa7b15 100644 --- a/cms/envs/dev_shared_preview.py +++ b/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 * diff --git a/cms/envs/dev_with_worker.py b/cms/envs/dev_with_worker.py index cac84cb099..40f6ed4e1f 100644 --- a/cms/envs/dev_with_worker.py +++ b/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 * diff --git a/cms/envs/microsite_test.py b/cms/envs/microsite_test.py index 724ca277f3..f84d587613 100644 --- a/cms/envs/microsite_test.py +++ b/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 * diff --git a/cms/envs/test.py b/cms/envs/test.py index e8e4e7d80e..8ee1bcb625 100644 --- a/cms/envs/test.py +++ b/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 diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py index ced2aa6780..5ea05ddec2 100644 --- a/common/djangoapps/terrain/steps.py +++ b/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 diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py index 6a3e6ddf7a..60509a12bf 100644 --- a/lms/envs/acceptance.py +++ b/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 * diff --git a/lms/envs/aws.py b/lms/envs/aws.py index eb5e4b4dca..bacd50a31e 100644 --- a/lms/envs/aws.py +++ b/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 diff --git a/lms/envs/aws_migrate.py b/lms/envs/aws_migrate.py index 7986d929fa..e14834ec2d 100644 --- a/lms/envs/aws_migrate.py +++ b/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 * diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py index 3974a9619d..fbb2d6ef70 100644 --- a/lms/envs/bok_choy.py +++ b/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 #################################### diff --git a/lms/envs/cms/aws.py b/lms/envs/cms/aws.py index d16408afcf..fa93670f00 100644 --- a/lms/envs/cms/aws.py +++ b/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 * diff --git a/lms/envs/cms/dev.py b/lms/envs/cms/dev.py index 622ff1e709..0669147d0f 100644 --- a/lms/envs/cms/dev.py +++ b/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 * diff --git a/lms/envs/cms/microsite_test.py b/lms/envs/cms/microsite_test.py index 15ed0a535a..586e357e85 100644 --- a/lms/envs/cms/microsite_test.py +++ b/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 diff --git a/lms/envs/common.py b/lms/envs/common.py index dc02a16ad1..e4053e7bb7 100644 --- a/lms/envs/common.py +++ b/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 diff --git a/lms/envs/content.py b/lms/envs/content.py index 1606e7e9a8..90c9f8a0fb 100644 --- a/lms/envs/content.py +++ b/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 * diff --git a/lms/envs/dev.py b/lms/envs/dev.py index 77cdb69113..85ce3e3906 100644 --- a/lms/envs/dev.py +++ b/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 diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py index f39911f144..9aea2f0e10 100644 --- a/lms/envs/dev_ike.py +++ b/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 * diff --git a/lms/envs/dev_int.py b/lms/envs/dev_int.py index 15367119e2..f6e5ef028e 100644 --- a/lms/envs/dev_int.py +++ b/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 * diff --git a/lms/envs/dev_with_worker.py b/lms/envs/dev_with_worker.py index cac84cb099..40f6ed4e1f 100644 --- a/lms/envs/dev_with_worker.py +++ b/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 * diff --git a/lms/envs/devgroups/courses.py b/lms/envs/devgroups/courses.py index d170f372e7..edf7484bbf 100644 --- a/lms/envs/devgroups/courses.py +++ b/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 * diff --git a/lms/envs/devgroups/h_cs50.py b/lms/envs/devgroups/h_cs50.py index a82f3f90e2..2c64946a3f 100644 --- a/lms/envs/devgroups/h_cs50.py +++ b/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 * diff --git a/lms/envs/devgroups/m_6002.py b/lms/envs/devgroups/m_6002.py index eb96cdda8b..5df2a33440 100644 --- a/lms/envs/devgroups/m_6002.py +++ b/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 * diff --git a/lms/envs/devgroups/portal.py b/lms/envs/devgroups/portal.py index f8c1d015b6..e972d9f36c 100644 --- a/lms/envs/devgroups/portal.py +++ b/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 * diff --git a/lms/envs/discussionsettings.py b/lms/envs/discussionsettings.py index 1ac4c23af8..f32fb43e44 100644 --- a/lms/envs/discussionsettings.py +++ b/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') diff --git a/lms/envs/edx4edx_aws.py b/lms/envs/edx4edx_aws.py index 151a6556d3..4ff2133e7b 100644 --- a/lms/envs/edx4edx_aws.py +++ b/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 * diff --git a/lms/envs/load_test.py b/lms/envs/load_test.py index b81ee45587..c21e226527 100644 --- a/lms/envs/load_test.py +++ b/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 * diff --git a/lms/envs/sauce.py b/lms/envs/sauce.py index 80ca002c74..c8c7577ed5 100644 --- a/lms/envs/sauce.py +++ b/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 diff --git a/lms/envs/static.py b/lms/envs/static.py index 8c13f7daea..101d790420 100644 --- a/lms/envs/static.py +++ b/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 diff --git a/lms/envs/test.py b/lms/envs/test.py index 509860a28f..de74f29c0f 100644 --- a/lms/envs/test.py +++ b/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