IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with 1.0

Browse Source
This commit is contained in:
Georg Brandl 2011-01-03 15:55:56 +01:00
commit 6c7aa8bb6d
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -32,6 +32,10 @@ Release 1.1 (in development)
Release 1.0.6 (in development) Release 1.0.6 (in development)
============================== ==============================
* Fix strange reportings of line numbers for warnings generated from
autodoc-included docstrings, due to different behavior depending
on docutils version.
* Several fixes to the C++ domain. * Several fixes to the C++ domain.

6
sphinx/domains/cpp.py
View File

@ -448,9 +448,9 @@ class DefinitionParser(object):
'mutable': None, 'mutable': None,
'const': None, 'const': None,
'typename': None, 'typename': None,
'unsigned': set(('char', 'int', 'long')), 'unsigned': set(('char', 'short', 'int', 'long')),
'signed': set(('char', 'int', 'long')), 'signed': set(('char', 'short', 'int', 'long')),
'short': set(('int', 'short')), 'short': set(('int',)),
'long': set(('int', 'long', 'double')) 'long': set(('int', 'long', 'double'))
} }

4
sphinx/ext/autodoc.py
View File

@ -103,7 +103,7 @@ class AutodocReporter(object):
return getattr(self.reporter, name) return getattr(self.reporter, name)
def system_message(self, level, message, *children, **kwargs): def system_message(self, level, message, *children, **kwargs):
if 'line' in kwargs: if 'line' in kwargs and 'source' not in kwargs:
try: try:
source, line = self.viewlist.items[kwargs['line']] source, line = self.viewlist.items[kwargs['line']]
except IndexError: except IndexError:
@ -681,7 +681,7 @@ class Documenter(object):
# make sure that the result starts with an empty line. This is # make sure that the result starts with an empty line. This is
# necessary for some situations where another directive preprocesses # necessary for some situations where another directive preprocesses
# reST and no starting newline is present # reST and no starting newline is present
self.add_line(u'', '') self.add_line(u'', '<autodoc>')
# format the object's signature, if any # format the object's signature, if any
sig = self.format_signature() sig = self.format_signature()

6
tests/root/autodoc.txt
View File

@ -26,3 +26,9 @@ Just testing a few autodoc possibilities...
.. autoclass:: CustomDict .. autoclass:: CustomDict
:show-inheritance: :show-inheritance:
:members: :members:
.. automodule:: autodoc_fodder
:noindex:
.. autoclass:: MarkupError

3
tests/test_build_html.py
View File

@ -32,6 +32,9 @@ def teardown_module():
html_warnfile = StringIO() html_warnfile = StringIO()
ENV_WARNINGS = """\ ENV_WARNINGS = """\
%(root)s/autodoc_fodder.py:docstring of autodoc_fodder\\.MarkupError:2: \
\\(WARNING/2\\) Explicit markup ends without a blank line; unexpected \
unindent\\.\\n?
%(root)s/images.txt:9: WARNING: image file not readable: foo.png %(root)s/images.txt:9: WARNING: image file not readable: foo.png
%(root)s/images.txt:23: WARNING: nonlocal image URI found: \ %(root)s/images.txt:23: WARNING: nonlocal image URI found: \
http://www.python.org/logo.png http://www.python.org/logo.png