mirror of
https://github.com/python/cpython.git
synced 2026-01-06 15:32:22 +00:00
Get doctest to pass. The problem was int/int -> float now. There
were some cases where an int was assumed. Also had to change the string of the exception when dividing and int by zero. Not sure what the best error message should be. Currently 5 / 0 yields the message: ZeroDivisionError: float division That isn't entirely correct. But I'm not sure what else to do.
This commit is contained in:
parent
57c179c5b9
commit
914a81841f
1 changed files with 11 additions and 11 deletions
|
|
@ -605,7 +605,7 @@ def test_DocTestFinder(): r"""
|
|||
... ... print x,
|
||||
... 0 1 2 3 4 5 6 7 8 9
|
||||
... >>> x/2
|
||||
... 6
|
||||
... 6.0
|
||||
... '''
|
||||
>>> test = doctest.DocTestFinder().find(f)[0]
|
||||
>>> [e.lineno for e in test.examples]
|
||||
|
|
@ -680,7 +680,7 @@ def basics(): r"""
|
|||
... >>> print x
|
||||
... 12
|
||||
... >>> x/2
|
||||
... 6
|
||||
... 6.0
|
||||
... '''
|
||||
>>> test = doctest.DocTestFinder().find(f)[0]
|
||||
|
||||
|
|
@ -701,7 +701,7 @@ def basics(): r"""
|
|||
... >>> print x
|
||||
... 14
|
||||
... >>> x/2
|
||||
... 6
|
||||
... 6.0
|
||||
... '''
|
||||
>>> test = doctest.DocTestFinder().find(f)[0]
|
||||
>>> doctest.DocTestRunner(verbose=True).run(test)
|
||||
|
|
@ -725,7 +725,7 @@ def basics(): r"""
|
|||
Trying:
|
||||
x/2
|
||||
Expecting:
|
||||
6
|
||||
6.0
|
||||
ok
|
||||
(1, 3)
|
||||
"""
|
||||
|
|
@ -739,7 +739,7 @@ def verbose_flag(): r"""
|
|||
... >>> print x
|
||||
... 12
|
||||
... >>> x/2
|
||||
... 6
|
||||
... 6.0
|
||||
... '''
|
||||
>>> test = doctest.DocTestFinder().find(f)[0]
|
||||
|
||||
|
|
@ -756,7 +756,7 @@ def verbose_flag(): r"""
|
|||
Trying:
|
||||
x/2
|
||||
Expecting:
|
||||
6
|
||||
6.0
|
||||
ok
|
||||
(0, 3)
|
||||
|
||||
|
|
@ -786,7 +786,7 @@ def verbose_flag(): r"""
|
|||
Trying:
|
||||
x/2
|
||||
Expecting:
|
||||
6
|
||||
6.0
|
||||
ok
|
||||
(0, 3)
|
||||
|
||||
|
|
@ -808,7 +808,7 @@ def exceptions(): r"""
|
|||
... >>> x = 12
|
||||
... >>> print x/0
|
||||
... Traceback (most recent call last):
|
||||
... ZeroDivisionError: integer division or modulo by zero
|
||||
... ZeroDivisionError: float division
|
||||
... '''
|
||||
>>> test = doctest.DocTestFinder().find(f)[0]
|
||||
>>> doctest.DocTestRunner(verbose=False).run(test)
|
||||
|
|
@ -825,7 +825,7 @@ def exceptions(): r"""
|
|||
... >>> print 'pre-exception output', x/0
|
||||
... pre-exception output
|
||||
... Traceback (most recent call last):
|
||||
... ZeroDivisionError: integer division or modulo by zero
|
||||
... ZeroDivisionError: float division
|
||||
... '''
|
||||
>>> test = doctest.DocTestFinder().find(f)[0]
|
||||
>>> doctest.DocTestRunner(verbose=False).run(test)
|
||||
|
|
@ -836,7 +836,7 @@ def exceptions(): r"""
|
|||
print 'pre-exception output', x/0
|
||||
Exception raised:
|
||||
...
|
||||
ZeroDivisionError: integer division or modulo by zero
|
||||
ZeroDivisionError: float division
|
||||
(1, 2)
|
||||
|
||||
Exception messages may contain newlines:
|
||||
|
|
@ -933,7 +933,7 @@ def exceptions(): r"""
|
|||
Exception raised:
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
ZeroDivisionError: integer division or modulo by zero
|
||||
ZeroDivisionError: float division
|
||||
(1, 1)
|
||||
"""
|
||||
def optionflags(): r"""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue