summaryrefslogtreecommitdiff
path: root/sphinx/pycode
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-03-30 14:10:37 +0100
committerGeorg Brandl <georg@python.org>2013-03-30 14:10:37 +0100
commit5ea474d54f18de8cbaa2fe2a8e4eba87cc9116b4 (patch)
tree7bc4b40cc213085587c230db7d348f0afc6fe0d3 /sphinx/pycode
parent85950741aadae5f691bd178a35d3fd6013dafcd3 (diff)
downloadsphinx-5ea474d54f18de8cbaa2fe2a8e4eba87cc9116b4.tar.gz
Closes #1127: Fix traceback when autodoc tries to tokenize a non-Python file.
Diffstat (limited to 'sphinx/pycode')
-rw-r--r--sphinx/pycode/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index 073c1560..64999df8 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -241,7 +241,10 @@ class ModuleAnalyzer(object):
"""Generate tokens from the source."""
if self.tokens is not None:
return
- self.tokens = list(tokenize.generate_tokens(self.source.readline))
+ try:
+ self.tokens = list(tokenize.generate_tokens(self.source.readline))
+ except tokenize.TokenError, err:
+ raise PycodeError('tokenizing failed', err)
self.source.close()
def parse(self):