diff options
author | Georg Brandl <georg@python.org> | 2010-01-02 21:03:56 +0100 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-01-02 21:03:56 +0100 |
commit | faeec5cbbbcaec4a0c2ce12f0d41ecf3f225f5b4 (patch) | |
tree | 50fe275b8db2751541d4d20be7656aca3bc0eed4 /sphinx/builders/devhelp.py | |
parent | ed78dc7ff0102a2d10d934259f5c046fc5e280f6 (diff) | |
parent | f3a2854ba97b33548c92490e0731e91014fa7c20 (diff) | |
download | sphinx-git-faeec5cbbbcaec4a0c2ce12f0d41ecf3f225f5b4.tar.gz |
merge with trunk
Diffstat (limited to 'sphinx/builders/devhelp.py')
-rw-r--r-- | sphinx/builders/devhelp.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sphinx/builders/devhelp.py b/sphinx/builders/devhelp.py index d7acf764e..88fccadcb 100644 --- a/sphinx/builders/devhelp.py +++ b/sphinx/builders/devhelp.py @@ -12,6 +12,7 @@ """ import os +import re import cgi import sys from os import path @@ -30,7 +31,7 @@ except ImportError: try: import elementtree.ElementTree as etree except ImportError: - import cElementTree.ElemenTree as etree + import cElementTree as etree try: import gzip @@ -114,11 +115,14 @@ class DevhelpBuilder(StandaloneHTMLBuilder): else: for i, ref in enumerate(refs): etree.SubElement(functions, 'function', - name="%s [%d]" % (title, i), link=ref) + name="[%d] %s" % (i, title), + link=ref) if subitems: + parent_title = re.sub(r'\s*\(.*\)\s*$', '', title) for subitem in subitems: - write_index(subitem[0], subitem[1], []) + write_index("%s %s" % (parent_title, subitem[0]), + subitem[1], []) for (key, group) in index: for title, (refs, subitems) in group: |