diff options
| author | Georg Brandl <georg@python.org> | 2011-01-03 15:55:56 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-01-03 15:55:56 +0100 |
| commit | 6c7aa8bb6d4b4b1867195d03d12006cd6d72d898 (patch) | |
| tree | 932d5122c258e20ec6dfb0bb58edfa458e6020f9 /sphinx/ext/autodoc.py | |
| parent | 7fe2f8ca5b1e33c6e542c295bcbe435de0774d02 (diff) | |
| parent | 69e5b91b2daa147e01fe4f497086639dc69f392b (diff) | |
| download | sphinx-git-6c7aa8bb6d4b4b1867195d03d12006cd6d72d898.tar.gz | |
merge with 1.0
Diffstat (limited to 'sphinx/ext/autodoc.py')
| -rw-r--r-- | sphinx/ext/autodoc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index 696e5f1d0..3b378001f 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -103,7 +103,7 @@ class AutodocReporter(object): return getattr(self.reporter, name) def system_message(self, level, message, *children, **kwargs): - if 'line' in kwargs: + if 'line' in kwargs and 'source' not in kwargs: try: source, line = self.viewlist.items[kwargs['line']] except IndexError: @@ -681,7 +681,7 @@ class Documenter(object): # make sure that the result starts with an empty line. This is # necessary for some situations where another directive preprocesses # reST and no starting newline is present - self.add_line(u'', '') + self.add_line(u'', '<autodoc>') # format the object's signature, if any sig = self.format_signature() |