Show More
@@ -121,6 +121,7 b' from IPython.utils import path as util_path' | |||
|
121 | 121 | from IPython.utils import py3compat |
|
122 | 122 | from IPython.utils.data import uniq_stable |
|
123 | 123 | from IPython.utils.terminal import get_terminal_size |
|
124 | ||
|
124 | 125 | from logging import info, error, debug |
|
125 | 126 | |
|
126 | 127 | import IPython.utils.colorable as colorable |
@@ -621,16 +622,6 b' class ListTB(TBTools):' | |||
|
621 | 622 | lines = ''.join(self._format_exception_only(etype, value)) |
|
622 | 623 | out_list.append(lines) |
|
623 | 624 | |
|
624 | # Note: this code originally read: | |
|
625 | ||
|
626 | ## for line in lines[:-1]: | |
|
627 | ## out_list.append(" "+line) | |
|
628 | ## out_list.append(lines[-1]) | |
|
629 | ||
|
630 | # This means it was indenting everything but the last line by a little | |
|
631 | # bit. I've disabled this for now, but if we see ugliness somewhere we | |
|
632 | # can restore it. | |
|
633 | ||
|
634 | 625 | return out_list |
|
635 | 626 | |
|
636 | 627 | def _format_list(self, extracted_list): |
@@ -841,13 +832,6 b' class VerboseTB(TBTools):' | |||
|
841 | 832 | Colors.vName, ColorsNormal) |
|
842 | 833 | tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal) |
|
843 | 834 | |
|
844 | tpl_line = '%s%%s%s %%s' % (Colors.lineno, ColorsNormal) | |
|
845 | tpl_line_em = '%s%%s%s %%s%s' % (Colors.linenoEm, Colors.line, | |
|
846 | ColorsNormal) | |
|
847 | ||
|
848 | abspath = os.path.abspath | |
|
849 | ||
|
850 | ||
|
851 | 835 | if not file: |
|
852 | 836 | file = '?' |
|
853 | 837 | elif file.startswith(str("<")) and file.endswith(str(">")): |
@@ -875,7 +859,7 b' class VerboseTB(TBTools):' | |||
|
875 | 859 | call = '' |
|
876 | 860 | else: |
|
877 | 861 | # Decide whether to include variable details or not |
|
878 |
var_repr = self.include_vars |
|
|
862 | var_repr = eqrepr if self.include_vars else nullrepr | |
|
879 | 863 | try: |
|
880 | 864 | call = tpl_call % (func, inspect.formatargvalues(args, |
|
881 | 865 | varargs, varkw, |
@@ -1041,7 +1025,6 b' class VerboseTB(TBTools):' | |||
|
1041 | 1025 | def format_exception(self, etype, evalue): |
|
1042 | 1026 | colors = self.Colors # just a shorthand + quicker name lookup |
|
1043 | 1027 | colorsnormal = colors.Normal # used a lot |
|
1044 | indent = ' ' * INDENT_SIZE | |
|
1045 | 1028 | # Get (safely) a string form of the exception info |
|
1046 | 1029 | try: |
|
1047 | 1030 | etype_str, evalue_str = map(str, (etype, evalue)) |
General Comments 0
You need to be logged in to leave comments.
Login now