Encode strings after they have been formatted

This commit is contained in:
Daniel Neuhäuser
2010-06-16 23:20:30 +02:00
parent 4534657f3e
commit bf14a7c362

View File

@@ -727,10 +727,12 @@ class StandaloneHTMLBuilder(Builder):
self.info(bold('dumping object inventory... '), nonl=True) self.info(bold('dumping object inventory... '), nonl=True)
f = open(path.join(self.outdir, INVENTORY_FILENAME), 'wb') f = open(path.join(self.outdir, INVENTORY_FILENAME), 'wb')
try: try:
f.write('# Sphinx inventory version 2\n') f.write((u'# Sphinx inventory version 2\n'
f.write('# Project: %s\n' % self.config.project.encode('utf-8')) u'# Project: %s\n'
f.write('# Version: %s\n' % self.config.version.encode('utf-8')) u'# Version: %s\n'
f.write('# The remainder of this file is compressed using zlib.\n') u'# The remainder of this file is compressed using zlib.\n'
% (self.config.project, self.config.version))\
.encode('utf-8'))
compressor = zlib.compressobj(9) compressor = zlib.compressobj(9)
for domainname, domain in self.env.domains.iteritems(): for domainname, domain in self.env.domains.iteritems():
for name, dispname, type, docname, anchor, prio in \ for name, dispname, type, docname, anchor, prio in \
@@ -742,11 +744,9 @@ class StandaloneHTMLBuilder(Builder):
if dispname == name: if dispname == name:
dispname = u'-' dispname = u'-'
f.write(compressor.compress( f.write(compressor.compress(
'%s %s:%s %s %s %s\n' % (name.encode('utf-8'), (u'%s %s:%s %s %s %s\n' % (name, domainname, type, prio,
domainname.encode('utf-8'), uri, dispname))\
type.encode('utf-8'), prio, .encode('utf-8')))
uri.encode('utf-8'),
dispname.encode('utf-8'))))
f.write(compressor.flush()) f.write(compressor.flush())
finally: finally:
f.close() f.close()