Show More
@@ -439,21 +439,31 b' class ListTB(TBTools):' | |||||
439 | Colors = self.Colors |
|
439 | Colors = self.Colors | |
440 | list = [] |
|
440 | list = [] | |
441 | for filename, lineno, name, line in extracted_list[:-1]: |
|
441 | for filename, lineno, name, line in extracted_list[:-1]: | |
442 |
item = |
|
442 | item = " %s, line %s%d%s, in %s%s%s\n" % ( | |
443 |
|
|
443 | _format_filename(filename, Colors, Colors.normalEm), | |
444 |
|
|
444 | Colors.lineno, | |
445 | Colors.name, name, Colors.Normal) |
|
445 | lineno, | |
|
446 | Colors.Normal, | |||
|
447 | Colors.name, | |||
|
448 | name, | |||
|
449 | Colors.Normal, | |||
|
450 | ) | |||
446 | if line: |
|
451 | if line: | |
447 | item += ' %s\n' % line.strip() |
|
452 | item += ' %s\n' % line.strip() | |
448 | list.append(item) |
|
453 | list.append(item) | |
449 | # Emphasize the last entry |
|
454 | # Emphasize the last entry | |
450 | filename, lineno, name, line = extracted_list[-1] |
|
455 | filename, lineno, name, line = extracted_list[-1] | |
451 |
item = |
|
456 | item = "%s %s, line %s%d%s, in %s%s%s%s\n" % ( | |
452 |
|
|
457 | Colors.normalEm, | |
453 |
|
|
458 | _format_filename(filename, Colors, Colors.normalEm), | |
454 |
|
|
459 | Colors.linenoEm, | |
455 | Colors.nameEm, name, Colors.normalEm, |
|
460 | lineno, | |
456 |
|
|
461 | Colors.normalEm, | |
|
462 | Colors.nameEm, | |||
|
463 | name, | |||
|
464 | Colors.normalEm, | |||
|
465 | Colors.Normal, | |||
|
466 | ) | |||
457 | if line: |
|
467 | if line: | |
458 | item += '%s %s%s\n' % (Colors.line, line.strip(), |
|
468 | item += '%s %s%s\n' % (Colors.line, line.strip(), | |
459 | Colors.Normal) |
|
469 | Colors.Normal) | |
@@ -488,14 +498,19 b' class ListTB(TBTools):' | |||||
488 | lineno = value.lineno |
|
498 | lineno = value.lineno | |
489 | textline = linecache.getline(value.filename, value.lineno) |
|
499 | textline = linecache.getline(value.filename, value.lineno) | |
490 | else: |
|
500 | else: | |
491 |
lineno = |
|
501 | lineno = "unknown" | |
492 |
textline = |
|
502 | textline = "" | |
493 |
list.append( |
|
503 | list.append( | |
494 | (Colors.normalEm, |
|
504 | "%s %s, line %s%s%s\n" | |
495 | _format_filename(value.filename, Colors, Colors.normalEm), |
|
505 | % ( | |
496 |
|
|
506 | Colors.normalEm, | |
497 | )) |
|
507 | _format_filename(value.filename, Colors, Colors.normalEm), | |
498 | if textline == '': |
|
508 | Colors.linenoEm, | |
|
509 | lineno, | |||
|
510 | Colors.Normal, | |||
|
511 | ) | |||
|
512 | ) | |||
|
513 | if textline == "": | |||
499 | textline = py3compat.cast_unicode(value.text, "utf-8") |
|
514 | textline = py3compat.cast_unicode(value.text, "utf-8") | |
500 |
|
515 | |||
501 | if textline is not None: |
|
516 | if textline is not None: | |
@@ -659,7 +674,7 b' class VerboseTB(TBTools):' | |||||
659 | if lvals_list: |
|
674 | if lvals_list: | |
660 | lvals = '%s%s' % (indent, em_normal.join(lvals_list)) |
|
675 | lvals = '%s%s' % (indent, em_normal.join(lvals_list)) | |
661 |
|
676 | |||
662 |
result = |
|
677 | result = "%s, %s\n" % (link, call) | |
663 |
|
678 | |||
664 | result += ''.join(_format_traceback_lines(frame_info.lines, Colors, self.has_colors, lvals)) |
|
679 | result += ''.join(_format_traceback_lines(frame_info.lines, Colors, self.has_colors, lvals)) | |
665 | return result |
|
680 | return result |
General Comments 0
You need to be logged in to leave comments.
Login now