github.com
/
pypiserver
mirror of https://github.com/pypiserver/pypiserver
1
0
Fork 1
Code Releases Wiki Activity

upgrade bottle to 0.11.2

This commit is contained in:
Ralf Schmitt 2012-10-10 21:38:55 +02:00
parent 4cf8e4b72a
commit 9ce3c084e8
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pypiserver/bottle.py
View File

@ -16,7 +16,7 @@ License: MIT (see LICENSE for details)
from __future__ import with_statement from __future__ import with_statement
__author__ = 'Marcel Hellkamp' __author__ = 'Marcel Hellkamp'
__version__ = '0.11.1' __version__ = '0.11.2'
__license__ = 'MIT' __license__ = 'MIT'
# The gevent server adapter needs to patch some modules before they are imported # The gevent server adapter needs to patch some modules before they are imported
@ -807,7 +807,7 @@ class Bottle(object):
return self._cast(out) return self._cast(out)
if isinstance(out, HTTPResponse): if isinstance(out, HTTPResponse):
out.apply(response) out.apply(response)
return self._cast(out.output) return self._cast(out.body)
# File-like objects. # File-like objects.
if hasattr(out, 'read'): if hasattr(out, 'read'):
@ -2066,7 +2066,7 @@ def static_file(filename, root, mimetype='auto', download=False):
""" """
root = os.path.abspath(root) + os.sep root = os.path.abspath(root) + os.sep
filename = os.path.abspath(os.path.join(root, filename.strip('/\\'))) filename = os.path.abspath(os.path.join(root, filename.strip('/\\')))
header = dict() headers = dict()
if not filename.startswith(root): if not filename.startswith(root):
return HTTPError(403, "Access denied.") return HTTPError(403, "Access denied.")
@ -2077,41 +2077,41 @@ def static_file(filename, root, mimetype='auto', download=False):
if mimetype == 'auto': if mimetype == 'auto':
mimetype, encoding = mimetypes.guess_type(filename) mimetype, encoding = mimetypes.guess_type(filename)
if mimetype: header['Content-Type'] = mimetype if mimetype: headers['Content-Type'] = mimetype
if encoding: header['Content-Encoding'] = encoding if encoding: headers['Content-Encoding'] = encoding
elif mimetype: elif mimetype:
header['Content-Type'] = mimetype headers['Content-Type'] = mimetype
if download: if download:
download = os.path.basename(filename if download == True else download) download = os.path.basename(filename if download == True else download)
header['Content-Disposition'] = 'attachment; filename="%s"' % download headers['Content-Disposition'] = 'attachment; filename="%s"' % download
stats = os.stat(filename) stats = os.stat(filename)
header['Content-Length'] = clen = stats.st_size headers['Content-Length'] = clen = stats.st_size
lm = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime(stats.st_mtime)) lm = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime(stats.st_mtime))
header['Last-Modified'] = lm headers['Last-Modified'] = lm
ims = request.environ.get('HTTP_IF_MODIFIED_SINCE') ims = request.environ.get('HTTP_IF_MODIFIED_SINCE')
if ims: if ims:
ims = parse_date(ims.split(";")[0].strip()) ims = parse_date(ims.split(";")[0].strip())
if ims is not None and ims >= int(stats.st_mtime): 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()) headers['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime())
return HTTPResponse(status=304, header=header) return HTTPResponse(status=304, **headers)
body = '' if request.method == 'HEAD' else open(filename, 'rb') body = '' if request.method == 'HEAD' else open(filename, 'rb')
header["Accept-Ranges"] = "bytes" headers["Accept-Ranges"] = "bytes"
ranges = request.environ.get('HTTP_RANGE') ranges = request.environ.get('HTTP_RANGE')
if 'HTTP_RANGE' in request.environ: if 'HTTP_RANGE' in request.environ:
ranges = list(parse_range_header(request.environ['HTTP_RANGE'], clen)) ranges = list(parse_range_header(request.environ['HTTP_RANGE'], clen))
if not ranges: if not ranges:
return HTTPError(416, "Requested Range Not Satisfiable") return HTTPError(416, "Requested Range Not Satisfiable")
offset, end = ranges[0] offset, end = ranges[0]
header["Content-Range"] = "bytes %d-%d/%d" % (offset, end-1, clen) headers["Content-Range"] = "bytes %d-%d/%d" % (offset, end-1, clen)
header["Content-Length"] = str(end-offset) headers["Content-Length"] = str(end-offset)
if body: body = _file_iter_range(body, offset, end-offset) if body: body = _file_iter_range(body, offset, end-offset)
return HTTPResponse(body, header=header, status=206) return HTTPResponse(body, status=206, **headers)
return HTTPResponse(body, header=header) return HTTPResponse(body, **headers)