From 937a93887f7f8eda839f7011a5a067dcc6908659 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 29 Mar 2013 18:57:28 +0100 Subject: [PATCH] websupport: adapt builder to changes in html builder due to parallel building API --- sphinx/builders/websupport.py | 11 ++++++++--- sphinx/writers/websupport.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sphinx/builders/websupport.py b/sphinx/builders/websupport.py index d8238bb46..f3396a369 100644 --- a/sphinx/builders/websupport.py +++ b/sphinx/builders/websupport.py @@ -56,20 +56,25 @@ class WebSupportBuilder(PickleHTMLBuilder): destination = StringOutput(encoding='utf-8') doctree.settings = self.docsettings - self.cur_docname = docname self.secnumbers = self.env.toc_secnumbers.get(docname, {}) self.imgpath = '/' + posixpath.join(self.virtual_staticdir, '_images') - self.post_process_images(doctree) self.dlpath = '/' + posixpath.join(self.virtual_staticdir, '_downloads') + self.current_docname = docname self.docwriter.write(doctree, destination) self.docwriter.assemble_parts() body = self.docwriter.parts['fragment'] metatags = self.docwriter.clean_meta ctx = self.get_doc_context(docname, body, metatags) - self.index_page(docname, doctree, ctx.get('title', '')) self.handle_page(docname, ctx, event_arg=doctree) + def write_doc_serialized(self, docname, doctree): + self.imgpath = '/' + posixpath.join(self.virtual_staticdir, '_images') + self.post_process_images(doctree) + title = self.env.longtitles.get(docname) + title = title and self.render_partial(title)['title'] or '' + self.index_page(docname, doctree, title) + def load_indexer(self, docnames): self.indexer = self.search self.indexer.init_indexing(changed=docnames) diff --git a/sphinx/writers/websupport.py b/sphinx/writers/websupport.py index 71a9ba00d..63b5dd1da 100644 --- a/sphinx/writers/websupport.py +++ b/sphinx/writers/websupport.py @@ -42,5 +42,5 @@ class WebSupportTranslator(HTMLTranslator): storage = self.builder.storage if not storage.has_node(node.uid): storage.add_node(id=node.uid, - document=self.builder.cur_docname, + document=self.builder.current_docname, source=node.rawsource or node.astext())