From a5c634088e452f30bb84b47c008a5c59a095647d Mon Sep 17 00:00:00 2001 From: Michal Nowikowski Date: Tue, 29 Jul 2014 07:06:00 +0200 Subject: Fixed merge problem. --- ChangeLog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1b9169..eb27374 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,7 +16,7 @@ ChangeLog for Pylint Closes issue #233. * Return new astroid class nodes when the inferencer can detect that - that result of a function invocation on a type (like `type` or + that result of a function invocation on a type (like `type` or `abc.ABCMeta`) is requested. Closes #205. * Emit 'undefined-variable' for undefined names when using the @@ -64,7 +64,7 @@ ChangeLog for Pylint * Don't emit 'unused-variable' when assigning to a nonlocal. Closes issue #275. - + * Do not let ImportError propagate from the import checker, leading to crash in some namespace package related cases. Closes issue #203. @@ -83,6 +83,9 @@ ChangeLog for Pylint * Don't emit 'unnecessary-lambda' if the body of the lambda call contains call chaining. Closes issue #243. + * Don't emit 'missing-docstring' when the actual docstring uses `.format`. + Closes issue #281. + 2014-04-30 -- 1.2.1 * Restore the ability to specify the init-hook option via the @@ -1512,6 +1515,3 @@ ChangeLog for Pylint 2003-05-19 -- 0.1 * initial release - - - -- cgit v1.2.1