diff options
author | Janos Guljas <janos@resenje.org> | 2014-12-23 17:06:17 +0100 |
---|---|---|
committer | Janos Guljas <janos@resenje.org> | 2014-12-23 17:06:17 +0100 |
commit | 40fa1579e6d305f7a0e827806a92d26dfc34d3b9 (patch) | |
tree | 2a23a93c6b6ff1abcef6c7ed39e943a3cedaaaaa /contrib | |
parent | 7a057f144ad1bcb8622ddc628c085f04b41cc356 (diff) | |
download | uwsgi-40fa1579e6d305f7a0e827806a92d26dfc34d3b9.tar.gz |
Fix inconsistent use of tabs and spaces in indentation
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/twuwsgi.py | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/contrib/twuwsgi.py b/contrib/twuwsgi.py index a20400c0..ceb27817 100644 --- a/contrib/twuwsgi.py +++ b/contrib/twuwsgi.py @@ -12,7 +12,7 @@ class uWSGIClientResource(resource.LeafResource): resource.LeafResource.__init__(self) self.host = host self.port = port - self.app = app + self.app = app def renderHTTP(self, request): return uWSGI(request, self.app, self.host, self.port) @@ -33,52 +33,52 @@ class uWSGIClientProtocol(basic.LineReceiver): self.deferred = deferred self.stream = stream.ProducerStream() self.response = http.Response(stream=self.stream) - self.status_parsed = None + self.status_parsed = None def build_uwsgi_var(self,key,value): - return struct.pack('<H',len(key)) + key + struct.pack('<H',len(value)) + value + return struct.pack('<H',len(key)) + key + struct.pack('<H',len(value)) + value def connectionMade(self): - print self.request.__dict__ - # reset response parser - self.status_parsed = None - # build header and vars - vars = '' - - if self.request.stream.length: - vars += self.build_uwsgi_var('CONTENT_LENGTH',str(self.request.stream.length)) - - for hkey, hval in self.request.headers.getAllRawHeaders(): - # use a list, probably it will be extended - if hkey.lower() not in ('content-type'): - vars += self.build_uwsgi_var('HTTP_'+hkey.upper().replace('-','_'),','.join(hval)) - else: - vars += self.build_uwsgi_var(hkey.upper().replace('-','_'),','.join(hval)) - - - vars += self.build_uwsgi_var('REQUEST_METHOD', self.request.method) - vars += self.build_uwsgi_var('SCRIPT_NAME', self.request.uwsgi_app) - vars += self.build_uwsgi_var('PATH_INFO', self.request.path[len(self.request.uwsgi_app):]) - vars += self.build_uwsgi_var('QUERY_STRING', self.request.querystring) - vars += self.build_uwsgi_var('SERVER_NAME', self.request.host) - vars += self.build_uwsgi_var('SERVER_PORT', str(self.request.port)) - vars += self.build_uwsgi_var('SERVER_PROTOCOL', self.request.scheme.upper()+'/'+str(self.request.clientproto[0]) +'.'+str(self.request.clientproto[1])) - - vars += self.build_uwsgi_var('REQUEST_URI', self.request.uri) - vars += self.build_uwsgi_var('REMOTE_ADDR', self.request.remoteAddr.host) - - - self.transport.write(struct.pack('<BHB',0, len(vars),0)) - self.transport.write(vars) - - # send request data + print self.request.__dict__ + # reset response parser + self.status_parsed = None + # build header and vars + vars = '' + + if self.request.stream.length: + vars += self.build_uwsgi_var('CONTENT_LENGTH',str(self.request.stream.length)) + + for hkey, hval in self.request.headers.getAllRawHeaders(): + # use a list, probably it will be extended + if hkey.lower() not in ('content-type'): + vars += self.build_uwsgi_var('HTTP_'+hkey.upper().replace('-','_'),','.join(hval)) + else: + vars += self.build_uwsgi_var(hkey.upper().replace('-','_'),','.join(hval)) + + + vars += self.build_uwsgi_var('REQUEST_METHOD', self.request.method) + vars += self.build_uwsgi_var('SCRIPT_NAME', self.request.uwsgi_app) + vars += self.build_uwsgi_var('PATH_INFO', self.request.path[len(self.request.uwsgi_app):]) + vars += self.build_uwsgi_var('QUERY_STRING', self.request.querystring) + vars += self.build_uwsgi_var('SERVER_NAME', self.request.host) + vars += self.build_uwsgi_var('SERVER_PORT', str(self.request.port)) + vars += self.build_uwsgi_var('SERVER_PROTOCOL', self.request.scheme.upper()+'/'+str(self.request.clientproto[0]) +'.'+str(self.request.clientproto[1])) + + vars += self.build_uwsgi_var('REQUEST_URI', self.request.uri) + vars += self.build_uwsgi_var('REMOTE_ADDR', self.request.remoteAddr.host) + + + self.transport.write(struct.pack('<BHB',0, len(vars),0)) + self.transport.write(vars) + + # send request data stream.StreamProducer(self.request.stream).beginProducing(self.transport) def lineReceived(self, line): - if self.status_parsed is None: - self.response.code = line.split(' ',2)[1] - self.status_parsed = True - return + if self.status_parsed is None: + self.response.code = line.split(' ',2)[1] + self.status_parsed = True + return # end of headers if line == '': |