Merge from 3.2

This commit is contained in:
Senthil Kumaran 2011-03-17 16:48:26 +08:00
commit 1da1906871

View file

@ -103,15 +103,20 @@ import copy
# Default error message template # Default error message template
DEFAULT_ERROR_MESSAGE = """\ DEFAULT_ERROR_MESSAGE = """\
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<title>Error response</title> <title>Error response</title>
</head> </head>
<body> <body>
<h1>Error response</h1> <h1>Error response</h1>
<p>Error code %(code)d. <p>Error code: %(code)d</p>
<p>Message: %(message)s. <p>Message: %(message)s.</p>
<p>Error code explanation: %(code)s = %(explain)s. <p>Error code explanation: %(code)s - %(explain)s.</p>
</body> </body>
</html>
""" """
DEFAULT_ERROR_CONTENT_TYPE = "text/html;charset=utf-8" DEFAULT_ERROR_CONTENT_TYPE = "text/html;charset=utf-8"