##// END OF EJS Templates
Fix a bug in renaming notebook...
Fix a bug in renaming notebook There was a bug in NotebookManager.save_notebook_object. Here is how to reproduce: 0. Make sure you don't have Untitled0. 1. Open new notebook Untitled0. 2. Rename it to something else. 3. Copy Untitled0.ipynb to the notebook dir from somewhere. (Do not use notebook UI.) 4. New copied Untitled0 cannot be opened. The renamed notebook is opened when tried. Indeed, accessing to http://localhost:XXXX/notebooks shows duplicated notebook_id. The problem was that NotebookManager.rev_mapping keeps old notebook name after renaming.

File last commit:

r6742:9f6601dc
r7359:ef719b62
Show More
ultratb.py
1244 lines | 49.0 KiB | text/x-python | PythonLexer
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # -*- coding: utf-8 -*-
"""
Brian Granger
Merging -r 1177 from lp:ipython with fixes and resolutions....
r2124 ultratb.py -- Spice up your tracebacks!
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
* ColorTB
I've always found it a bit hard to visually parse tracebacks in Python. The
ColorTB class is a solution to that problem. It colors the different parts of a
traceback in a manner similar to what you would expect from a syntax-highlighting
text editor.
Installation instructions for ColorTB:
Brian Granger
Merging -r 1177 from lp:ipython with fixes and resolutions....
r2124 import sys,ultratb
sys.excepthook = ultratb.ColorTB()
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
Bernardo B. Marques
remove all trailling spaces
r4872 * VerboseTB
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 I've also included a port of Ka-Ping Yee's "cgitb.py" that produces all kinds
of useful info when a traceback occurs. Ping originally had it spit out HTML
and intended it for CGI programmers, but why should they have all the fun? I
altered it to spit out colored text to the terminal. It's a bit overwhelming,
but kind of neat, and maybe useful for long-running programs that you believe
are bug-free. If a crash *does* occur in that type of program you want details.
Give it a shot--you'll love it or you'll hate it.
Note:
The Verbose mode prints the variables currently visible where the exception
happened (shortening their strings if too long). This can potentially be
very slow, if you happen to have a huge data structure whose string
representation is complex to compute. Your computer may appear to freeze for
a while with cpu usage at 100%. If this occurs, you can cancel the traceback
with Ctrl-C (maybe hitting it more than once).
If you encounter this kind of situation often, you may want to use the
Verbose_novars mode instead of the regular Verbose, which avoids formatting
variables (but otherwise includes the information and context given by
Verbose).
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
Installation instructions for ColorTB:
Brian Granger
Merging -r 1177 from lp:ipython with fixes and resolutions....
r2124 import sys,ultratb
sys.excepthook = ultratb.VerboseTB()
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
Note: Much of the code in this module was lifted verbatim from the standard
library module 'traceback.py' and Ka-Ping Yee's 'cgitb.py'.
* Color schemes
The colors are defined in the class TBTools through the use of the
ColorSchemeTable class. Currently the following exist:
- NoColor: allows all of this module to be used in any terminal (the color
escapes are just dummy blank strings).
- Linux: is meant to look good in a terminal like the Linux console (black
or very dark background).
- LightBG: similar to Linux but swaps dark/light colors to be more readable
in light background terminals.
You can implement other color schemes easily, the syntax is fairly
self-explanatory. Please send back new schemes you develop to the author for
possible inclusion in future releases.
Fernando Perez
Remove svn-style $Id marks from docstrings and Release imports....
r1853 """
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
#*****************************************************************************
# Copyright (C) 2001 Nathaniel Gray <n8gray@caltech.edu>
# Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu>
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#*****************************************************************************
Brian Granger
sys.displayhook is now managed dynamically by display_trap.
r2231 from __future__ import with_statement
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 import inspect
import keyword
import linecache
import os
import pydoc
import re
import sys
import time
import tokenize
import traceback
import types
Thomas Kluyver
Fixes for UltraTB and PyColorize with Python 3
r4758 try: # Python 2
generate_tokens = tokenize.generate_tokens
except AttributeError: # Python 3
generate_tokens = tokenize.tokenize
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # For purposes of monkeypatching inspect to fix a bug in it.
from inspect import getsourcefile, getfile, getmodule,\
Brian Granger
sys.displayhook is now managed dynamically by display_trap.
r2231 ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
# IPython's own modules
# Modified pdb which doesn't damage IPython's readline handling
Brian Granger
Merging -r 1177 from lp:ipython with fixes and resolutions....
r2124 from IPython.core import debugger, ipapi
Brian Granger
sys.displayhook is now managed dynamically by display_trap.
r2231 from IPython.core.display_trap import DisplayTrap
Brian Granger
excolors.py => core/excolors.py and updated import statements.
r2021 from IPython.core.excolors import exception_colors
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 from IPython.utils import PyColorize
from IPython.utils import io
Thomas Kluyver
Fixes for UltraTB and PyColorize with Python 3
r4758 from IPython.utils import py3compat
Thomas Kluyver
Find .py files for verbose tracebacks, rather than trying to tokenize .pyc files.
r5851 from IPython.utils import pyfile
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 from IPython.utils.data import uniq_stable
from IPython.utils.warn import info, error
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
# Globals
# amount of space to put line numbers before verbose tracebacks
INDENT_SIZE = 8
# Default color scheme. This is used, for example, by the traceback
# formatter. When running in an actual IPython instance, the user's rc.colors
# value is used, but havinga module global makes this functionality available
Brian Granger
Merging -r 1177 from lp:ipython with fixes and resolutions....
r2124 # to users of ultratb who are NOT running inside ipython.
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 DEFAULT_SCHEME = 'NoColor'
#---------------------------------------------------------------------------
# Code begins
# Utility functions
def inspect_error():
"""Print a message about internal inspect errors.
These are unfortunately quite common."""
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 error('Internal Python error in the inspect module.\n'
'Below is the traceback from this internal error.\n')
Thomas Kluyver
Disable monkeypatch to inspect.findsource(), leaving explanation.
r5850 # N.B. This function is a monkeypatch we are currently not applying.
# It was written some time ago, to fix an apparent Python bug with
# codeobj.co_firstlineno . Unfortunately, we don't know under what conditions
# the bug occurred, so we can't tell if it has been fixed. If it reappears, we
# will apply the monkeypatch again. Also, note that findsource() is not called
# by our code at this time - we don't know if it was when the monkeypatch was
# written, or if the monkeypatch is needed for some other code (like a debugger).
# For the discussion about not applying it, see gh-1229. TK, Jan 2011.
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 def findsource(object):
"""Return the entire source file and starting line number for an object.
The argument may be a module, class, method, function, traceback, frame,
or code object. The source code is returned as a list of all the lines
in the file and the line number indexes a line in that list. An IOError
is raised if the source code cannot be retrieved.
FIXED version with which we monkeypatch the stdlib to work around a bug."""
file = getsourcefile(object) or getfile(object)
# If the object is a frame, then trying to get the globals dict from its
# module won't work. Instead, the frame object itself has the globals
# dictionary.
globals_dict = None
if inspect.isframe(object):
# XXX: can this ever be false?
globals_dict = object.f_globals
else:
module = getmodule(object, file)
if module:
globals_dict = module.__dict__
lines = linecache.getlines(file, globals_dict)
if not lines:
raise IOError('could not get source code')
if ismodule(object):
return lines, 0
if isclass(object):
name = object.__name__
pat = re.compile(r'^(\s*)class\s*' + name + r'\b')
# make some effort to find the best matching class definition:
# use the one with the least indentation, which is the one
# that's most probably not inside a function definition.
candidates = []
for i in range(len(lines)):
match = pat.match(lines[i])
if match:
# if it's at toplevel, it's already the best one
if lines[i][0] == 'c':
return lines, i
# else add whitespace to candidate list
candidates.append((match.group(1), i))
if candidates:
# this will sort by whitespace, and by line number,
# less whitespace first
candidates.sort()
return lines, candidates[0][1]
else:
raise IOError('could not find class definition')
if ismethod(object):
object = object.im_func
if isfunction(object):
object = object.func_code
if istraceback(object):
object = object.tb_frame
if isframe(object):
object = object.f_code
if iscode(object):
if not hasattr(object, 'co_firstlineno'):
raise IOError('could not find function definition')
pat = re.compile(r'^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)')
pmatch = pat.match
# fperez - fix: sometimes, co_firstlineno can give a number larger than
# the length of lines, which causes an error. Safeguard against that.
lnum = min(object.co_firstlineno,len(lines))-1
while lnum > 0:
if pmatch(lines[lnum]): break
lnum -= 1
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 return lines, lnum
raise IOError('could not find code object')
Thomas Kluyver
Disable monkeypatch to inspect.findsource(), leaving explanation.
r5850 # Not applying the monkeypatch - see above the function for details. TK, Jan 2012
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # Monkeypatch inspect to apply our bugfix. This code only works with py25
Thomas Kluyver
Disable monkeypatch to inspect.findsource(), leaving explanation.
r5850 #if sys.version_info[:2] >= (2,5):
# inspect.findsource = findsource
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
def fix_frame_records_filenames(records):
"""Try to fix the filenames in each record from inspect.getinnerframes().
Particularly, modules loaded from within zip files have useless filenames
attached to their code object, and inspect.getinnerframes() just uses it.
"""
fixed_records = []
for frame, filename, line_no, func_name, lines, index in records:
# Look inside the frame's globals dictionary for __file__, which should
# be better.
better_fn = frame.f_globals.get('__file__', None)
if isinstance(better_fn, str):
# Check the type just in case someone did something weird with
# __file__. It might also be None if the error occurred during
# import.
filename = better_fn
fixed_records.append((frame, filename, line_no, func_name, lines, index))
return fixed_records
def _fixed_getinnerframes(etb, context=1,tb_offset=0):
import linecache
LNUM_POS, LINES_POS, INDEX_POS = 2, 4, 5
records = fix_frame_records_filenames(inspect.getinnerframes(etb, context))
# If the error is at the console, don't build any context, since it would
# otherwise produce 5 blank lines printed out (there is no file at the
# console)
rec_check = records[tb_offset:]
try:
rname = rec_check[0][1]
if rname == '<ipython console>' or rname.endswith('<string>'):
return rec_check
except IndexError:
pass
aux = traceback.extract_tb(etb)
assert len(records) == len(aux)
for i, (file, lnum, _, _) in zip(range(len(records)), aux):
maybeStart = lnum-1 - context//2
start = max(maybeStart, 0)
end = start + context
lines = linecache.getlines(file)[start:end]
buf = list(records[i])
buf[LNUM_POS] = lnum
buf[INDEX_POS] = lnum - 1 - start
buf[LINES_POS] = lines
records[i] = tuple(buf)
return records[tb_offset:]
# Helper function -- largely belongs to VerboseTB, but we need the same
# functionality to produce a pseudo verbose TB for SyntaxErrors, so that they
# can be recognized properly by ipython.el's py-traceback-line-re
# (SyntaxErrors have to be treated specially because they have no traceback)
_parser = PyColorize.Parser()
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
A few small fixes so ipythonx works, and PEP-8 cleanups I found along the way.
r2400 def _format_traceback_lines(lnum, index, lines, Colors, lvals=None,scheme=None):
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 numbers_width = INDENT_SIZE - 1
res = []
i = lnum - index
# This lets us get fully syntax-highlighted tracebacks.
if scheme is None:
Brian Granger
Merging -r 1177 from lp:ipython with fixes and resolutions....
r2124 ipinst = ipapi.get()
if ipinst is not None:
Brian Granger
Continuing a massive refactor of everything.
r2205 scheme = ipinst.colors
Brian Granger
Merging -r 1177 from lp:ipython with fixes and resolutions....
r2124 else:
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 scheme = DEFAULT_SCHEME
Brian Granger
Merging -r 1177 from lp:ipython with fixes and resolutions....
r2124
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 _line_format = _parser.format2
for line in lines:
Fernando Perez
Complete implementation of interactive traceback support....
r3175 # FIXME: we need to ensure the source is a pure string at this point,
# else the coloring code makes a royal mess. This is in need of a
# serious refactoring, so that all of the ultratb and PyColorize code
# is unicode-safe. So for now this is rather an ugly hack, but
# necessary to at least have readable tracebacks. Improvements welcome!
Thomas Kluyver
Fixes for UltraTB and PyColorize with Python 3
r4758 line = py3compat.cast_bytes_py2(line, 'utf-8')
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Complete implementation of interactive traceback support....
r3175 new_line, err = _line_format(line, 'str', scheme)
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if not err: line = new_line
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if i == lnum:
# This is the line with the error
pad = numbers_width - len(str(i))
if pad >= 3:
marker = '-'*(pad-3) + '-> '
elif pad == 2:
marker = '> '
elif pad == 1:
marker = '>'
else:
marker = ''
num = marker + str(i)
Bernardo B. Marques
remove all trailling spaces
r4872 line = '%s%s%s %s%s' %(Colors.linenoEm, num,
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 Colors.line, line, Colors.Normal)
else:
num = '%*s' % (numbers_width,i)
Bernardo B. Marques
remove all trailling spaces
r4872 line = '%s%s%s %s' %(Colors.lineno, num,
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 Colors.Normal, line)
res.append(line)
if lvals and i == lnum:
res.append(lvals + '\n')
i = i + 1
return res
#---------------------------------------------------------------------------
# Module classes
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 class TBTools(object):
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 """Basic tools used by all traceback printer classes."""
Fernando Perez
Fix exception color problems in win32....
r2459
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 # Number of frames to skip when reporting tracebacks
tb_offset = 0
Fernando Perez
Simplified output stream management in ultratb....
r2852 def __init__(self, color_scheme='NoColor', call_pdb=False, ostream=None):
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # Whether to call the interactive pdb debugger after printing
# tracebacks or not
self.call_pdb = call_pdb
Fernando Perez
Simplified output stream management in ultratb....
r2852 # Output stream to write to. Note that we store the original value in
# a private attribute and then make the public ostream a property, so
MinRK
io.Term.cin/out/err replaced by io.stdin/out/err...
r3800 # that we can delay accessing io.stdout until runtime. The way
# things are written now, the io.stdout object is dynamically managed
Fernando Perez
Simplified output stream management in ultratb....
r2852 # so a reference to it should NEVER be stored statically. This
# property approach confines this detail to a single location, and all
# subclasses can simply access self.ostream for writing.
self._ostream = ostream
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # Create color table
Fernando Perez
Update exception colors API to PEP8, various small fixes in related files....
r1845 self.color_scheme_table = exception_colors()
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
self.set_colors(color_scheme)
self.old_scheme = color_scheme # save initial value for toggles
if call_pdb:
Brian Granger
Debugger.py => core/debugger.py and updated all imports.
r2015 self.pdb = debugger.Pdb(self.color_scheme_table.active_scheme_name)
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 else:
self.pdb = None
Fernando Perez
Simplified output stream management in ultratb....
r2852 def _get_ostream(self):
"""Output stream that exceptions are written to.
Valid values are:
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Simplified output stream management in ultratb....
r2852 - None: the default, which means that IPython will dynamically resolve
MinRK
io.Term.cin/out/err replaced by io.stdin/out/err...
r3800 to io.stdout. This ensures compatibility with most tools, including
Fernando Perez
Simplified output stream management in ultratb....
r2852 Windows (where plain stdout doesn't recognize ANSI escapes).
- Any object with 'write' and 'flush' attributes.
"""
MinRK
io.Term.cin/out/err replaced by io.stdin/out/err...
r3800 return io.stdout if self._ostream is None else self._ostream
Fernando Perez
Simplified output stream management in ultratb....
r2852
def _set_ostream(self, val):
assert val is None or (hasattr(val, 'write') and hasattr(val, 'flush'))
self._ostream = val
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Simplified output stream management in ultratb....
r2852 ostream = property(_get_ostream, _set_ostream)
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 def set_colors(self,*args,**kw):
"""Shorthand access to the color table scheme selector method."""
# Set own color table
self.color_scheme_table.set_active_scheme(*args,**kw)
# for convenience, set Colors to the active scheme
self.Colors = self.color_scheme_table.active_colors
# Also set colors of debugger
if hasattr(self,'pdb') and self.pdb is not None:
self.pdb.set_colors(*args,**kw)
def color_toggle(self):
"""Toggle between the currently active color scheme and NoColor."""
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if self.color_scheme_table.active_scheme_name == 'NoColor':
self.color_scheme_table.set_active_scheme(self.old_scheme)
self.Colors = self.color_scheme_table.active_colors
else:
self.old_scheme = self.color_scheme_table.active_scheme_name
self.color_scheme_table.set_active_scheme('NoColor')
self.Colors = self.color_scheme_table.active_colors
Fernando Perez
Multiple improvements to tab completion....
r2839 def stb2text(self, stb):
"""Convert a structured traceback (a list) to a string."""
return '\n'.join(stb)
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 def text(self, etype, value, tb, tb_offset=None, context=5):
"""Return formatted traceback.
Subclasses may override this if they add extra arguments.
"""
tb_list = self.structured_traceback(etype, value, tb,
tb_offset, context)
Fernando Perez
Multiple improvements to tab completion....
r2839 return self.stb2text(tb_list)
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838
def structured_traceback(self, etype, evalue, tb, tb_offset=None,
context=5, mode=None):
"""Return a list of traceback frames.
Must be implemented by each class.
"""
raise NotImplementedError()
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 #---------------------------------------------------------------------------
class ListTB(TBTools):
"""Print traceback information from a traceback list, with optional color.
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 Calling: requires 3 arguments:
(etype, evalue, elist)
as would be obtained by:
etype, evalue, tb = sys.exc_info()
if tb:
elist = traceback.extract_tb(tb)
else:
elist = None
It can thus be used by programs which need to process the traceback before
printing (such as console replacements based on the code module from the
standard library).
Because they are meant to be called without a full traceback (only a
list), instances of this class can't call the interactive pdb debugger."""
Fernando Perez
Simplified output stream management in ultratb....
r2852 def __init__(self,color_scheme = 'NoColor', call_pdb=False, ostream=None):
TBTools.__init__(self, color_scheme=color_scheme, call_pdb=call_pdb,
ostream=ostream)
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 def __call__(self, etype, value, elist):
Fernando Perez
Clean up small leftover uses of raw streams in exception handling.
r2860 self.ostream.flush()
self.ostream.write(self.text(etype, value, elist))
self.ostream.write('\n')
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 def structured_traceback(self, etype, value, elist, tb_offset=None,
context=5):
Fernando Perez
Lots of work on exception handling, including tests for traceback printing....
r2440 """Return a color formatted string with the traceback info.
Parameters
----------
etype : exception type
Type of the exception raised.
value : object
Data stored in the exception
elist : list
List of frames, see class docstring for details.
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 tb_offset : int, optional
Number of frames in the traceback to skip. If not given, the
instance value is used (set in constructor).
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 context : int, optional
Number of lines of context information to print.
Fernando Perez
Lots of work on exception handling, including tests for traceback printing....
r2440 Returns
-------
String with formatted exception.
"""
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 tb_offset = self.tb_offset if tb_offset is None else tb_offset
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 Colors = self.Colors
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 out_list = []
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if elist:
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838
if tb_offset and len(elist) > tb_offset:
elist = elist[tb_offset:]
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 out_list.append('Traceback %s(most recent call last)%s:' %
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 (Colors.normalEm, Colors.Normal) + '\n')
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 out_list.extend(self._format_list(elist))
# The exception info should be a single entry in the list.
lines = ''.join(self._format_exception_only(etype, value))
out_list.append(lines)
# Note: this code originally read:
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 ## for line in lines[:-1]:
## out_list.append(" "+line)
## out_list.append(lines[-1])
# This means it was indenting everything but the last line by a little
# bit. I've disabled this for now, but if we see ugliness somewhre we
# can restore it.
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 return out_list
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
def _format_list(self, extracted_list):
"""Format a list of traceback entry tuples for printing.
Given a list of tuples as returned by extract_tb() or
extract_stack(), return a list of strings ready for printing.
Each string in the resulting list corresponds to the item with the
same index in the argument list. Each string ends in a newline;
the strings may contain internal newlines as well, for those items
whose source text line is not None.
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 Lifted almost verbatim from traceback.py
"""
Colors = self.Colors
list = []
for filename, lineno, name, line in extracted_list[:-1]:
item = ' File %s"%s"%s, line %s%d%s, in %s%s%s\n' % \
Bernardo B. Marques
remove all trailling spaces
r4872 (Colors.filename, filename, Colors.Normal,
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 Colors.lineno, lineno, Colors.Normal,
Colors.name, name, Colors.Normal)
if line:
Thomas Kluyver
Use inplace addition in ultratb.
r5831 item += ' %s\n' % line.strip()
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 list.append(item)
# Emphasize the last entry
filename, lineno, name, line = extracted_list[-1]
item = '%s File %s"%s"%s, line %s%d%s, in %s%s%s%s\n' % \
(Colors.normalEm,
Colors.filenameEm, filename, Colors.normalEm,
Colors.linenoEm, lineno, Colors.normalEm,
Colors.nameEm, name, Colors.normalEm,
Colors.Normal)
if line:
Thomas Kluyver
Use inplace addition in ultratb.
r5831 item += '%s %s%s\n' % (Colors.line, line.strip(),
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 Colors.Normal)
list.append(item)
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 #from pprint import pformat; print 'LISTTB', pformat(list) # dbg
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 return list
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 def _format_exception_only(self, etype, value):
"""Format the exception part of a traceback.
The arguments are the exception type and value such as given by
sys.exc_info()[:2]. The return value is a list of strings, each ending
in a newline. Normally, the list contains a single string; however,
for SyntaxError exceptions, it contains several lines that (when
printed) display detailed information about where the syntax error
occurred. The message indicating which exception occurred is the
always last string in the list.
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 Also lifted nearly verbatim from traceback.py
"""
Fernando Perez
Checkpoint before merging with upstream
r1568
have_filedata = False
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 Colors = self.Colors
list = []
Thomas Kluyver
Fix display of SyntaxError in Python 3....
r5827 stype = Colors.excName + etype.__name__ + Colors.Normal
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if value is None:
Thomas Kluyver
Fix display of SyntaxError in Python 3....
r5827 # Not sure if this can still happen in Python 2.6 and above
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 list.append( str(stype) + '\n')
else:
if etype is SyntaxError:
Thomas Kluyver
Fix display of SyntaxError in Python 3....
r5827 have_filedata = True
#print 'filename is',filename # dbg
if not value.filename: value.filename = "<string>"
list.append('%s File %s"%s"%s, line %s%d%s\n' % \
(Colors.normalEm,
Colors.filenameEm, value.filename, Colors.normalEm,
Colors.linenoEm, value.lineno, Colors.Normal ))
if value.text is not None:
i = 0
while i < len(value.text) and value.text[i].isspace():
Thomas Kluyver
Use inplace addition in ultratb.
r5831 i += 1
Thomas Kluyver
Fix display of SyntaxError in Python 3....
r5827 list.append('%s %s%s\n' % (Colors.line,
value.text.strip(),
Colors.Normal))
if value.offset is not None:
s = ' '
for c in value.text[i:value.offset-1]:
if c.isspace():
Thomas Kluyver
Use inplace addition in ultratb.
r5831 s += c
Thomas Kluyver
Fix display of SyntaxError in Python 3....
r5827 else:
Thomas Kluyver
Use inplace addition in ultratb.
r5831 s += ' '
Thomas Kluyver
Fix display of SyntaxError in Python 3....
r5827 list.append('%s%s^%s\n' % (Colors.caret, s,
Colors.Normal) )
try:
s = value.msg
except Exception:
s = self._some_str(value)
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if s:
list.append('%s%s:%s %s\n' % (str(stype), Colors.excName,
Colors.Normal, s))
else:
list.append('%s\n' % str(stype))
Fernando Perez
Merge Vivan De Smedt's branch on editor synchronization.
r1532
Fernando Perez
Lots of work on exception handling, including tests for traceback printing....
r2440 # sync with user hooks
Fernando Perez
Fix https://bugs.launchpad.net/ipython/+bug/362137...
r2088 if have_filedata:
Brian Granger
Merging -r 1177 from lp:ipython with fixes and resolutions....
r2124 ipinst = ipapi.get()
if ipinst is not None:
Thomas Kluyver
Fix display of SyntaxError in Python 3....
r5827 ipinst.hooks.synchronize_with_editor(value.filename, value.lineno, 0)
Fernando Perez
Merge Vivan De Smedt's branch on editor synchronization.
r1532
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 return list
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 def get_exception_only(self, etype, value):
"""Only print the exception type and message, without a traceback.
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 Parameters
----------
etype : exception type
value : exception value
"""
return ListTB.structured_traceback(self, etype, value, [])
Brian Granger
Merge branch 'newkernel' into upstream-newkernel...
r2873 def show_exception_only(self, etype, evalue):
Fernando Perez
Lots of work on exception handling, including tests for traceback printing....
r2440 """Only print the exception type and message, without a traceback.
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Lots of work on exception handling, including tests for traceback printing....
r2440 Parameters
----------
etype : exception type
value : exception value
"""
# This method needs to use __call__ from *this* class, not the one from
# a subclass whose signature or behavior may be different
Fernando Perez
Simplified output stream management in ultratb....
r2852 ostream = self.ostream
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 ostream.flush()
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 ostream.write('\n'.join(self.get_exception_only(etype, evalue)))
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 ostream.flush()
Fernando Perez
Lots of work on exception handling, including tests for traceback printing....
r2440
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 def _some_str(self, value):
# Lifted from traceback.py
try:
return str(value)
except:
return '<unprintable %s object>' % type(value).__name__
#----------------------------------------------------------------------------
class VerboseTB(TBTools):
"""A port of Ka-Ping Yee's cgitb.py module that outputs color text instead
of HTML. Requires inspect and pydoc. Crazy, man.
Modified version which optionally strips the topmost entries from the
traceback, to be used with alternate interpreters (because their own code
would appear in the traceback)."""
Fernando Perez
Simplified output stream management in ultratb....
r2852 def __init__(self,color_scheme = 'Linux', call_pdb=False, ostream=None,
Fernando Perez
Complete implementation of interactive traceback support....
r3175 tb_offset=0, long_header=False, include_vars=True,
check_cache=None):
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 """Specify traceback offset, headers and color scheme.
Define how many frames to drop from the tracebacks. Calling it with
tb_offset=1 allows use of this handler in interpreters which will have
their own code at the top of the traceback (VerboseTB will first
remove that frame before printing the traceback info)."""
Fernando Perez
Simplified output stream management in ultratb....
r2852 TBTools.__init__(self, color_scheme=color_scheme, call_pdb=call_pdb,
ostream=ostream)
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 self.tb_offset = tb_offset
self.long_header = long_header
self.include_vars = include_vars
Fernando Perez
Complete implementation of interactive traceback support....
r3175 # By default we use linecache.checkcache, but the user can provide a
# different check_cache implementation. This is used by the IPython
# kernel to provide tracebacks for interactive code that is cached,
# by a compiler instance that flushes the linecache but preserves its
# own code cache.
if check_cache is None:
check_cache = linecache.checkcache
self.check_cache = check_cache
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 def structured_traceback(self, etype, evalue, etb, tb_offset=None,
context=5):
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 """Return a nice text document describing the traceback."""
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 tb_offset = self.tb_offset if tb_offset is None else tb_offset
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # some locals
try:
etype = etype.__name__
except AttributeError:
pass
Colors = self.Colors # just a shorthand + quicker name lookup
ColorsNormal = Colors.Normal # used a lot
col_scheme = self.color_scheme_table.active_scheme_name
indent = ' '*INDENT_SIZE
em_normal = '%s\n%s%s' % (Colors.valEm, indent,ColorsNormal)
undefined = '%sundefined%s' % (Colors.em, ColorsNormal)
exc = '%s%s%s' % (Colors.excName,etype,ColorsNormal)
# some internal-use functions
def text_repr(value):
"""Hopefully pretty robust repr equivalent."""
# this is pretty horrible but should always return *something*
try:
return pydoc.text.repr(value)
except KeyboardInterrupt:
raise
except:
try:
return repr(value)
except KeyboardInterrupt:
raise
except:
try:
# all still in an except block so we catch
# getattr raising
name = getattr(value, '__name__', None)
if name:
# ick, recursion
return text_repr(name)
klass = getattr(value, '__class__', None)
if klass:
return '%s instance' % text_repr(klass)
except KeyboardInterrupt:
raise
except:
return 'UNRECOVERABLE REPR FAILURE'
def eqrepr(value, repr=text_repr): return '=%s' % repr(value)
def nullrepr(value, repr=text_repr): return ''
# meat of the code begins
try:
etype = etype.__name__
except AttributeError:
pass
if self.long_header:
# Header with the exception type, python version, and date
Thomas Kluyver
Further removal of string module from core.
r3160 pyver = 'Python ' + sys.version.split()[0] + ': ' + sys.executable
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 date = time.ctime(time.time())
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 head = '%s%s%s\n%s%s%s\n%s' % (Colors.topline, '-'*75, ColorsNormal,
exc, ' '*(75-len(str(etype))-len(pyver)),
Thomas Kluyver
Update use of rjust
r3112 pyver, date.rjust(75) )
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 head += "\nA problem occured executing Python code. Here is the sequence of function"\
"\ncalls leading up to the error, with the most recent (innermost) call last."
else:
# Simplified header
head = '%s%s%s\n%s%s' % (Colors.topline, '-'*75, ColorsNormal,exc,
Thomas Kluyver
Update use of rjust
r3112 'Traceback (most recent call last)'.\
rjust(75 - len(str(etype)) ) )
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 frames = []
# Flush cache before calling inspect. This helps alleviate some of the
# problems with python 2.3's inspect.py.
Fernando Perez
Complete implementation of interactive traceback support....
r3175 ##self.check_cache()
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # Drop topmost frames if requested
try:
# Try the default getinnerframes and Alex's: Alex's fixes some
# problems, but it generates empty tracebacks for console errors
# (5 blanks lines) where none should be returned.
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 #records = inspect.getinnerframes(etb, context)[tb_offset:]
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 #print 'python records:', records # dbg
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 records = _fixed_getinnerframes(etb, context, tb_offset)
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 #print 'alex records:', records # dbg
except:
# FIXME: I've been getting many crash reports from python 2.3
# users, traceable to inspect.py. If I can find a small test-case
# to reproduce this, I should either write a better workaround or
# file a bug report against inspect (if that's the real problem).
# So far, I haven't been able to find an isolated example to
# reproduce the problem.
inspect_error()
Fernando Perez
Clean up small leftover uses of raw streams in exception handling.
r2860 traceback.print_exc(file=self.ostream)
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 info('\nUnfortunately, your original traceback can not be constructed.\n')
return ''
# build some color string templates outside these nested loops
tpl_link = '%s%%s%s' % (Colors.filenameEm,ColorsNormal)
tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm,
ColorsNormal)
tpl_call_fail = 'in %s%%s%s(***failed resolving arguments***)%s' % \
(Colors.vName, Colors.valEm, ColorsNormal)
tpl_local_var = '%s%%s%s' % (Colors.vName, ColorsNormal)
tpl_global_var = '%sglobal%s %s%%s%s' % (Colors.em, ColorsNormal,
Colors.vName, ColorsNormal)
tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal)
tpl_line = '%s%%s%s %%s' % (Colors.lineno, ColorsNormal)
tpl_line_em = '%s%%s%s %%s%s' % (Colors.linenoEm,Colors.line,
ColorsNormal)
# now, loop over all records printing context and info
abspath = os.path.abspath
for frame, file, lnum, func, lines, index in records:
#print '*** record:',file,lnum,func,lines,index # dbg
Thomas Kluyver
Fix for displaying variables in verbose traceback.
r6742
if not file:
file = '?'
elif not(file.startswith("<") and file.endswith(">")):
# Guess that filenames like <string> aren't real filenames, so
# don't call abspath on them.
try:
file = abspath(file)
except OSError:
# Not sure if this can still happen: abspath now works with
# file names like <string>
pass
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 link = tpl_link % file
Thomas Kluyver
Remove try/except to catch a bug fixed in Python 2.4.
r5854 args, varargs, varkw, locals = inspect.getargvalues(frame)
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if func == '?':
call = ''
else:
# Decide whether to include variable details or not
var_repr = self.include_vars and eqrepr or nullrepr
try:
call = tpl_call % (func,inspect.formatargvalues(args,
varargs, varkw,
locals,formatvalue=var_repr))
except KeyError:
Fernando Perez
Fixed long-standing and very subtle bug in ultratb....
r3147 # This happens in situations like errors inside generator
# expressions, where local variables are listed in the
# line, but can't be extracted from the frame. I'm not
# 100% sure this isn't actually a bug in inspect itself,
# but since there's no info for us to compute with, the
# best we can do is report the failure and move on. Here
# we must *not* call any traceback construction again,
# because that would mess up use of %debug later on. So we
# simply report the failure and move on. The only
# limitation will be that this frame won't have locals
# listed in the call signature. Quite subtle problem...
# I can't think of a good way to validate this in a unit
# test, but running a script consisting of:
# dict( (k,v.strip()) for (k,v) in range(10) )
# will illustrate the error, if this exception catch is
# disabled.
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 call = tpl_call_fail % func
Thomas Kluyver
Don't attempt to tokenize binary files for tracebacks....
r6008
# Don't attempt to tokenize binary files.
Thomas Kluyver
Switch back to blacklisting binary files before tokenising.
r6010 if file.endswith(('.so', '.pyd', '.dll')):
frames.append('%s %s\n' % (link,call))
continue
elif file.endswith(('.pyc','.pyo')):
# Look up the corresponding source file.
file = pyfile.source_from_cache(file)
Thomas Kluyver
Whitelist file extensions that are safe to tokenise.
r6009
def linereader(file=file, lnum=[lnum], getline=linecache.getline):
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 line = getline(file, lnum[0])
lnum[0] += 1
return line
# Build the list of names on this line of code where the exception
# occurred.
try:
Thomas Kluyver
Simplify tokenizing code for VerboseTB.
r5853 names = []
name_cont = False
for token_type, token, start, end, line in generate_tokens(linereader):
# build composite names
if token_type == tokenize.NAME and token not in keyword.kwlist:
if name_cont:
# Continuation of a dotted name
try:
names[-1].append(token)
except IndexError:
names.append([token])
name_cont = False
else:
# Regular new names. We append everything, the caller
# will be responsible for pruning the list later. It's
# very tricky to try to prune as we go, b/c composite
# names can fool us. The pruning at the end is easy
# to do (or the caller can print a list with repeated
# names if so desired.
names.append([token])
elif token == '.':
name_cont = True
elif token_type == tokenize.NEWLINE:
break
Thomas Kluyver
Fix display of errors in compiled code on Python 3....
r5576 except (IndexError, UnicodeDecodeError):
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # signals exit of tokenizer
pass
except tokenize.TokenError,msg:
_m = ("An unexpected error occurred while tokenizing input\n"
"The following traceback may be corrupted or invalid\n"
"The error message is: %s\n" % msg)
error(_m)
Bernardo B. Marques
remove all trailling spaces
r4872
Thomas Kluyver
Simplify tokenizing code for VerboseTB.
r5853 # Join composite names (e.g. "dict.fromkeys")
names = ['.'.join(n) for n in names]
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # prune names list of duplicates, but keep the right order
unique_names = uniq_stable(names)
# Start loop over vars
lvals = []
if self.include_vars:
for name_full in unique_names:
name_base = name_full.split('.',1)[0]
if name_base in frame.f_code.co_varnames:
if locals.has_key(name_base):
try:
value = repr(eval(name_full,locals))
except:
value = undefined
else:
value = undefined
name = tpl_local_var % name_full
else:
if frame.f_globals.has_key(name_base):
try:
value = repr(eval(name_full,frame.f_globals))
except:
value = undefined
else:
value = undefined
name = tpl_global_var % name_full
lvals.append(tpl_name_val % (name,value))
if lvals:
lvals = '%s%s' % (indent,em_normal.join(lvals))
else:
lvals = ''
level = '%s %s\n' % (link,call)
if index is None:
frames.append(level)
else:
frames.append('%s%s' % (level,''.join(
Fernando Perez
A few small fixes so ipythonx works, and PEP-8 cleanups I found along the way.
r2400 _format_traceback_lines(lnum,index,lines,Colors,lvals,
col_scheme))))
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
# Get (safely) a string form of the exception info
try:
etype_str,evalue_str = map(str,(etype,evalue))
except:
# User exception is improperly defined.
etype,evalue = str,sys.exc_info()[:2]
etype_str,evalue_str = map(str,(etype,evalue))
# ... and format it
exception = ['%s%s%s: %s' % (Colors.excName, etype_str,
ColorsNormal, evalue_str)]
Thomas Kluyver
Fixes for UltraTB and PyColorize with Python 3
r4758 if (not py3compat.PY3) and type(evalue) is types.InstanceType:
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 try:
names = [w for w in dir(evalue) if isinstance(w, basestring)]
except:
# Every now and then, an object with funny inernals blows up
# when dir() is called on it. We do the best we can to report
# the problem and continue
_m = '%sException reporting error (object with broken dir())%s:'
exception.append(_m % (Colors.excName,ColorsNormal))
etype_str,evalue_str = map(str,sys.exc_info()[:2])
exception.append('%s%s%s: %s' % (Colors.excName,etype_str,
ColorsNormal, evalue_str))
names = []
for name in names:
value = text_repr(getattr(evalue, name))
exception.append('\n%s%s = %s' % (indent, name, value))
Fernando Perez
Merge Vivan De Smedt's branch on editor synchronization.
r1532
Fernando Perez
Fix https://bugs.launchpad.net/ipython/+bug/362137...
r2088 # vds: >>
if records:
filepath, lnum = records[-1][1:3]
#print "file:", str(file), "linenb", str(lnum) # dbg
filepath = os.path.abspath(filepath)
Brian Granger
Merging -r 1177 from lp:ipython with fixes and resolutions....
r2124 ipinst = ipapi.get()
if ipinst is not None:
Brian Granger
Continuing a massive refactor of everything.
r2205 ipinst.hooks.synchronize_with_editor(filepath, lnum, 0)
Fernando Perez
Fix https://bugs.launchpad.net/ipython/+bug/362137...
r2088 # vds: <<
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # return all our info assembled as a single string
Brian Granger
Initial refactoring to support structured traceback information.
r2792 # return '%s\n\n%s\n%s' % (head,'\n'.join(frames),''.join(exception[0]) )
return [head] + frames + [''.join(exception[0])]
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 def debugger(self,force=False):
"""Call up the pdb debugger if desired, always clean up the tb
reference.
Keywords:
- force(False): by default, this routine checks the instance call_pdb
flag and does not actually invoke the debugger if the flag is false.
The 'force' option forces the debugger to activate even if the flag
is false.
If the call_pdb flag is set, the pdb interactive debugger is
invoked. In all cases, the self.tb reference to the current traceback
is deleted to prevent lingering references which hamper memory
management.
Note that each call to pdb() does an 'import readline', so if your app
requires a special setup for the readline completers, you'll have to
fix that by hand after invoking the exception handler."""
if force or self.call_pdb:
if self.pdb is None:
Brian Granger
Debugger.py => core/debugger.py and updated all imports.
r2015 self.pdb = debugger.Pdb(
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 self.color_scheme_table.active_scheme_name)
# the system displayhook may have changed, restore the original
# for pdb
Brian Granger
Fixing two minor bugs....
r2816 display_trap = DisplayTrap(hook=sys.__displayhook__)
Brian Granger
sys.displayhook is now managed dynamically by display_trap.
r2231 with display_trap:
self.pdb.reset()
# Find the right frame so we don't pop up inside ipython itself
Fernando Perez
Fix minor error that I saw in some odd cases, not sure how to test for it....
r2438 if hasattr(self,'tb') and self.tb is not None:
Brian Granger
sys.displayhook is now managed dynamically by display_trap.
r2231 etb = self.tb
else:
etb = self.tb = sys.last_traceback
Fernando Perez
Fix minor error that I saw in some odd cases, not sure how to test for it....
r2438 while self.tb is not None and self.tb.tb_next is not None:
Brian Granger
sys.displayhook is now managed dynamically by display_trap.
r2231 self.tb = self.tb.tb_next
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if etb and etb.tb_next:
etb = etb.tb_next
self.pdb.botframe = etb.tb_frame
self.pdb.interaction(self.tb.tb_frame, self.tb)
Brian Granger
sys.displayhook is now managed dynamically by display_trap.
r2231
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if hasattr(self,'tb'):
del self.tb
def handler(self, info=None):
(etype, evalue, etb) = info or sys.exc_info()
self.tb = etb
Fernando Perez
Simplified output stream management in ultratb....
r2852 ostream = self.ostream
ostream.flush()
ostream.write(self.text(etype, evalue, etb))
ostream.write('\n')
ostream.flush()
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
# Changed so an instance can just be called as VerboseTB_inst() and print
# out the right info on its own.
def __call__(self, etype=None, evalue=None, etb=None):
"""This hook can replace sys.excepthook (for Python 2.1 or higher)."""
if etb is None:
self.handler()
else:
self.handler((etype, evalue, etb))
try:
self.debugger()
except KeyboardInterrupt:
print "\nKeyboardInterrupt"
#----------------------------------------------------------------------------
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 class FormattedTB(VerboseTB, ListTB):
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 """Subclass ListTB but allow calling with a traceback.
It can thus be used as a sys.excepthook for Python > 2.1.
Also adds 'Context' and 'Verbose' modes, not available in ListTB.
Allows a tb_offset to be specified. This is useful for situations where
one needs to remove a number of topmost frames from the traceback (such as
occurs with python programs that themselves execute other python code,
like Python shells). """
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Simplified output stream management in ultratb....
r2852 def __init__(self, mode='Plain', color_scheme='Linux', call_pdb=False,
Bernardo B. Marques
remove all trailling spaces
r4872 ostream=None,
Fernando Perez
Complete implementation of interactive traceback support....
r3175 tb_offset=0, long_header=False, include_vars=False,
check_cache=None):
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
# NEVER change the order of this list. Put new modes at the end:
self.valid_modes = ['Plain','Context','Verbose']
self.verbose_modes = self.valid_modes[1:3]
Fernando Perez
Simplified output stream management in ultratb....
r2852 VerboseTB.__init__(self, color_scheme=color_scheme, call_pdb=call_pdb,
ostream=ostream, tb_offset=tb_offset,
Fernando Perez
Complete implementation of interactive traceback support....
r3175 long_header=long_header, include_vars=include_vars,
check_cache=check_cache)
Fernando Perez
Multiple improvements to tab completion....
r2839
# Different types of tracebacks are joined with different separators to
# form a single string. They are taken from this dict
self._join_chars = dict(Plain='', Context='\n', Verbose='\n')
# set_mode also sets the tb_join_char attribute
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 self.set_mode(mode)
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 def _extract_tb(self,tb):
if tb:
return traceback.extract_tb(tb)
else:
return None
Fernando Perez
Multiple improvements to tab completion....
r2839 def structured_traceback(self, etype, value, tb, tb_offset=None, context=5):
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 tb_offset = self.tb_offset if tb_offset is None else tb_offset
Fernando Perez
Multiple improvements to tab completion....
r2839 mode = self.mode
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if mode in self.verbose_modes:
Brian Granger
Initial refactoring to support structured traceback information.
r2792 # Verbose modes need a full traceback
return VerboseTB.structured_traceback(
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 self, etype, value, tb, tb_offset, context
Brian Granger
Initial refactoring to support structured traceback information.
r2792 )
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 else:
# We must check the source cache because otherwise we can print
# out-of-date source code.
Fernando Perez
Complete implementation of interactive traceback support....
r3175 self.check_cache()
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # Now we can extract and format the exception
elist = self._extract_tb(tb)
Brian Granger
Initial refactoring to support structured traceback information.
r2792 return ListTB.structured_traceback(
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 self, etype, value, elist, tb_offset, context
Brian Granger
Initial refactoring to support structured traceback information.
r2792 )
Fernando Perez
Multiple improvements to tab completion....
r2839 def stb2text(self, stb):
"""Convert a structured traceback (a list) to a string."""
return self.tb_join_char.join(stb)
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
def set_mode(self,mode=None):
"""Switch to the desired mode.
If mode is not specified, cycles through the available modes."""
if not mode:
new_idx = ( self.valid_modes.index(self.mode) + 1 ) % \
len(self.valid_modes)
self.mode = self.valid_modes[new_idx]
elif mode not in self.valid_modes:
raise ValueError, 'Unrecognized mode in FormattedTB: <'+mode+'>\n'\
'Valid modes: '+str(self.valid_modes)
else:
self.mode = mode
# include variable details only in 'Verbose' mode
self.include_vars = (self.mode == self.valid_modes[2])
Fernando Perez
Multiple improvements to tab completion....
r2839 # Set the join character for generating text tracebacks
Fernando Perez
Fix small bug where %xmode without arguments failed to run....
r3146 self.tb_join_char = self._join_chars[self.mode]
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
# some convenient shorcuts
def plain(self):
self.set_mode(self.valid_modes[0])
def context(self):
self.set_mode(self.valid_modes[1])
def verbose(self):
self.set_mode(self.valid_modes[2])
#----------------------------------------------------------------------------
class AutoFormattedTB(FormattedTB):
"""A traceback printer which can be called on the fly.
It will find out about exceptions by itself.
A brief example:
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 AutoTB = AutoFormattedTB(mode = 'Verbose',color_scheme='Linux')
try:
...
except:
AutoTB() # or AutoTB(out=logfile) where logfile is an open file object
"""
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 def __call__(self,etype=None,evalue=None,etb=None,
out=None,tb_offset=None):
"""Print out a formatted exception traceback.
Optional arguments:
- out: an open file-like object to direct output to.
- tb_offset: the number of frames to skip over in the stack, on a
per-call basis (this overrides temporarily the instance's tb_offset
given at initialization time. """
Fernando Perez
Lots of work on exception handling, including tests for traceback printing....
r2440
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if out is None:
Fernando Perez
Simplified output stream management in ultratb....
r2852 out = self.ostream
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 out.flush()
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 out.write(self.text(etype, evalue, etb, tb_offset))
out.write('\n')
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 out.flush()
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838 # FIXME: we should remove the auto pdb behavior from here and leave
# that to the clients.
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 try:
self.debugger()
except KeyboardInterrupt:
print "\nKeyboardInterrupt"
Brian Granger
Initial refactoring to support structured traceback information.
r2792 def structured_traceback(self, etype=None, value=None, tb=None,
Fernando Perez
Multiple improvements to tab completion....
r2839 tb_offset=None, context=5):
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 if etype is None:
etype,value,tb = sys.exc_info()
self.tb = tb
Brian Granger
Initial refactoring to support structured traceback information.
r2792 return FormattedTB.structured_traceback(
Fernando Perez
Multiple improvements to tab completion....
r2839 self, etype, value, tb, tb_offset, context)
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
#---------------------------------------------------------------------------
Brian Granger
Initial refactoring to support structured traceback information.
r2792
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 # A simple class to preserve Nathan's original functionality.
class ColorTB(FormattedTB):
"""Shorthand to initialize a FormattedTB in Linux colors mode."""
def __init__(self,color_scheme='Linux',call_pdb=0):
FormattedTB.__init__(self,color_scheme=color_scheme,
call_pdb=call_pdb)
Brian Granger
Initial refactoring to support structured traceback information.
r2792
class SyntaxTB(ListTB):
"""Extension which holds some state: the last exception value"""
def __init__(self,color_scheme = 'NoColor'):
ListTB.__init__(self,color_scheme)
self.last_syntax_error = None
def __call__(self, etype, value, elist):
self.last_syntax_error = value
ListTB.__call__(self,etype,value,elist)
def clear_err_state(self):
"""Return the current error state and clear it"""
e = self.last_syntax_error
self.last_syntax_error = None
return e
Fernando Perez
Multiple improvements to tab completion....
r2839 def stb2text(self, stb):
"""Convert a structured traceback (a list) to a string."""
return ''.join(stb)
Fernando Perez
Improvements to exception handling to transport structured tracebacks....
r2838
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 #----------------------------------------------------------------------------
# module testing (minimal)
if __name__ == "__main__":
def spam(c, (d, e)):
x = c + d
y = c * d
foo(x, y)
def foo(a, b, bar=1):
eggs(a, b + bar)
def eggs(f, g, z=globals()):
h = f + g
i = f - g
return h / i
print ''
print '*** Before ***'
try:
print spam(1, (2, 3))
except:
traceback.print_exc()
print ''
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 handler = ColorTB()
print '*** ColorTB ***'
try:
print spam(1, (2, 3))
except:
apply(handler, sys.exc_info() )
print ''
Bernardo B. Marques
remove all trailling spaces
r4872
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 handler = VerboseTB()
print '*** VerboseTB ***'
try:
print spam(1, (2, 3))
except:
apply(handler, sys.exc_info() )
print ''
Bernardo B. Marques
remove all trailling spaces
r4872