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

Ooops, revert stray function renames.

Browse Source
This commit is contained in:
Jakob Lykke Andersen 2014-08-07 13:33:52 +02:00
parent 640dfc1951
commit 0de1022a78
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sphinx/domains/c.py
View File

@ -66,7 +66,7 @@ class CObject(ObjectDescription):
'struct', '_Bool', 'struct', '_Bool',
)) ))
def _parse_type_old(self, node, ctype): def _parse_type(self, node, ctype):
# add cross-ref nodes for all words # add cross-ref nodes for all words
for part in [_f for _f in wsplit_re.split(ctype) if _f]: for part in [_f for _f in wsplit_re.split(ctype) if _f]:
tnode = nodes.Text(part, part) tnode = nodes.Text(part, part)
@ -91,7 +91,7 @@ class CObject(ObjectDescription):
rettype, name, arglist, const = m.groups() rettype, name, arglist, const = m.groups()
signode += addnodes.desc_type('', '') signode += addnodes.desc_type('', '')
self._parse_type_old(signode[-1], rettype) self._parse_type(signode[-1], rettype)
try: try:
classname, funcname = name.split('::', 1) classname, funcname = name.split('::', 1)
classname += '::' classname += '::'
@ -130,9 +130,9 @@ class CObject(ObjectDescription):
ctype, argname = arg.rsplit(' ', 1) ctype, argname = arg.rsplit(' ', 1)
except ValueError: except ValueError:
# no argument name given, only the type # no argument name given, only the type
self._parse_type_old(param, arg) self._parse_type(param, arg)
else: else:
self._parse_type_old(param, ctype) self._parse_type(param, ctype)
# separate by non-breaking space in the output # separate by non-breaking space in the output
param += nodes.emphasis(' '+argname, u'\xa0'+argname) param += nodes.emphasis(' '+argname, u'\xa0'+argname)
paramlist += param paramlist += param

14
sphinx/ext/napoleon/docstring.py
View File

@ -197,12 +197,12 @@ class GoogleDocstring(UnicodeMixin):
line = self._line_iter.peek() line = self._line_iter.peek()
return lines return lines
def _consume_field(self, parse_type_old=True, prefer_type=False): def _consume_field(self, parse_type=True, prefer_type=False):
line = next(self._line_iter) line = next(self._line_iter)
match = None match = None
_name, _type, _desc = line.strip(), '', '' _name, _type, _desc = line.strip(), '', ''
if parse_type_old: if parse_type:
match = _google_typed_arg_regex.match(line) match = _google_typed_arg_regex.match(line)
if match: if match:
_name = match.group(1) _name = match.group(1)
@ -222,11 +222,11 @@ class GoogleDocstring(UnicodeMixin):
_desc = self.__class__(_desc, self._config).lines() _desc = self.__class__(_desc, self._config).lines()
return _name, _type, _desc return _name, _type, _desc
def _consume_fields(self, parse_type_old=True, prefer_type=False): def _consume_fields(self, parse_type=True, prefer_type=False):
self._consume_empty() self._consume_empty()
fields = [] fields = []
while not self._is_section_break(): while not self._is_section_break():
_name, _type, _desc = self._consume_field(parse_type_old, prefer_type) _name, _type, _desc = self._consume_field(parse_type, prefer_type)
if _name or _type or _desc: if _name or _type or _desc:
fields.append((_name, _type, _desc,)) fields.append((_name, _type, _desc,))
return fields return fields
@ -462,7 +462,7 @@ class GoogleDocstring(UnicodeMixin):
def _parse_methods_section(self, section): def _parse_methods_section(self, section):
lines = [] lines = []
for _name, _, _desc in self._consume_fields(parse_type_old=False): for _name, _, _desc in self._consume_fields(parse_type=False):
lines.append('.. method:: %s' % _name) lines.append('.. method:: %s' % _name)
if _desc: if _desc:
lines.extend([''] + self._indent(_desc, 3)) lines.extend([''] + self._indent(_desc, 3))
@ -698,9 +698,9 @@ class NumpyDocstring(GoogleDocstring):
super(NumpyDocstring, self).__init__(docstring, config, app, what, super(NumpyDocstring, self).__init__(docstring, config, app, what,
name, obj, options) name, obj, options)
def _consume_field(self, parse_type_old=True, prefer_type=False): def _consume_field(self, parse_type=True, prefer_type=False):
line = next(self._line_iter) line = next(self._line_iter)
if parse_type_old: if parse_type:
_name, _, _type = line.partition(':') _name, _, _type = line.partition(':')
else: else:
_name, _type = line, '' _name, _type = line, ''