summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Th?nault <sylvain.thenault@logilab.fr>2014-04-25 07:36:47 +0200
committerSylvain Th?nault <sylvain.thenault@logilab.fr>2014-04-25 07:36:47 +0200
commit3a8f94025d14cbd2d9547cdc75611ad6f105e67d (patch)
treebd9df3e2afce712b7cc0cd619b22f6123d6c4654
parent41ce7ee12f464ba0c2a5967a43e1a1a93f1081c6 (diff)
downloadpylint-3a8f94025d14cbd2d9547cdc75611ad6f105e67d.tar.gz
restore init-hook accidentaly renamed in cset 474324137864. Closes #211
-rw-r--r--ChangeLog3
-rw-r--r--lint.py2
-rw-r--r--test/unittest_lint.py4
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bb3ba9..93ba5a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ ChangeLog for Pylint
* Extend the checking for unbalanced-tuple-unpacking and
unpacking-non-sequence to instance attribute unpacking as well.
+ * Restore --init-hook, renamed accidentally into --init-hooks in 1.2.0
+ (#211)
+
2014-04-18 -- 1.2.0
* Pass the current python paths to pylint process when invoked via
epylint. Fixes BitBucket issue #133.
diff --git a/lint.py b/lint.py
index 49eea73..679ee69 100644
--- a/lint.py
+++ b/lint.py
@@ -907,7 +907,7 @@ group are mutually exclusive.'),
try:
preprocess_options(args, {
# option: (callback, takearg)
- 'init-hooks': (cb_init_hook, True),
+ 'init-hook': (cb_init_hook, True),
'rcfile': (self.cb_set_rcfile, True),
'load-plugins': (self.cb_add_plugins, True),
})
diff --git a/test/unittest_lint.py b/test/unittest_lint.py
index a7213bd..2b13039 100644
--- a/test/unittest_lint.py
+++ b/test/unittest_lint.py
@@ -381,9 +381,9 @@ class PyLinterTC(TestCase):
def test_init_hooks_called_before_load_plugins(self):
self.assertRaises(RuntimeError,
- Run, ['--load-plugins', 'unexistant', '--init-hooks', 'raise RuntimeError'])
+ Run, ['--load-plugins', 'unexistant', '--init-hook', 'raise RuntimeError'])
self.assertRaises(RuntimeError,
- Run, ['--init-hooks', 'raise RuntimeError', '--load-plugins', 'unexistant'])
+ Run, ['--init-hook', 'raise RuntimeError', '--load-plugins', 'unexistant'])
class ConfigTC(TestCase):