##// END OF EJS Templates
Merge remote branch 'minrk/htmlfix' into trunk....
Merge remote branch 'minrk/htmlfix' into trunk. This branch implements a number of improvements to the HTML save capabilities of the Qt console, and received extensive reviews. A short summary follows, see the pull request page for full details, at http://github.com/ipython/ipython/pull/170. Some small issues in the HTML code I noticed when I started playing with it. * only rich backends support toHtml, so the html/xhtml exports failed * modules were imported inside functions * relpath in image_tag was determined in platform-dependent way * save dialog strictly enforced non-standard '.htm' file extension * when selecting external PNG, the _files dir was always created, regardless of whether there were any images Fixes in this commit: * export options do not appear in non-rich widgets * module imports all at the top * relpath uses platform independent os.path * dialog uses standard '.html' by default, but allows any extension * no _files dir is created if no images are to be exported Closes gh-170 (pull request).

File last commit:

r2754:6f2df84b
r3177:35e407aa 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)