summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <julien.cristau@logilab.fr>2011-07-08 16:14:20 +0200
committerJulien Cristau <julien.cristau@logilab.fr>2011-07-08 16:14:20 +0200
commitb2ee43cdb9a3324c27188939fbf8ed7b459dac77 (patch)
tree0c663bff2ac3d638916b7bc94d72db6c94ad91a9
parentbc66f92a85219978eeae85afd560a4609390fb57 (diff)
downloadpylint-git-b2ee43cdb9a3324c27188939fbf8ed7b459dac77.tar.gz
Fix --ignore option documentation to match reality (closes #22273)
The option can only be passed once, but it takes a list of file names.
-rw-r--r--ChangeLog4
-rw-r--r--lint.py7
-rw-r--r--man/pylint.14
3 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e5f496053..64586c070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
ChangeLog for PyLint
====================
-
+--
* #69738: add regular expressions support for "generated-members"
* ids of logging and string_format checkers have been changed:
@@ -21,6 +21,8 @@ ChangeLog for PyLint
* #70495: absolute imports fail depending on module path (patch by Jacek Konieczny)
+ * #22273: Fix --ignore option documentation to match reality
+
2011-01-11 -- 0.23.0
* documentation update, add manpages
diff --git a/lint.py b/lint.py
index 5b896dee5..b1e64d7ec 100644
--- a/lint.py
+++ b/lint.py
@@ -141,11 +141,10 @@ class PyLinter(OptionsManagerMixIn, MessagesHandlerMixIn, ReportsHandlerMixIn,
may_be_disabled = False
options = (('ignore',
- {'type' : 'csv', 'metavar' : '<file>',
+ {'type' : 'csv', 'metavar' : '<file>[,<file>...]',
'dest' : 'black_list', 'default' : ('CVS',),
- 'help' : 'Add <file or directory> to the black list. It \
-should be a base name, not a path. You may set this option multiple times.'}),
-
+ 'help' : 'Add files or directories to the blacklist. \
+They should be base names, not paths.'}),
('persistent',
{'default': True, 'type' : 'yn', 'metavar' : '<y_or_n>',
'level': 1,
diff --git a/man/pylint.1 b/man/pylint.1
index 7fb46e8b6..29b91d967 100644
--- a/man/pylint.1
+++ b/man/pylint.1
@@ -42,8 +42,8 @@ Specify a configuration file.
Python code to execute, usually for sys.path manipulation such as pygtk.require().
.IP "--errors-only, -E"
In error mode, checkers without error messages are disabled and for others, only the ERROR messages are displayed, and no reports are done by default
-.IP "--ignore=<file>"
-Add <file or directory> to the black list. It should be a base name, not a path. You may set this option multiple times. [current: CVS]
+.IP "--ignore=<file>[,<file>...]"
+Add files or directories to the blacklist. They should be base names, not paths.
.IP "--persistent=<y_or_n>"
Pickle collected data for later comparisons. [current: yes]
.IP "--load-plugins=<modules>"