diff options
| author | Georg Brandl <georg@python.org> | 2011-09-21 19:28:43 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-09-21 19:28:43 +0200 |
| commit | ca96818d5dd2cf661cb16d2c23c101a285db1dd7 (patch) | |
| tree | 5cd068ade36bcb6c26852bc909f2be97b67619a8 /sphinx/ext/viewcode.py | |
| parent | f3b6be8f1e5361a0c66d8721719027e682cd0b97 (diff) | |
| parent | 234c7d51cf75ba6b953163e2ae4a84249e29c969 (diff) | |
| download | sphinx-ca96818d5dd2cf661cb16d2c23c101a285db1dd7.tar.gz | |
Merge with 1.0
Diffstat (limited to 'sphinx/ext/viewcode.py')
| -rw-r--r-- | sphinx/ext/viewcode.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sphinx/ext/viewcode.py b/sphinx/ext/viewcode.py index 4994f125..020db697 100644 --- a/sphinx/ext/viewcode.py +++ b/sphinx/ext/viewcode.py @@ -31,7 +31,11 @@ def doctree_read(app, doctree): env._viewcode_modules[modname] = False return analyzer.find_tags() - entry = analyzer.code.decode(analyzer.encoding), analyzer.tags, {} + if not isinstance(analyzer.code, unicode): + code = analyzer.code.decode(analyzer.encoding) + else: + code = analyzer.code + entry = code, analyzer.tags, {} env._viewcode_modules[modname] = entry elif entry is False: return |