diff options
| author | Claudiu Popa <cpopa@cloudbasesolutions.com> | 2015-08-20 17:17:14 +0300 |
|---|---|---|
| committer | Claudiu Popa <cpopa@cloudbasesolutions.com> | 2015-08-20 17:17:14 +0300 |
| commit | 69f5e6975f7978527731622785cb9a9ce739ffb3 (patch) | |
| tree | 09fdc2de8ec0ca23864b72f1f8ba100feca33d74 | |
| parent | 2948d991f2d6b5e13bd2a84a0a75ec43b9f2ad28 (diff) | |
| download | pylint-69f5e6975f7978527731622785cb9a9ce739ffb3.tar.gz | |
Update the deprecation message to reflect the fact that the options are *obsoleted*.
| -rw-r--r-- | pylint/test/test_self.py | 12 | ||||
| -rw-r--r-- | pylint/utils.py | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pylint/test/test_self.py b/pylint/test/test_self.py index b2a378b..618d232 100644 --- a/pylint/test/test_self.py +++ b/pylint/test/test_self.py @@ -155,18 +155,18 @@ class RunTC(unittest.TestCase): self.assertIn(expected, output) def test_deprecated_options_zope(self): - expected = ("option --zope is deprecated and ignored. " - "It will be removed in Pylint 1.6") + expected = ("option --zope is obsoleted and it is " + "slated for removal in Pylint 1.6") self._test_deprecated_options("--zope=y", expected) def test_deprecated_options_symbols(self): - expected = ("option --symbols is deprecated and ignored. " - "It will be removed in Pylint 1.6") + expected = ("option --symbols is obsoleted and it is " + "slated for removal in Pylint 1.6") self._test_deprecated_options("--symbols=y", expected) def test_deprecated_options_include_ids(self): - expected = ("option --include-ids is deprecated and ignored. " - "It will be removed in Pylint 1.6") + expected = ("option --include-ids is obsoleted and it is " + "slated for removal in Pylint 1.6") self._test_deprecated_options("--include-ids=y", expected) def test_help_message_option(self): diff --git a/pylint/utils.py b/pylint/utils.py index 79fb4bc..236f7c8 100644 --- a/pylint/utils.py +++ b/pylint/utils.py @@ -939,8 +939,8 @@ def get_global_option(checker, option, default=None): def deprecated_option(shortname=None, opt_type=None, help_msg=None): def _warn_deprecated(option, optname, *args): # pylint: disable=unused-argument - msg = ("Warning: option %s is deprecated and ignored. " - "It will be removed in Pylint 1.6.\n") + msg = ("Warning: option %s is obsoleted and " + "it is slated for removal in Pylint 1.6.\n") sys.stderr.write(msg % (optname,)) option = { |