hgweb: remove now unnecessary explicit header() and footer()
authorAlexander Plavin <alexander@plav.in>
Wed, 24 Jul 2013 03:20:26 +0400
changeset 19906 1dba26575dba
parent 19905 078ccd780b71
child 19907 aebfbb68fe92
hgweb: remove now unnecessary explicit header() and footer() They became unnecessary after allowing custom-named entries in templates.
mercurial/hgweb/hgweb_mod.py
mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgweb_mod.py	Fri Aug 16 21:41:19 2013 +0400
+++ b/mercurial/hgweb/hgweb_mod.py	Wed Jul 24 03:20:26 2013 +0400
@@ -331,12 +331,6 @@
 
         # some functions for the templater
 
-        def header(**map):
-            yield tmpl('header', encoding=encoding.encoding, **map)
-
-        def footer(**map):
-            yield tmpl("footer", **map)
-
         def motd(**map):
             yield self.config("web", "motd", "")
 
@@ -373,8 +367,7 @@
                                              "staticurl": staticurl,
                                              "urlbase": urlbase,
                                              "repo": self.reponame,
-                                             "header": header,
-                                             "footer": footer,
+                                             "encoding": encoding.encoding,
                                              "motd": motd,
                                              "sessionvars": sessionvars,
                                              "pathdef": makebreadcrumb(req.url),
--- a/mercurial/hgweb/hgwebdir_mod.py	Fri Aug 16 21:41:19 2013 +0400
+++ b/mercurial/hgweb/hgwebdir_mod.py	Wed Jul 24 03:20:26 2013 +0400
@@ -408,12 +408,6 @@
 
     def templater(self, req):
 
-        def header(**map):
-            yield tmpl('header', encoding=encoding.encoding, **map)
-
-        def footer(**map):
-            yield tmpl("footer", **map)
-
         def motd(**map):
             if self.motd is not None:
                 yield self.motd
@@ -448,8 +442,7 @@
             staticurl += '/'
 
         tmpl = templater.templater(mapfile,
-                                   defaults={"header": header,
-                                             "footer": footer,
+                                   defaults={"encoding": encoding.encoding,
                                              "motd": motd,
                                              "url": url,
                                              "logourl": logourl,