[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2.

Wed Aug 3 08:28:27 CEST 2011

http://hg.python.org/cpython/rev/597645db3cec
changeset: 71728:597645db3cec
parent: 71726:4862df5cbedb
parent: 71727:0a9b0712f51a
user: Georg Brandl <georg at python.org>
date: Wed Aug 03 08:29:12 2011 +0200
summary:
 Merge with 3.2.
files:
 Lib/http/client.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/http/client.py b/Lib/http/client.py
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -777,8 +777,8 @@
 for d in data:
 self.sock.sendall(d)
 else:
- raise TypeError("data should be a bytes-like object\
- or an iterable, got %r " % type(data))
+ raise TypeError("data should be a bytes-like object "
+ "or an iterable, got %r" % type(data))
 
 def _output(self, s):
 """Add a line of output to the current request buffer.
-- 
Repository URL: http://hg.python.org/cpython
