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

Fixes #816: Fix encoding issues in the Qt help builder.

Browse Source
This commit is contained in:
Georg Brandl
2012-03-10 21:02:08 +01:00
parent 95f0155227
commit 7ecc658c71
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -53,6 +53,8 @@ Release 1.1.3 (in development)
* #873: Fix assertion errors with empty ``only`` directives.
* #816: Fix encoding issues in the Qt help builder.
Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
======================================================================

14
sphinx/builders/qthelp.py
View File

@@ -19,6 +19,7 @@ from docutils import nodes
from sphinx import addnodes
from sphinx.builders.html import StandaloneHTMLBuilder
from sphinx.util import force_decode
from sphinx.util.pycompat import htmlescape
@@ -130,16 +131,17 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
for indexname, indexcls, content, collapse in self.domain_indices:
item = section_template % {'title': indexcls.localname,
'ref': '%s.html' % indexname}
sections.append((' ' * 4 * 4 + item).encode('utf-8'))
sections.append(' ' * 4 * 4 + item)
# sections may be unicode strings or byte strings, we have to make sure
# they are all byte strings before joining them
# they are all unicode strings before joining them
new_sections = []
for section in sections:
if isinstance(section, unicode):
new_sections.append(section.encode('utf-8'))
if not isinstance(section, unicode):
# XXX is this really necessary?
new_sections.append(force_decode(section, None))
else:
new_sections.append(section)
sections = u'\n'.encode('utf-8').join(new_sections)
sections = u'\n'.join(new_sections)
# keywords
keywords = []
@@ -147,7 +149,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
for (key, group) in index:
for title, (refs, subitems) in group:
keywords.extend(self.build_keywords(title, refs, subitems))
keywords = '\n'.join(keywords)
keywords = u'\n'.join(keywords)
# files
if not outdir.endswith(os.sep):