| durin42 |
| hg-reviewers |
Now that everything is ported to consume from parsedrequest.qsparams,
we no longer have a need for wsgirequest.form. Let's remove all
references to it.
.. api::
The WSGI request object no longer exposes a ``form`` attribute containing parsed query string data. Use the ``qsparams`` attribute instead.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/hgweb_mod.py (7 lines) | |||
| M | mercurial/hgweb/request.py (1 line) |
| cmd = args.pop(0) | cmd = args.pop(0) | ||||
| style = cmd.rfind('-') | style = cmd.rfind('-') | ||||
| if style != -1: | if style != -1: | ||||
| req.qsparams['style'] = cmd[:style] | req.qsparams['style'] = cmd[:style] | ||||
| cmd = cmd[style + 1:] | cmd = cmd[style + 1:] | ||||
| # avoid accepting e.g. style parameter as command | # avoid accepting e.g. style parameter as command | ||||
| if util.safehasattr(webcommands, cmd): | if util.safehasattr(webcommands, cmd): | ||||
| wsgireq.form['cmd'] = [cmd] | |||||
| req.qsparams['cmd'] = cmd | req.qsparams['cmd'] = cmd | ||||
| if cmd == 'static': | if cmd == 'static': | ||||
| wsgireq.form['file'] = ['/'.join(args)] | |||||
| req.qsparams['file'] = '/'.join(args) | req.qsparams['file'] = '/'.join(args) | ||||
| else: | else: | ||||
| if args and args[0]: | if args and args[0]: | ||||
| node = args.pop(0).replace('%2F', '/') | node = args.pop(0).replace('%2F', '/') | ||||
| wsgireq.form['node'] = [node] | |||||
| req.qsparams['node'] = node | req.qsparams['node'] = node | ||||
| if args: | if args: | ||||
| wsgireq.form['file'] = args | |||||
| if 'file' in req.qsparams: | if 'file' in req.qsparams: | ||||
| del req.qsparams['file'] | del req.qsparams['file'] | ||||
| for a in args: | for a in args: | ||||
| req.qsparams.add('file', a) | req.qsparams.add('file', a) | ||||
| ua = req.headers.get('User-Agent', '') | ua = req.headers.get('User-Agent', '') | ||||
| if cmd == 'rev' and 'mercurial' in ua: | if cmd == 'rev' and 'mercurial' in ua: | ||||
| req.qsparams['style'] = 'raw' | req.qsparams['style'] = 'raw' | ||||
| if cmd == 'archive': | if cmd == 'archive': | ||||
| fn = req.qsparams['node'] | fn = req.qsparams['node'] | ||||
| for type_, spec in rctx.archivespecs.iteritems(): | for type_, spec in rctx.archivespecs.iteritems(): | ||||
| ext = spec[2] | ext = spec[2] | ||||
| if fn.endswith(ext): | if fn.endswith(ext): | ||||
| wsgireq.form['node'] = [fn[:-len(ext)]] | |||||
| req.qsparams['node'] = fn[:-len(ext)] | req.qsparams['node'] = fn[:-len(ext)] | ||||
| wsgireq.form['type'] = [type_] | |||||
| req.qsparams['type'] = type_ | req.qsparams['type'] = type_ | ||||
| else: | else: | ||||
| cmd = req.qsparams.get('cmd', '') | cmd = req.qsparams.get('cmd', '') | ||||
| # process the web interface request | # process the web interface request | ||||
| try: | try: | ||||
| tmpl = rctx.templater(wsgireq, req) | tmpl = rctx.templater(wsgireq, req) | ||||
| ctype = tmpl('mimetype', encoding=encoding.encoding) | ctype = tmpl('mimetype', encoding=encoding.encoding) | ||||
| ctype = templater.stringify(ctype) | ctype = templater.stringify(ctype) | ||||
| # check read permissions non-static content | # check read permissions non-static content | ||||
| if cmd != 'static': | if cmd != 'static': | ||||
| self.check_perm(rctx, wsgireq, None) | self.check_perm(rctx, wsgireq, None) | ||||
| if cmd == '': | if cmd == '': | ||||
| wsgireq.form['cmd'] = [tmpl.cache['default']] | |||||
| req.qsparams['cmd'] = tmpl.cache['default'] | req.qsparams['cmd'] = tmpl.cache['default'] | ||||
| cmd = req.qsparams['cmd'] | cmd = req.qsparams['cmd'] | ||||
| # Don't enable caching if using a CSP nonce because then it wouldn't | # Don't enable caching if using a CSP nonce because then it wouldn't | ||||
| # be a nonce. | # be a nonce. | ||||
| if rctx.configbool('web', 'cache') and not rctx.nonce: | if rctx.configbool('web', 'cache') and not rctx.nonce: | ||||
| caching(self, wsgireq) # sets ETag header or raises NOT_MODIFIED | caching(self, wsgireq) # sets ETag header or raises NOT_MODIFIED | ||||
| if cmd not in webcommands.__all__: | if cmd not in webcommands.__all__: | ||||
| inp = util.cappedreader(inp, int(wsgienv[r'CONTENT_LENGTH'])) | inp = util.cappedreader(inp, int(wsgienv[r'CONTENT_LENGTH'])) | ||||
| self.err = wsgienv[r'wsgi.errors'] | self.err = wsgienv[r'wsgi.errors'] | ||||
| self.threaded = wsgienv[r'wsgi.multithread'] | self.threaded = wsgienv[r'wsgi.multithread'] | ||||
| self.multiprocess = wsgienv[r'wsgi.multiprocess'] | self.multiprocess = wsgienv[r'wsgi.multiprocess'] | ||||
| self.run_once = wsgienv[r'wsgi.run_once'] | self.run_once = wsgienv[r'wsgi.run_once'] | ||||
| self.env = wsgienv | self.env = wsgienv | ||||
| self.req = parserequestfromenv(wsgienv, inp) | self.req = parserequestfromenv(wsgienv, inp) | ||||
| self.form = self.req.qsparams.asdictoflists() | |||||
| self.res = wsgiresponse(self.req, start_response) | self.res = wsgiresponse(self.req, start_response) | ||||
| self._start_response = start_response | self._start_response = start_response | ||||
| self.server_write = None | self.server_write = None | ||||
| self.headers = [] | self.headers = [] | ||||
| def respond(self, status, type, filename=None, body=None): | def respond(self, status, type, filename=None, body=None): | ||||
| if not isinstance(type, str): | if not isinstance(type, str): | ||||
| type = pycompat.sysstr(type) | type = pycompat.sysstr(type) | ||||