diff options
| author | Daniel Hahler <git@thequod.de> | 2019-10-21 00:08:03 +0200 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2019-10-21 00:08:03 +0200 |
| commit | 803cc1f294782b7a7abe0c82fe100de95bb8cfb3 (patch) | |
| tree | 14880b1a867034f90f1b1dc7ce6dde57a2910668 /doc | |
| parent | fbb7f663be2fa88e689f2e5883ed59d01722f4be (diff) | |
| parent | 14142b911377d5354acf07ca1c9a7f11e9298b84 (diff) | |
| download | pytest-803cc1f294782b7a7abe0c82fe100de95bb8cfb3.tar.gz | |
Merge master into features
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/en/example/parametrize.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/en/example/parametrize.rst b/doc/en/example/parametrize.rst index 0b94e425c..1220cfb4d 100644 --- a/doc/en/example/parametrize.rst +++ b/doc/en/example/parametrize.rst @@ -678,4 +678,4 @@ Or, if desired, you can ``pip install contextlib2`` and use: .. code-block:: python - from contextlib2 import ExitStack as does_not_raise + from contextlib2 import nullcontext as does_not_raise |