fnexe.com/pypiserver
1
0
Fork 0
forked from github.com/pypiserver
Code Pull Requests Activity

update bottle to 0.11.5

Browse Source
This commit is contained in:
Ralf Schmitt 2013-01-22 23:04:53 +01:00
parent 2232295412
commit 408d288311
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pypiserver/bottle.py Executable file → Normal file
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.3' __version__ = '0.11.5'
__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
@ -561,14 +561,14 @@ class Bottle(object):
def mountpoint_wrapper(): def mountpoint_wrapper():
try: try:
request.path_shift(path_depth) request.path_shift(path_depth)
rs = BaseResponse([], 200) rs = HTTPResponse([])
def start_response(status, header): def start_response(status, headerlist):
rs.status = status rs.status = status
for name, value in header: rs.add_header(name, value) for name, value in headerlist: rs.add_header(name, value)
return rs.body.append return rs.body.append
body = app(request.environ, start_response) body = app(request.environ, start_response)
body = itertools.chain(rs.body, body) if body: rs.body = itertools.chain(rs.body, body)
return HTTPResponse(body, rs.status_code, rs.headers) return rs
finally: finally:
request.path_shift(-path_depth) request.path_shift(-path_depth)
@ -3099,7 +3099,7 @@ def template(*args, **kwargs):
adapter = kwargs.pop('template_adapter', SimpleTemplate) adapter = kwargs.pop('template_adapter', SimpleTemplate)
lookup = kwargs.pop('template_lookup', TEMPLATE_PATH) lookup = kwargs.pop('template_lookup', TEMPLATE_PATH)
tplid = (id(lookup), tpl) tplid = (id(lookup), tpl)
if tpl not in TEMPLATES or DEBUG: if tplid not in TEMPLATES or DEBUG:
settings = kwargs.pop('template_settings', {}) settings = kwargs.pop('template_settings', {})
if isinstance(tpl, adapter): if isinstance(tpl, adapter):
TEMPLATES[tplid] = tpl TEMPLATES[tplid] = tpl