Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/hgweb/request.py @ 18347:853221386f48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
18346:6c2563b2c1c6 18347:853221386f48
68 '''need to read all data from request, httplib is half-duplex''' 68 '''need to read all data from request, httplib is half-duplex'''
69 length = int(self.env.get('CONTENT_LENGTH') or 0) 69 length = int(self.env.get('CONTENT_LENGTH') or 0)
70 for s in util.filechunkiter(self.inp, limit=length): 70 for s in util.filechunkiter(self.inp, limit=length):
71 pass 71 pass
72 72
73 def respond(self, status, type=None, filename=None, length=None): 73 def respond(self, status, type, filename=None, length=None):
74 if self._start_response is not None: 74 if self._start_response is not None:
75 75
76 self.httphdr(type, filename, length) 76 self.httphdr(type, filename, length)
77 if not self.headers:
78 raise RuntimeError("request.write called before headers sent")
79 77
80 for k, v in self.headers: 78 for k, v in self.headers:
81 if not isinstance(v, str): 79 if not isinstance(v, str):
82 raise TypeError('header value must be string: %r' % v) 80 raise TypeError('header value must be string: %r' % v)
83 81
123 return None 121 return None
124 122
125 def header(self, headers=[('Content-Type','text/html')]): 123 def header(self, headers=[('Content-Type','text/html')]):
126 self.headers.extend(headers) 124 self.headers.extend(headers)
127 125
128 def httphdr(self, type=None, filename=None, length=None, headers={}): 126 def httphdr(self, type, filename=None, length=None, headers={}):
129 headers = headers.items() 127 headers = headers.items()
130 if type is not None: 128 headers.append(('Content-Type', type))
131 headers.append(('Content-Type', type))
132 if filename: 129 if filename:
133 filename = (filename.split('/')[-1] 130 filename = (filename.split('/')[-1]
134 .replace('\\', '\\\\').replace('"', '\\"')) 131 .replace('\\', '\\\\').replace('"', '\\"'))
135 headers.append(('Content-Disposition', 132 headers.append(('Content-Disposition',
136 'inline; filename="%s"' % filename)) 133 'inline; filename="%s"' % filename))