diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | lint.py | 2 | ||||
| -rw-r--r-- | test/unittest_lint.py | 4 |
3 files changed, 6 insertions, 3 deletions
@@ -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. @@ -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): |