Mercurial > hg
changeset 3883:a04f304eeded
Merging crew-stable
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 14 Dec 2006 16:10:06 +0100 |
parents | 59ec9c38f614 (current diff) 9c8488490724 (diff) |
children | d83b125b7d7e |
files | |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py Thu Dec 14 13:30:47 2006 +0100 +++ b/mercurial/hgweb/hgweb_mod.py Thu Dec 14 16:10:06 2006 +0100 @@ -655,7 +655,7 @@ def run_wsgi(self, req): def header(**map): header_file = cStringIO.StringIO( - ''.join(self.t("header", encoding = util._encoding, **map))) + ''.join(self.t("header", encoding=util._encoding, **map))) msg = mimetools.Message(header_file, 0) req.header(msg.items()) yield header_file.read()
--- a/mercurial/hgweb/hgwebdir_mod.py Thu Dec 14 13:30:47 2006 +0100 +++ b/mercurial/hgweb/hgwebdir_mod.py Thu Dec 14 16:10:06 2006 +0100 @@ -61,7 +61,8 @@ def run_wsgi(self, req): def header(**map): - header_file = cStringIO.StringIO(''.join(tmpl("header", **map))) + header_file = cStringIO.StringIO( + ''.join(tmpl("header", encoding=util._encoding, **map))) msg = mimetools.Message(header_file, 0) req.header(msg.items()) yield header_file.read()