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
12 changes: 6 additions & 6 deletions testing/test_doctest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ def test_encoding_ascii(self, testdir):
def test_encoding_latin1(self, testdir):
"""Test support for --doctest-encoding option.
"""
testdir._makefile(".txt", ["""
>>> 'üäö'
'üäö'
testdir._makefile(".txt", [u"""
>>> len(u'üäö')
3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i propose making those a format string adding u in front of it for py2, and leaving it out for py3
that way the output can be tested

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In Python 2, they will be formatted as escape sequences: u'\x84\x94\x81'. Probably I can just repr(value) to the files.

"""], {}, encoding='latin1')

result = testdir.runpytest("--doctest-encoding=latin1")
Expand All @@ -160,9 +160,9 @@ def test_encoding_latin1(self, testdir):
def test_encoding_utf8(self, testdir):
"""Test support for --doctest-encoding option.
"""
testdir.maketxtfile("""
>>> 'üäö'
'üäö'
testdir.maketxtfile(u"""
>>> len(u'üäö')
3
""")

result = testdir.runpytest()
Expand Down