mirror of
https://github.com/python/cpython
synced 2024-07-21 10:15:53 +00:00
Fixed a small bug. doctest didn't handle unicode docstrings containing
non-ascii characters.
This commit is contained in:
parent
73cc8479f0
commit
7d428788e1
|
@ -962,7 +962,9 @@ def _get_test(self, obj, name, module, globs, source_lines):
|
|||
if obj.__doc__ is None:
|
||||
docstring = ''
|
||||
else:
|
||||
docstring = str(obj.__doc__)
|
||||
docstring = obj.__doc__
|
||||
if not isinstance(docstring, basestring):
|
||||
docstring = str(docstring)
|
||||
except (TypeError, AttributeError):
|
||||
docstring = ''
|
||||
|
||||
|
|
|
@ -1,17 +1,31 @@
|
|||
"""A module to test whether doctest recognizes some 2.2 features,
|
||||
# -*- coding: utf-8 -*-
|
||||
u"""A module to test whether doctest recognizes some 2.2 features,
|
||||
like static and class methods.
|
||||
|
||||
>>> print 'yup' # 1
|
||||
yup
|
||||
|
||||
We include some (random) encoded (utf-8) text in the text surrounding
|
||||
the example. It should be ignored:
|
||||
|
||||
ЉЊЈЁЂ
|
||||
|
||||
"""
|
||||
|
||||
from test import test_support
|
||||
|
||||
class C(object):
|
||||
"""Class C.
|
||||
u"""Class C.
|
||||
|
||||
>>> print C() # 2
|
||||
42
|
||||
|
||||
|
||||
We include some (random) encoded (utf-8) text in the text surrounding
|
||||
the example. It should be ignored:
|
||||
|
||||
ЉЊЈЁЂ
|
||||
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
|
|
|
@ -5,3 +5,10 @@ In this example, we'll rely on some silly setup:
|
|||
>>> import test.test_doctest
|
||||
>>> test.test_doctest.sillySetup
|
||||
True
|
||||
|
||||
This test also has some (random) encoded (utf-8) unicode text:
|
||||
|
||||
ÐÐÐÐÐ
|
||||
|
||||
This doesn't cause a problem in the tect surrounding the examples, but
|
||||
we include it here (in this test text file) to make sure. :)
|
||||
|
|
Loading…
Reference in a new issue