[Python-checkins] r68696 - in python/branches/py3k: Lib/logging/handlers.py

Sun Jan 18 01:08:45 CET 2009

Author: benjamin.peterson
Date: Sun Jan 18 01:08:45 2009
New Revision: 68696
Log:
Merged revisions 68459 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r68459 | kristjan.jonsson | 2009年01月09日 14:27:16 -0600 (2009年1月09日) | 1 line
 
 Issue 4336: Let users of HTTPConnection.endheaders() submit a message body to the function if required.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/logging/handlers.py
Modified: python/branches/py3k/Lib/logging/handlers.py
==============================================================================

--- python/branches/py3k/Lib/logging/handlers.py	(original)
+++ python/branches/py3k/Lib/logging/handlers.py	Sun Jan 18 01:08:45 2009
@@ -1024,9 +1024,7 @@
 h.putheader("Content-type",
 "application/x-www-form-urlencoded")
 h.putheader("Content-length", str(len(data)))
- h.endheaders()
- if self.method == "POST":
- h.send(data)
+ h.endheaders(data if self.method == "POST" else None)
 h.getreply() #can't do anything with the result
 except (KeyboardInterrupt, SystemExit):
 raise
