From bb8984f5edfc82884a11f6e08418632da7223c0c Mon Sep 17 00:00:00 2001 From: Rachel Kogan Date: Tue, 17 Apr 2018 16:17:29 -0400 Subject: [PATCH 1/3] fix error in caplog docs. --- _pytest/logging.py | 6 +++--- doc/en/builtin.rst | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_pytest/logging.py b/_pytest/logging.py index 902872e45..2f50192c3 100644 --- a/_pytest/logging.py +++ b/_pytest/logging.py @@ -289,9 +289,9 @@ def caplog(request): Captured logs are available through the following methods:: - * caplog.text() -> string containing formatted log output - * caplog.records() -> list of logging.LogRecord instances - * caplog.record_tuples() -> list of (logger_name, level, message) tuples + * caplog.text -> string containing formatted log output + * caplog.records -> list of logging.LogRecord instances + * caplog.record_tuples -> list of (logger_name, level, message) tuples * caplog.clear() -> clear captured records and formatted log output string """ result = LogCaptureFixture(request.node) diff --git a/doc/en/builtin.rst b/doc/en/builtin.rst index 7a71827e9..7edb1c453 100644 --- a/doc/en/builtin.rst +++ b/doc/en/builtin.rst @@ -77,9 +77,9 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a Captured logs are available through the following methods:: - * caplog.text() -> string containing formatted log output - * caplog.records() -> list of logging.LogRecord instances - * caplog.record_tuples() -> list of (logger_name, level, message) tuples + * caplog.text -> string containing formatted log output + * caplog.records -> list of logging.LogRecord instances + * caplog.record_tuples -> list of (logger_name, level, message) tuples * caplog.clear() -> clear captured records and formatted log output string monkeypatch The returned ``monkeypatch`` fixture provides these From 48c99f62e347a7d6ed093027e223f74502b05cfa Mon Sep 17 00:00:00 2001 From: Rachel Kogan Date: Tue, 17 Apr 2018 16:24:32 -0400 Subject: [PATCH 2/3] add changelog --- changelog/3406.doc.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/3406.doc.rst diff --git a/changelog/3406.doc.rst b/changelog/3406.doc.rst new file mode 100644 index 000000000..44f138f4b --- /dev/null +++ b/changelog/3406.doc.rst @@ -0,0 +1 @@ +Fix typo in `caplog` fixture documentation, which incorrectly identified certain attributes as methods. \ No newline at end of file From cefeba33efa366e1f2775b2967b2c5c5d74457ed Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Fri, 20 Apr 2018 17:40:19 -0300 Subject: [PATCH 3/3] Update changelog formatting --- changelog/3406.doc.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/3406.doc.rst b/changelog/3406.doc.rst index 44f138f4b..e6f0f7462 100644 --- a/changelog/3406.doc.rst +++ b/changelog/3406.doc.rst @@ -1 +1 @@ -Fix typo in `caplog` fixture documentation, which incorrectly identified certain attributes as methods. \ No newline at end of file +Fix typo in ``caplog`` fixture documentation, which incorrectly identified certain attributes as methods.