##// END OF EJS Templates
Merge pull request #11128 from Carreau/non-callable-module...
Matthias Bussonnier -
r24359:c1e269ad merge
parent child Browse files
Show More
@@ -72,7 +72,7 b' In [4]: run simpleerr.py'
72 ---------------------------------------------------------------------------
72 ---------------------------------------------------------------------------
73 ZeroDivisionError Traceback (most recent call last)
73 ZeroDivisionError Traceback (most recent call last)
74 <BLANKLINE>
74 <BLANKLINE>
75 ... in <module>()
75 ... in <module>
76 30 mode = 'div'
76 30 mode = 'div'
77 31
77 31
78 ---> 32 bar(mode)
78 ---> 32 bar(mode)
@@ -104,7 +104,7 b' In [6]: run simpleerr.py'
104 ---------------------------------------------------------------------------
104 ---------------------------------------------------------------------------
105 ZeroDivisionError Traceback (most recent call last)
105 ZeroDivisionError Traceback (most recent call last)
106 <BLANKLINE>
106 <BLANKLINE>
107 ... in <module>()
107 ... in <module>
108 30 mode = 'div'
108 30 mode = 'div'
109 31
109 31
110 ---> 32 bar(mode)
110 ---> 32 bar(mode)
@@ -161,7 +161,7 b' In [22]: %tb'
161 ---------------------------------------------------------------------------
161 ---------------------------------------------------------------------------
162 SystemExit Traceback (most recent call last)
162 SystemExit Traceback (most recent call last)
163 <BLANKLINE>
163 <BLANKLINE>
164 ...<module>()
164 ...<module>
165 30 mode = 'div'
165 30 mode = 'div'
166 31
166 31
167 ---> 32 bar(mode)
167 ---> 32 bar(mode)
@@ -189,7 +189,7 b' In [24]: %tb'
189 ---------------------------------------------------------------------------
189 ---------------------------------------------------------------------------
190 SystemExit Traceback (most recent call last)
190 SystemExit Traceback (most recent call last)
191 <BLANKLINE>
191 <BLANKLINE>
192 ... in <module>()
192 ... in <module>
193 30 mode = 'div'
193 30 mode = 'div'
194 31
194 31
195 ---> 32 bar(mode)
195 ---> 32 bar(mode)
@@ -872,6 +872,8 b' class VerboseTB(TBTools):'
872
872
873 if func == '?':
873 if func == '?':
874 call = ''
874 call = ''
875 elif func == '<module>':
876 call = tpl_call % (func, '')
875 else:
877 else:
876 # Decide whether to include variable details or not
878 # Decide whether to include variable details or not
877 var_repr = eqrepr if self.include_vars else nullrepr
879 var_repr = eqrepr if self.include_vars else nullrepr
@@ -236,7 +236,7 b' class IPythonConsoleLexer(Lexer):'
236
236
237 ---------------------------------------------------------------------------
237 ---------------------------------------------------------------------------
238 Exception Traceback (most recent call last)
238 Exception Traceback (most recent call last)
239 <ipython-input-1-fca2ab0ca76b> in <module>()
239 <ipython-input-1-fca2ab0ca76b> in <module>
240 ----> 1 raise Exception
240 ----> 1 raise Exception
241
241
242 Exception:
242 Exception:
@@ -765,7 +765,7 b' context line to show. This allows to a many line of context on shallow stack tra'
765 In[6]: foo(1)
765 In[6]: foo(1)
766 # ...
766 # ...
767 ipdb> where 8
767 ipdb> where 8
768 <ipython-input-6-9e45007b2b59>(1)<module>()
768 <ipython-input-6-9e45007b2b59>(1)<module>
769 ----> 1 foo(1)
769 ----> 1 foo(1)
770
770
771 <ipython-input-5-7baadc3d1465>(5)foo()
771 <ipython-input-5-7baadc3d1465>(5)foo()
@@ -794,7 +794,7 b' And less context on shallower Stack Trace:'
794 .. code::
794 .. code::
795
795
796 ipdb> where 1
796 ipdb> where 1
797 <ipython-input-13-afa180a57233>(1)<module>()
797 <ipython-input-13-afa180a57233>(1)<module>
798 ----> 1 foo(7)
798 ----> 1 foo(7)
799
799
800 <ipython-input-5-7baadc3d1465>(5)foo()
800 <ipython-input-5-7baadc3d1465>(5)foo()
General Comments 0
You need to be logged in to leave comments. Login now