From: Victor Stinner Date: Fri, 16 Apr 2010 15:48:19 +0000 (+0000) Subject: Merged revisions 80112 via svnmerge from X-Git-Tag: v3.1.3rc1~939 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f45c368f4dc40a9573a0464e3ac7c5c1678cb7f7;p=python Merged revisions 80112 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80112 | victor.stinner | 2010-04-16 15:28:05 +0200 (ven., 16 avril 2010) | 3 lines Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII using backslashreplace error handler. ........ --- diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py index aef2eb223f..04820bfc56 100644 --- a/Lib/xmlrpc/server.py +++ b/Lib/xmlrpc/server.py @@ -469,7 +469,9 @@ class SimpleXMLRPCRequestHandler(BaseHTTPRequestHandler): if hasattr(self.server, '_send_traceback_header') and \ self.server._send_traceback_header: self.send_header("X-exception", str(e)) - self.send_header("X-traceback", traceback.format_exc()) + trace = traceback.format_exc() + trace = str(trace.encode('ASCII', 'backslashreplace'), 'ASCII') + self.send_header("X-traceback", trace) self.end_headers() else: diff --git a/Misc/NEWS b/Misc/NEWS index 1a6d17ade1..1ed921c028 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -28,6 +28,9 @@ Core and Builtins Library ------- +- Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII + using backslashreplace error handler + - Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. - Issue #8383: pickle and pickletools use surrogatepass error handler when