Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging crew-stable
authorThomas Arendsen Hein <thomas@intevation.de>
Thu, 14 Dec 2006 16:10:06 +0100
changeset 3883 a04f304eeded
parent 3881 59ec9c38f614 (current diff)
parent 3882 9c8488490724 (diff)
child 3886 d83b125b7d7e
Merging crew-stable
--- 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()
Mercurial