summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Nowikowski <godfryd@gmail.com>2014-07-29 07:06:00 +0200
committerMichal Nowikowski <godfryd@gmail.com>2014-07-29 07:06:00 +0200
commita5c634088e452f30bb84b47c008a5c59a095647d (patch)
treee66e6828aebe8e10edd76c6d925c71d4847e08e2
parent461ca18e5b5d81a82b730d0675fbf8b51a0a3ade (diff)
downloadpylint-a5c634088e452f30bb84b47c008a5c59a095647d.tar.gz
Fixed merge problem.
-rw-r--r--ChangeLog10
1 files 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
-
-
-