Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added doctest encoding command line option #2101

Merged
merged 8 commits into from
Nov 30, 2016
Merged

Added doctest encoding command line option #2101

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ed97751
Added a console option to specify the encoding to use for doctest fil…
Nov 29, 2016
d254c6b
Added some tests for --docstring-encoding option. Added option to spe…
Nov 29, 2016
929912d
Changed the tests to pass on python 2 as well.
Nov 29, 2016
c043bbb
Changed the doctest_encoding option to an ini option.
Nov 30, 2016
1f62e5b
Added CHANGELOG entry and myself to AUTHORS.
Nov 30, 2016
b7fb9fa
Fixed the documentation for doctest_encoding.
Nov 30, 2016
f8fef07
Fixed the tests for python 2.6
Nov 30, 2016
2edfc80
Added "versionadded" for doctest_encoding ini option to docs.
wheerd Nov 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Added "versionadded" for doctest_encoding ini option to docs.
  • Loading branch information
@wheerd
wheerd committed Nov 30, 2016
commit 2edfc805afefbbabdeccdb9b4e9fd6ab89335008
16 changes: 9 additions & 7 deletions doc/en/doctest.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@ can change the pattern by issuing::
on the command line. Since version ``2.9``, ``--doctest-glob``
can be given multiple times in the command-line.

You can specify the encoding that will be used for those doctest files
using the ``doctest_encoding`` ini option:
.. versionadded:: 3.1

.. code-block:: ini
You can specify the encoding that will be used for those doctest files
using the ``doctest_encoding`` ini option:

# content of pytest.ini
[pytest]
doctest_encoding = latin1
.. code-block:: ini

# content of pytest.ini
[pytest]
doctest_encoding = latin1

The default encoding is UTF-8.
The default encoding is UTF-8.

You can also trigger running of doctests
from docstrings in all python modules (including regular
Expand Down