Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed debugerror and emailerrors (Bug#179713)

  • Loading branch information...
commit 51b438ff3e12f7c617f81821dabce1b6155ed928 1 parent ca35d12
@anandology anandology authored
Showing with 4 additions and 3 deletions.
  1. +3 −2 web/debugerror.py
  2. +1 −1  web/utils.py
View
5 web/debugerror.py
@@ -302,7 +302,7 @@ def debugerror():
"""
web.ctx.headers = [('Content-Type', 'text/html')]
- web.ctx.output = djangoerror()
+ return djangoerror()
def emailerrors(email_address, olderror):
"""
@@ -314,7 +314,7 @@ def emailerrors(email_address, olderror):
attachment containing the nice `debugerror` page.
"""
def emailerrors_internal():
- olderror()
+ error = olderror()
tb = sys.exc_info()
error_name = tb[0]
error_value = tb[1]
@@ -342,6 +342,7 @@ def emailerrors_internal():
"bug: %(error_name)s: %(error_value)s (%(path)s)" % locals(),
text,
headers={'Content-Type': 'multipart/mixed; boundary="----here----"'})
+ return error
return emailerrors_internal
View
2  web/utils.py
@@ -797,7 +797,7 @@ def safemarkdown(text):
text = markdown(text)
return text
-def sendmail(from_address, to_address, subject, message, headers=None):
+def sendmail(from_address, to_address, subject, message, headers=None, **kw):
"""
Sends the email message `message` with mail and envelope headers
for from `from_address_` to `to_address` with `subject`.
Please sign in to comment.
Something went wrong with that request. Please try again.