diff options
author | shimizukawa <shimizukawa@gmail.com> | 2014-11-27 21:50:30 +0900 |
---|---|---|
committer | shimizukawa <shimizukawa@gmail.com> | 2014-11-27 21:50:30 +0900 |
commit | 462f9fa2d2cd6ff0e8617b12e8c46abb0779ff53 (patch) | |
tree | 174cafbaa58e625ef8a99f78acf23625b66437f9 | |
parent | 342db7005e995217689abfb8ecca55c302b10bae (diff) | |
download | sphinx-462f9fa2d2cd6ff0e8617b12e8c46abb0779ff53.tar.gz |
Fix again for fffbcba0b. We should keep original env.update() return value type as list-of-docnames-that-ordered-in-order-to-read.
-rw-r--r-- | sphinx/builders/__init__.py | 4 | ||||
-rw-r--r-- | sphinx/environment.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py index 70ec6cb5..74cd6198 100644 --- a/sphinx/builders/__init__.py +++ b/sphinx/builders/__init__.py @@ -247,8 +247,8 @@ class Builder(object): # while reading, collect all warnings from docutils warnings = [] self.env.set_warnfunc(lambda *args: warnings.append(args)) - updated_docnames = self.env.update(self.config, self.srcdir, - self.doctreedir, self.app) + updated_docnames = set(self.env.update(self.config, self.srcdir, + self.doctreedir, self.app)) self.env.set_warnfunc(self.warn) for warning in warnings: self.warn(*warning) diff --git a/sphinx/environment.py b/sphinx/environment.py index 42327354..c3d67d73 100644 --- a/sphinx/environment.py +++ b/sphinx/environment.py @@ -590,7 +590,7 @@ class BuildEnvironment: self.app = None app.emit('env-updated', self) - return set(docnames) + return docnames def _read_serial(self, docnames, app): for docname in app.status_iterator(docnames, 'reading sources... ', |