summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudiu Popa <pcmanticore@gmail.com>2015-09-23 14:03:23 +0300
committerClaudiu Popa <pcmanticore@gmail.com>2015-09-23 14:03:23 +0300
commit765c107a41e9726d10e3d1c622a7509cb409b011 (patch)
treea6cde595e8dbc4e2fe590ff0fef869f901794554
parent9163230f09d103beadadca452a4809fce59bc526 (diff)
downloadpylint-765c107a41e9726d10e3d1c622a7509cb409b011.tar.gz
Grammar fix.
-rw-r--r--ChangeLog4
-rw-r--r--pylint/checkers/base.py2
-rw-r--r--pylint/test/test_self.py8
-rw-r--r--pylint/utils.py2
4 files changed, 8 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 8154628..32492da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -261,9 +261,9 @@ ChangeLog for Pylint
as a special case for the reversed builtin. This will happen
shortly in the future.
- * --comment flag is obsoleted and it will be removed in Pylint 1.6.
+ * --comment flag is obsolete and it will be removed in Pylint 1.6.
- * --profile flag is obsoleted and it will be removed in Pylint 1.6.
+ * --profile flag is obsolete and it will be removed in Pylint 1.6.
* Add a new error, 'misplaced-bare-raise'.
diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py
index 8b2c650..f90172a 100644
--- a/pylint/checkers/base.py
+++ b/pylint/checkers/base.py
@@ -650,7 +650,7 @@ functions, methods
options = (('required-attributes',
deprecated_option(opt_type='csv',
help_msg="Required attributes for module. "
- "This option is obsoleted.")),
+ "This option is obsolete.")),
('bad-functions',
{'default' : BAD_FUNCTIONS,
diff --git a/pylint/test/test_self.py b/pylint/test/test_self.py
index 4fbfa39..228c808 100644
--- a/pylint/test/test_self.py
+++ b/pylint/test/test_self.py
@@ -155,22 +155,22 @@ class RunTC(unittest.TestCase):
self.assertIn(expected, output)
def test_deprecated_options_zope(self):
- expected = ("option --zope is obsoleted and it is "
+ expected = ("option --zope is obsolete 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 obsoleted and it is "
+ expected = ("option --symbols is obsolete 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 obsoleted and it is "
+ expected = ("option --include-ids is obsolete and it is "
"slated for removal in Pylint 1.6")
self._test_deprecated_options("--include-ids=y", expected)
def test_deprecated_options_profile(self):
- expected = ("option --profile is obsoleted and it is "
+ expected = ("option --profile is obsolete and it is "
"slated for removal in Pylint 1.6")
self._test_deprecated_options("--profile=y", expected)
diff --git a/pylint/utils.py b/pylint/utils.py
index ea844b2..47297b0 100644
--- a/pylint/utils.py
+++ b/pylint/utils.py
@@ -980,7 +980,7 @@ 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 obsoleted and "
+ msg = ("Warning: option %s is obsolete and "
"it is slated for removal in Pylint 1.6.\n")
sys.stderr.write(msg % (optname,))