Update doctests. Use repr when showing variables

IPython/core/tests/test_iplib.py

@@ -65,8 +65,8 b' In [4]: run simpleerr.py'
 ZeroDivisionError                         Traceback (most recent call last)
 <BLANKLINE>
 ... in <module>
+     29     except IndexError:
      30         mode = 'div'
-     31 
 ---> 32     bar(mode)
 <BLANKLINE>
 ... in bar(mode)
@@ -80,8 +80,6 b' ZeroDivisionError Traceback (most recent call last)'
       6     x = 1
       7     y = 0
 ----> 8     x/y
-      9 
-     10 def sysexit(stat, mode):
 <BLANKLINE>
 ZeroDivisionError: ...
 """
@@ -97,17 +95,15 b' In [6]: run simpleerr.py'
 ZeroDivisionError                         Traceback (most recent call last)
 <BLANKLINE>
 ... in <module>
+     29     except IndexError:
      30         mode = 'div'
-     31 
 ---> 32     bar(mode)
-        global bar = <function bar at ...>
-        global mode = 'div'
+        mode = 'div'
 <BLANKLINE>
 ... in bar(mode='div')
      14     "bar"
      15     if mode=='div':
 ---> 16         div0()
-        global div0 = <function div0 at ...>
      17     elif mode=='exit':
      18         try:
 <BLANKLINE>
@@ -117,8 +113,6 b' ZeroDivisionError Traceback (most recent call last)'
 ----> 8     x/y
         x = 1
         y = 0
-      9 
-     10 def sysexit(stat, mode):
 <BLANKLINE>
 ZeroDivisionError: ...
       """
@@ -154,8 +148,8 b' In [22]: %tb'
 SystemExit                                Traceback (most recent call last)
 <BLANKLINE>
 ...<module>
+     29     except IndexError:
      30         mode = 'div'
-     31 
 ---> 32     bar(mode)
 <BLANKLINE>
 ...bar(mode)
@@ -166,11 +160,8 b' SystemExit Traceback (most recent call last)'
      24         raise ValueError('Unknown mode')
 <BLANKLINE>
 ...sysexit(stat, mode)
-      9 
      10 def sysexit(stat, mode):
 ---> 11     raise SystemExit(stat, 'Mode = %s' % mode)
-     12 
-     13 def bar(mode):
 <BLANKLINE>
 SystemExit: (2, 'Mode = exit')
 

IPython/core/ultratb.py

@@ -646,7 +646,7 b' class VerboseTB(TBTools):'
         lvals_list = []
         if self.include_vars:
             for var in frame_info.variables_in_executing_piece:
-                lvals_list.append(tpl_name_val % (var.name, var.value))
+                lvals_list.append(tpl_name_val % (var.name, repr(var.value)))
         if lvals_list:
             lvals = '%s%s' % (indent, em_normal.join(lvals_list))