reverted HTTP(status_message) because redundant

This commit is contained in:
mdipierro
2013-05-19 22:14:43 -05:00
parent 9f695c783e
commit 0afc18fd24
3 changed files with 18 additions and 24 deletions
+9 -19
View File
@@ -69,14 +69,12 @@ class HTTP(BaseException):
status,
body='',
cookies=None,
status_message='',
**headers
):
self.status = status
self.body = body
self.headers = headers
self.cookies2headers(cookies)
self.status_message = status_message
def cookies2headers(self, cookies):
if cookies and len(cookies) > 0:
@@ -87,14 +85,10 @@ class HTTP(BaseException):
env = env or {}
status = self.status
headers = self.headers
status_message = status
if status in defined_status:
if status_message:
status = str(status) + ' ' + str(status_message)
else:
status = '%d %s' % (status, defined_status[status])
status = '%d %s' % (status, defined_status[status])
else:
status = str(status) + ' ' + status_message
status = str(status)
if not regex_status.match(status):
status = '500 %s' % (defined_status[500])
headers.setdefault('Content-Type', 'text/html; charset=UTF-8')
@@ -129,19 +123,15 @@ class HTTP(BaseException):
message elements that are not defined are omitted
"""
msg = '%(status)d'
status_message = ''
if self.status_message:
status_message = self.status_message
elif self.status in defined_status:
status_message = defined_status.get(self.status)
if status_message:
msg = '%(status)d %(defined_status)s'
msg = '%(status)s'
if self.status in defined_status:
msg = '%(status)s %(defined_status)s'
if 'web2py_error' in self.headers:
msg += ' [%(web2py_error)s]'
return msg % dict(status=self.status,
defined_status=status_message,
web2py_error=self.headers.get('web2py_error'))
return msg % dict(
status=self.status,
defined_status=defined_status.get(self.status),
web2py_error=self.headers.get('web2py_error'))
def __str__(self):
"stringify me"