summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2012-02-10 20:37:44 +0100
committerMarcel Hellkamp <marc@gsites.de>2012-02-10 20:41:55 +0100
commitb1543d8d0b83b1269cb1716ae6ad130d72c0486f (patch)
tree8697999937e5ed15e85b000ad0505d9b897edfc7
parente064c0239de7138c97453c8abae49e0e485059f8 (diff)
downloadbottle-b1543d8d0b83b1269cb1716ae6ad130d72c0486f.tar.gz
fix #281: DeprecationWarning in Botle.mount() and typo.
Thanks chicha
-rwxr-xr-xbottle.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bottle.py b/bottle.py
index c650717..1ed7185 100755
--- a/bottle.py
+++ b/bottle.py
@@ -580,7 +580,7 @@ class Bottle(object):
for name, value in header: rs.add_header(name, value)
return rs.body.append
rs.body = itertools.chain(rs.body, app(request.environ, start_response))
- return HTTPResponse(rs.body, rs.status, rs.headers)
+ return HTTPResponse(rs.body, rs.status_code, rs.headers)
finally:
request.path_shift(-path_depth)
@@ -1264,7 +1264,7 @@ class BaseResponse(object):
self._status_line = status or ('%d Unknown' % code)
def _get_status(self):
- depr('BaseReuqest.status will change to return a string in 0.11. Use'\
+ depr('BaseRequest.status will change to return a string in 0.11. Use'\
' status_line and status_code to make sure.') #0.10
return self._status_code