From fdb6e35b1b9b19d53e00adc2f726140693702f3e Mon Sep 17 00:00:00 2001 From: Tim Gates Date: Wed, 26 Jun 2019 20:23:35 +1000 Subject: [PATCH 1/4] Fix typo replace `circuting` with `circuiting`. --- src/_pytest/assertion/rewrite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_pytest/assertion/rewrite.py b/src/_pytest/assertion/rewrite.py index f50d8200e..374bb2518 100644 --- a/src/_pytest/assertion/rewrite.py +++ b/src/_pytest/assertion/rewrite.py @@ -771,7 +771,7 @@ warn_explicit( fail_save = self.on_failure levels = len(boolop.values) - 1 self.push_format_context() - # Process each operand, short-circuting if needed. + # Process each operand, short-circuiting if needed. for i, v in enumerate(boolop.values): if i: fail_inner = [] From d81f758285499a8953e874b2b53ba8a5b1fa7430 Mon Sep 17 00:00:00 2001 From: Tim Gates Date: Wed, 26 Jun 2019 20:31:45 +1000 Subject: [PATCH 2/4] Update changelog with trivial as per ./CONTRIBUTING.rst --- changelog/5497.trivial.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/5497.trivial.rst diff --git a/changelog/5497.trivial.rst b/changelog/5497.trivial.rst new file mode 100644 index 000000000..735d1f928 --- /dev/null +++ b/changelog/5497.trivial.rst @@ -0,0 +1 @@ +Fix typo replace `circuting` with `circuiting`. From 994c32235c04480415a0eae55c8eab7332cc5f07 Mon Sep 17 00:00:00 2001 From: Tim Gates Date: Wed, 26 Jun 2019 20:46:09 +1000 Subject: [PATCH 3/4] Fix rst support --- changelog/5497.trivial.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/5497.trivial.rst b/changelog/5497.trivial.rst index 735d1f928..4cd2087bf 100644 --- a/changelog/5497.trivial.rst +++ b/changelog/5497.trivial.rst @@ -1 +1 @@ -Fix typo replace `circuting` with `circuiting`. +Fix typo replace ``circuting`` with circuiting. From a48feb3261c46ecda88fb97172d84f9f22ec1a88 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 26 Jun 2019 11:09:04 -0300 Subject: [PATCH 4/4] Delete 5497.trivial.rst Just a typo, no need for a changelog entry. :) --- changelog/5497.trivial.rst | 1 - 1 file changed, 1 deletion(-) delete mode 100644 changelog/5497.trivial.rst diff --git a/changelog/5497.trivial.rst b/changelog/5497.trivial.rst deleted file mode 100644 index 4cd2087bf..000000000 --- a/changelog/5497.trivial.rst +++ /dev/null @@ -1 +0,0 @@ -Fix typo replace ``circuting`` with circuiting.