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

PEP8 cleanup in std.py.

Browse Source
This commit is contained in:
Georg Brandl 2014-09-20 19:59:14 +02:00
parent a555bda5eb
commit a064f43bc0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sphinx/domains/std.py
View File

@ -29,6 +29,8 @@ from sphinx.util.compat import Directive
# RE for option descriptions # RE for option descriptions
option_desc_re = re.compile(r'((?:/|--|-|\+)?[-?@#_a-zA-Z0-9]+)(=?\s*.*)') option_desc_re = re.compile(r'((?:/|--|-|\+)?[-?@#_a-zA-Z0-9]+)(=?\s*.*)')
# RE for grammar tokens
token_re = re.compile('`(\w+)`', re.U)
class GenericObject(ObjectDescription): class GenericObject(ObjectDescription):
@ -311,7 +313,7 @@ class Glossary(Directive):
else: else:
messages.append(self.state.reporter.system_message( messages.append(self.state.reporter.system_message(
2, 'glossary seems to be misformatted, check ' 2, 'glossary seems to be misformatted, check '
'indentation', source=source, line=lineno)) 'indentation', source=source, line=lineno))
else: else:
if not in_definition: if not in_definition:
# first line of definition, determines indentation # first line of definition, determines indentation
@ -322,7 +324,7 @@ class Glossary(Directive):
else: else:
messages.append(self.state.reporter.system_message( messages.append(self.state.reporter.system_message(
2, 'glossary seems to be misformatted, check ' 2, 'glossary seems to be misformatted, check '
'indentation', source=source, line=lineno)) 'indentation', source=source, line=lineno))
was_empty = False was_empty = False
# now, parse all the entries into a big definition list # now, parse all the entries into a big definition list
@ -343,7 +345,7 @@ class Glossary(Directive):
tmp.source = source tmp.source = source
tmp.line = lineno tmp.line = lineno
new_id, termtext, new_termnodes = \ new_id, termtext, new_termnodes = \
make_termnodes_from_paragraph_node(env, tmp) make_termnodes_from_paragraph_node(env, tmp)
ids.append(new_id) ids.append(new_id)
termtexts.append(termtext) termtexts.append(termtext)
termnodes.extend(new_termnodes) termnodes.extend(new_termnodes)
@ -370,8 +372,6 @@ class Glossary(Directive):
return messages + [node] return messages + [node]
token_re = re.compile('`(\w+)`', re.U)
def token_xrefs(text): def token_xrefs(text):
retnodes = [] retnodes = []
pos = 0 pos = 0
@ -516,7 +516,7 @@ class StandardDomain(Domain):
continue continue
node = document.ids[labelid] node = document.ids[labelid]
if name.isdigit() or 'refuri' in node or \ if name.isdigit() or 'refuri' in node or \
node.tagname.startswith('desc_'): node.tagname.startswith('desc_'):
# ignore footnote labels, labels automatically generated from a # ignore footnote labels, labels automatically generated from a
# link and object descriptions # link and object descriptions
continue continue
@ -525,7 +525,7 @@ class StandardDomain(Domain):
'in ' + env.doc2path(labels[name][0]), node) 'in ' + env.doc2path(labels[name][0]), node)
anonlabels[name] = docname, labelid anonlabels[name] = docname, labelid
if node.tagname == 'section': if node.tagname == 'section':
sectname = clean_astext(node[0]) # node[0] == title node sectname = clean_astext(node[0]) # node[0] == title node
elif node.tagname == 'figure': elif node.tagname == 'figure':
for n in node: for n in node:
if n.tagname == 'caption': if n.tagname == 'caption':
@ -558,13 +558,13 @@ class StandardDomain(Domain):
if node['refexplicit']: if node['refexplicit']:
# reference to anonymous label; the reference uses # reference to anonymous label; the reference uses
# the supplied link caption # the supplied link caption
docname, labelid = self.data['anonlabels'].get(target, ('','')) docname, labelid = self.data['anonlabels'].get(target, ('', ''))
sectname = node.astext() sectname = node.astext()
else: else:
# reference to named label; the final node will # reference to named label; the final node will
# contain the section name after the label # contain the section name after the label
docname, labelid, sectname = self.data['labels'].get(target, docname, labelid, sectname = self.data['labels'].get(target,
('','','')) ('', '', ''))
if not docname: if not docname:
return None return None
newnode = nodes.reference('', '', internal=True) newnode = nodes.reference('', '', internal=True)
@ -586,7 +586,7 @@ class StandardDomain(Domain):
return newnode return newnode
elif typ == 'keyword': elif typ == 'keyword':
# keywords are oddballs: they are referenced by named labels # keywords are oddballs: they are referenced by named labels
docname, labelid, _ = self.data['labels'].get(target, ('','','')) docname, labelid, _ = self.data['labels'].get(target, ('', '', ''))
if not docname: if not docname:
return None return None
return make_refnode(builder, fromdocname, docname, return make_refnode(builder, fromdocname, docname,