[Python-checkins] r80118 - in python/branches/release31-maint: Lib/xmlrpc/server.py Misc/NEWS

[victor.stinner]

Author: victor.stinner
Date: Fri Apr 16 17:48:19 2010
New Revision: 80118

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/xmlrpc/server.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/xmlrpc/server.py
==============================================================================
--- python/branches/release31-maint/Lib/xmlrpc/server.py	(original)
+++ python/branches/release31-maint/Lib/xmlrpc/server.py	Fri Apr 16 17:48:19 2010
@@ -469,7 +469,9 @@
             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:

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Fri Apr 16 17:48:19 2010
@@ -28,6 +28,9 @@
 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