diff options
author | Marcel Hellkamp <marc@gsites.de> | 2010-06-13 22:55:55 +0200 |
---|---|---|
committer | Marcel Hellkamp <marc@gsites.de> | 2010-06-13 22:55:55 +0200 |
commit | 98b5cef6d242bb997b29209ac3ed0c9ea7863cdf (patch) | |
tree | 475f3d73e591eb2c92343473aaffbccf19c6030a | |
parent | 58afedea1402c29e9d006c9e3fd4c19db3d442b7 (diff) | |
download | bottle-98b5cef6d242bb997b29209ac3ed0c9ea7863cdf.tar.gz |
Whitespace
-rwxr-xr-x | bottle.py | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1007,8 +1007,8 @@ def static_file(filename, root, guessmime=True, mimetype=None, download=False): ims = ims.split(";")[0].strip() # IE sends "<date>; length=146" ims = parse_date(ims) if ims is not None and ims >= int(stats.st_mtime): - header['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime()) - return HTTPResponse(status=304, header=header) + header['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime()) + return HTTPResponse(status=304, header=header) header['Content-Length'] = stats.st_size if request.method == 'HEAD': return HTTPResponse('', header=header) @@ -1062,7 +1062,7 @@ def cookie_decode(data, key): if cookie_is_encoded(data): sig, msg = data.split(u'?'.encode('ascii'),1) #2to3 hack if sig[1:] == base64.b64encode(hmac.new(key, msg).digest()): - return pickle.loads(base64.b64decode(msg)) + return pickle.loads(base64.b64decode(msg)) return None @@ -1195,8 +1195,8 @@ class CGIServer(ServerAdapter): class FlupFCGIServer(ServerAdapter): def run(self, handler): # pragma: no cover - import flup.server.fcgi - flup.server.fcgi.WSGIServer(handler, bindAddress=(self.host, self.port)).run() + import flup.server.fcgi + flup.server.fcgi.WSGIServer(handler, bindAddress=(self.host, self.port)).run() class WSGIRefServer(ServerAdapter): @@ -1372,8 +1372,8 @@ def reloader_run(server, app, interval): print 'Parent Bottle process killed' print 'Use Ctrl-C to exit.' else: - continue print "Restarting..." + continue app.serve = False time.sleep(interval) # be nice and wait for running requests sys.exit(3) |