##// END OF EJS Templates
Merge branch 'fix-del-method-exit-test' of http://github.com/takowl/ipython into takowl-fix-del-method-exit-test...
Merge branch 'fix-del-method-exit-test' of http://github.com/takowl/ipython into takowl-fix-del-method-exit-test Fix errors with __del__ methods being called on exit. This branch reintroduces a recent fix that got accidentally overwritten, as well as adding a more stringent form of the test so that we don't miss it again in the future (the old test only printed a message but didn't fail, so it was easy to miss). Closes gh-172 (pull request).

File last commit:

r2754:6f2df84b
r3178:5c6a3477 merge
Show More
displayhook.py
21 lines | 576 B | text/x-python | PythonLexer
import __builtin__
from session import extract_header
class DisplayHook(object):
def __init__(self, session, pub_socket):
self.session = session
self.pub_socket = pub_socket
self.parent_header = {}
def __call__(self, obj):
if obj is None:
return
__builtin__._ = obj
msg = self.session.msg(u'pyout', {u'data':repr(obj)},
parent=self.parent_header)
self.pub_socket.send_json(msg)
def set_parent(self, parent):
self.parent_header = extract_header(parent)