diff options
| author | Georg Brandl <georg@python.org> | 2015-01-21 07:26:11 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2015-01-21 07:26:11 +0100 |
| commit | 8cff73f38805fbd29af82fb2aa47956a4a93d22e (patch) | |
| tree | a19277cdc2535a1c71ed42311df14b8e9908aea3 /pygments/sphinxext.py | |
| parent | 7b9fa24091fe62a1be03c5c7889ce1ba6248c6a2 (diff) | |
| parent | 181e8bff0a08fe2e31607991ef2c5b5b5d060f1b (diff) | |
| download | pygments-8cff73f38805fbd29af82fb2aa47956a4a93d22e.tar.gz | |
merge with stable
Diffstat (limited to 'pygments/sphinxext.py')
| -rw-r--r-- | pygments/sphinxext.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pygments/sphinxext.py b/pygments/sphinxext.py index 82bc6543..85a434ad 100644 --- a/pygments/sphinxext.py +++ b/pygments/sphinxext.py @@ -133,8 +133,8 @@ class PygmentsDoc(Directive): if isinstance(docstring, bytes): docstring = docstring.decode('utf8') heading = cls.__name__ - out.append(FMTERDOC % (heading, ', '.join(data[1]) or 'None', - ', '.join(data[2]).replace('*', '\\*') or 'None', + out.append(FMTERDOC % (heading, ', '.join(data[2]) or 'None', + ', '.join(data[3]).replace('*', '\\*') or 'None', docstring)) return ''.join(out) |