summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-05-15 11:37:00 +0200
committerGeorg Brandl <georg@python.org>2011-05-15 11:37:00 +0200
commitbfbfde2649b1acd53a037a0c55d568499c0eec86 (patch)
tree4f211ac5c69708f736d61dbabc36d4e6ad075021
parenta66ede2a7cd735d6baddc8a435a19c67cc638109 (diff)
downloadsphinx-bfbfde2649b1acd53a037a0c55d568499c0eec86.tar.gz
Closes #693: Fix double encoding done when writing HTMLHelp .hhk files.
-rw-r--r--CHANGES2
-rw-r--r--sphinx/builders/htmlhelp.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index ddf958f4..235214e4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
Release 1.0.8 (in development)
==============================
+* #693: Fix double encoding done when writing HTMLHelp .hhk files.
+
* #647: Do not apply SmartyPants in parsed-literal blocks.
diff --git a/sphinx/builders/htmlhelp.py b/sphinx/builders/htmlhelp.py
index 2c9fe530..9d367183 100644
--- a/sphinx/builders/htmlhelp.py
+++ b/sphinx/builders/htmlhelp.py
@@ -258,7 +258,7 @@ class HTMLHelpBuilder(StandaloneHTMLBuilder):
def write_index(title, refs, subitems):
def write_param(name, value):
item = ' <param name="%s" value="%s">\n' % (name, value)
- f.write(item.encode(self.encoding, 'xmlcharrefreplace'))
+ f.write(item)
title = cgi.escape(title)
f.write('<LI> <OBJECT type="text/sitemap">\n')
write_param('Keyword', title)