IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2026-09-03 20:52:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5-release' into stable

Browse Source
This commit is contained in:
shimizukawa
2016-12-10 11:56:22 +09:00
parent b1abd4629b f4716ed3a3
commit 124938c9ae
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_ext_napoleon.py
+1
View File
@@ -68,6 +68,7 @@ class SampleError(Exception):
def __special_undoc__(self):
pass
SampleNamedTuple = namedtuple('SampleNamedTuple', 'user_id block_type def_id')
tests/test_ext_napoleon_docstring.py
+7 -5
View File
@@ -284,8 +284,9 @@ Construct a new XBlock.
This class should only be used by runtimes.
Arguments:
runtime (:class:`Runtime`): Use it to access the environment.
It is available in XBlock code as ``self.runtime``.
runtime (:class:`~typing.Dict`\[:class:`int`,:class:`str`\]): Use it to
access the environment. It is available in XBlock code
as ``self.runtime``.
field_data (:class:`FieldData`): Interface used by the XBlock
fields to access their data from wherever it is persisted.
@@ -300,9 +301,10 @@ Construct a new XBlock.
This class should only be used by runtimes.
:param runtime: Use it to access the environment.
It is available in XBlock code as ``self.runtime``.
:type runtime: :class:`Runtime`
:param runtime: Use it to
access the environment. It is available in XBlock code
as ``self.runtime``.
:type runtime: :class:`~typing.Dict`\[:class:`int`,:class:`str`\]
:param field_data: Interface used by the XBlock
fields to access their data from wherever it is persisted.
:type field_data: :class:`FieldData`