IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix again for fffbcba0b. We should keep original env.update() return value type as list-of-docnames-that-ordered-in-order-to-read.

Browse Source
This commit is contained in:
Takayuki Shimizukawa 2014-11-27 21:50:30 +09:00
parent d3615d9c0b
commit 4d784bbb06
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sphinx/builders/__init__.py
View File

@ -247,8 +247,8 @@ class Builder(object):
# while reading, collect all warnings from docutils # while reading, collect all warnings from docutils
warnings = [] warnings = []
self.env.set_warnfunc(lambda *args: warnings.append(args)) self.env.set_warnfunc(lambda *args: warnings.append(args))
updated_docnames = self.env.update(self.config, self.srcdir, updated_docnames = set(self.env.update(self.config, self.srcdir,
self.doctreedir, self.app) self.doctreedir, self.app))
self.env.set_warnfunc(self.warn) self.env.set_warnfunc(self.warn)
for warning in warnings: for warning in warnings:
self.warn(*warning) self.warn(*warning)

2
sphinx/environment.py
View File

@ -590,7 +590,7 @@ class BuildEnvironment:
self.app = None self.app = None
app.emit('env-updated', self) app.emit('env-updated', self)
return set(docnames) return docnames
def _read_serial(self, docnames, app): def _read_serial(self, docnames, app):
for docname in app.status_iterator(docnames, 'reading sources... ', for docname in app.status_iterator(docnames, 'reading sources... ',