Mercurial > public > mercurial-scm > hg
diff mercurial/hgweb/request.py @ 18347:853221386f48
hgweb: make type a mandatory parameter to request.respond
There will thus always be headers and the runtime check can be removed.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 15 Jan 2013 01:05:12 +0100 |
| parents | 590056e0ec2f |
| children | 764a758780b6 |
line wrap: on
line diff
--- a/mercurial/hgweb/request.py Tue Jan 15 01:05:12 2013 +0100 +++ b/mercurial/hgweb/request.py Tue Jan 15 01:05:12 2013 +0100 @@ -70,12 +70,10 @@ for s in util.filechunkiter(self.inp, limit=length): pass - def respond(self, status, type=None, filename=None, length=None): + def respond(self, status, type, filename=None, length=None): if self._start_response is not None: self.httphdr(type, filename, length) - if not self.headers: - raise RuntimeError("request.write called before headers sent") for k, v in self.headers: if not isinstance(v, str): @@ -125,10 +123,9 @@ def header(self, headers=[('Content-Type','text/html')]): self.headers.extend(headers) - def httphdr(self, type=None, filename=None, length=None, headers={}): + def httphdr(self, type, filename=None, length=None, headers={}): headers = headers.items() - if type is not None: - headers.append(('Content-Type', type)) + headers.append(('Content-Type', type)) if filename: filename = (filename.split('/')[-1] .replace('\\', '\\\\').replace('"', '\\"'))