# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1520807703 25200
# Node ID 6a0e4efbc61e8aaceee8de79444927ca6e5d147e
# Parent  93717f082af9a2d8b1bb50b62f11a2f26434c05c
hgweb: pass modern request type into templater()

Only a handful of consumers of wsgirequest remaining in this
file...

Differential Revision: https://phab.mercurial-scm.org/D2828

diff -r 93717f082af9 -r 6a0e4efbc61e mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py	Sun Mar 11 15:37:59 2018 -0700
+++ b/mercurial/hgweb/hgwebdir_mod.py	Sun Mar 11 15:35:03 2018 -0700
@@ -369,7 +369,7 @@
                 wsgireq.headers.append(('Content-Security-Policy', csp))
 
             virtual = req.dispatchpath.strip('/')
-            tmpl = self.templater(wsgireq, nonce)
+            tmpl = self.templater(req, nonce)
             ctype = tmpl('mimetype', encoding=encoding.encoding)
             ctype = templater.stringify(ctype)
 
@@ -485,7 +485,7 @@
 
         return res.sendresponse()
 
-    def templater(self, wsgireq, nonce):
+    def templater(self, req, nonce):
 
         def motd(**map):
             if self.motd is not None:
@@ -497,7 +497,7 @@
             return self.ui.config(section, name, default, untrusted)
 
         vars = {}
-        styles, (style, mapfile) = hgweb_mod.getstyle(wsgireq.req, config,
+        styles, (style, mapfile) = hgweb_mod.getstyle(req, config,
                                                       self.templatepath)
         if style == styles[0]:
             vars['style'] = style
@@ -506,14 +506,14 @@
         logourl = config('web', 'logourl')
         logoimg = config('web', 'logoimg')
         staticurl = (config('web', 'staticurl')
-                     or wsgireq.req.apppath + '/static/')
+                     or req.apppath + '/static/')
         if not staticurl.endswith('/'):
             staticurl += '/'
 
         defaults = {
             "encoding": encoding.encoding,
             "motd": motd,
-            "url": wsgireq.req.apppath + '/',
+            "url": req.apppath + '/',
             "logourl": logourl,
             "logoimg": logoimg,
             "staticurl": staticurl,