From 3e67c5c52e644876d741b6cec4e36953a7ef3c21 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 30 Jul 2010 14:14:42 +0000 Subject: [PATCH] Revert r83267, as it breaks a few doctests and generally leads to ugly truncated output. --- Lib/pdb.py | 4 ++-- Lib/test/test_pdb.py | 27 --------------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/Lib/pdb.py b/Lib/pdb.py index 79a36a631d1..0751c17667d 100755 --- a/Lib/pdb.py +++ b/Lib/pdb.py @@ -237,7 +237,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): if type(t) == type(''): exc_type_name = t 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): """Handle alias expansion and ';;' separator.""" @@ -753,7 +753,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): if isinstance(t, str): exc_type_name = t else: exc_type_name = t.__name__ - print >>self.stdout, '***', exc_type_name + ':', _saferepr(v) + print >>self.stdout, '***', exc_type_name + ':', repr(v) raise def do_p(self, arg): diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index 0ef525ee1cd..ce64d171a45 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -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() - > (3)test_function() - -> pass - (Pdb) raising_function() - *** ValueError: ValueError(u'\xff',) - (Pdb) p raising_function() - *** ValueError: ValueError(u'\xff',) - (Pdb) continue - """ - - def test_main(): from test import test_pdb test_support.run_doctest(test_pdb, verbosity=True)