mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 00:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Rolled back revisions 71237 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk
This commit is contained in:
Hirokazu Yamamoto 2009-04-07 14:33:53 +00:00
parent cfbb18f149
commit 32b18cc2cf
2 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/traceback.py
View file

@ -64,7 +64,7 @@ def print_tb(tb, limit=None, file=None):
filename = co.co_filename
name = co.co_name
_print(file,
' File "%s", line %d, in %s' % (filename, lineno, name))
' File "%s", line %d, in %s' % (filename,lineno,name))
linecache.checkcache(filename)
line = linecache.getline(filename, lineno, f.f_globals)
if line: _print(file, ' ' + line.strip())
@ -124,8 +124,9 @@ def print_exception(etype, value, tb, limit=None, file=None):
_print(file, 'Traceback (most recent call last):')
print_tb(tb, limit, file)
lines = format_exception_only(etype, value)
for line in lines:
_print(file, line, '')
for line in lines[:-1]:
_print(file, line, ' ')
_print(file, lines[-1], '')
def format_exception(etype, value, tb, limit = None):
"""Format a stack trace and the exception information.
@ -194,7 +195,7 @@ def format_exception_only(etype, value):
caretspace = ((c.isspace() and c or ' ') for c in caretspace)
# only three spaces to account for offset1 == pos 0
lines.append(' %s^\n' % ''.join(caretspace))
value = msg
value = msg
lines.append(_format_final_exc_line(stype, value))
return lines