Fix strange reportings of line numbers for warnings generated from

autodoc-included docstrings, due to different behavior depending
on docutils version.

1 files changed, 2 insertions, 2 deletions

diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index 55253e8ab..f2f872ef7 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -107,7 +107,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:
@@ -676,7 +676,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()