summaryrefslogtreecommitdiff
path: root/sphinx/util/docfields.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-03-02 08:37:54 +0100
committerGeorg Brandl <georg@python.org>2014-03-02 08:37:54 +0100
commitdb0f7ccc705b37617faf7c6139e96dc826dfdb22 (patch)
tree7f6b06b863e28bd69ddebc27db5f1260500dc1d3 /sphinx/util/docfields.py
parenta2c975307c30318b16c245944d694622c7c925f0 (diff)
parentc68104b1be74b8b102a2f3bf394e03072c760cfa (diff)
downloadsphinx-git-db0f7ccc705b37617faf7c6139e96dc826dfdb22.tar.gz
merge with stable
Diffstat (limited to 'sphinx/util/docfields.py')
-rw-r--r--sphinx/util/docfields.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/util/docfields.py b/sphinx/util/docfields.py
index 7e167d9e0..abb732886 100644
--- a/sphinx/util/docfields.py
+++ b/sphinx/util/docfields.py
@@ -67,7 +67,7 @@ class Field(object):
fieldname += nodes.Text(' ')
fieldname += self.make_xref(self.rolename, domain,
fieldarg, nodes.Text)
- fieldbody = nodes.field_body('', nodes.paragraph('', '', content))
+ fieldbody = nodes.field_body('', nodes.paragraph('', '', *content))
return nodes.field('', fieldname, fieldbody)
@@ -272,10 +272,10 @@ class DocFieldTransformer(object):
groupindices[typename] = len(entries)
group = [typedesc, []]
entries.append(group)
- entry = typedesc.make_entry(fieldarg, translatable_content)
+ entry = typedesc.make_entry(fieldarg, [translatable_content])
group[1].append(entry)
else:
- entry = typedesc.make_entry(fieldarg, translatable_content)
+ entry = typedesc.make_entry(fieldarg, [translatable_content])
entries.append([typedesc, entry])
# step 2: all entries are collected, construct the new field list