traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert r83267, as it breaks a few doctests and generally leads to ugly truncated output.

This commit is contained in:
Georg Brandl 2010-07-30 14:14:42 +00:00
parent 19746cb322
commit 3e67c5c52e
2 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/pdb.py
View File

@ -237,7 +237,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
if type(t) == type(''): if type(t) == type(''):
exc_type_name = t exc_type_name = t
else: exc_type_name = t.__name__ else: exc_type_name = t.__name__
print >>self.stdout, '***', exc_type_name + ':', _saferepr(v) print >>self.stdout, '***', exc_type_name + ':', v
def precmd(self, line): def precmd(self, line):
"""Handle alias expansion and ';;' separator.""" """Handle alias expansion and ';;' separator."""
@ -753,7 +753,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
if isinstance(t, str): if isinstance(t, str):
exc_type_name = t exc_type_name = t
else: exc_type_name = t.__name__ else: exc_type_name = t.__name__
print >>self.stdout, '***', exc_type_name + ':', _saferepr(v) print >>self.stdout, '***', exc_type_name + ':', repr(v)
raise raise
def do_p(self, arg): def do_p(self, arg):

27
Lib/test/test_pdb.py
View File

@ -126,33 +126,6 @@ def test_pdb_skip_modules_with_callback():
""" """
def test_pdb_unicode_exception():
r"""This tests exceptions that cannot be displayed due to Unicode issues.
http://bugs.python.org/issue7539
>>> def test_function():
... import pdb; pdb.Pdb().set_trace()
... pass
>>> def raising_function():
... raise ValueError(u"\xff")
>>> with PdbTestInput([
... 'raising_function()',
... 'p raising_function()',
... 'continue',
... ]):
... test_function()
> <doctest test.test_pdb.test_pdb_unicode_exception[0]>(3)test_function()
-> pass
(Pdb) raising_function()
*** ValueError: ValueError(u'\xff',)
(Pdb) p raising_function()
*** ValueError: ValueError(u'\xff',)
(Pdb) continue
"""
def test_main(): def test_main():
from test import test_pdb from test import test_pdb
test_support.run_doctest(test_pdb, verbosity=True) test_support.run_doctest(test_pdb, verbosity=True)