summaryrefslogtreecommitdiff
path: root/sphinx/environment.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-01-19 19:13:17 +0100
committerGeorg Brandl <georg@python.org>2014-01-19 19:13:17 +0100
commitcd7658dde7f32714f4e6013cd221a9ea6e88bb82 (patch)
tree329d1f0abf16c75666013bc877f7532a21663398 /sphinx/environment.py
parent2a8cf7c7781a4554adbcb4bae6bec2a40bfc156d (diff)
parent468198f91b0a41056c46c25f8cedf5c528c97564 (diff)
downloadsphinx-cd7658dde7f32714f4e6013cd221a9ea6e88bb82.tar.gz
merge with stable
Diffstat (limited to 'sphinx/environment.py')
-rw-r--r--sphinx/environment.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/sphinx/environment.py b/sphinx/environment.py
index 09f76bf2..c5726e29 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -611,11 +611,8 @@ class BuildEnvironment:
pub.process_programmatic_settings(None, self.settings, None)
pub.set_source(None, src_path.encode(fs_encoding))
pub.set_destination(None, None)
- try:
- pub.publish()
- doctree = pub.document
- except UnicodeError, err:
- raise SphinxError(str(err))
+ pub.publish()
+ doctree = pub.document
# post-processing
self.filter_messages(doctree)