summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-08-03 06:29:12 (GMT)
committerGeorg Brandl <georg@python.org>2011-08-03 06:29:12 (GMT)
commit83fad3e2cedeffb63544bc9357236f7ae9541024 (patch)
tree99ac17bae60858b463843ada1046f85ef8fb08f3
parent43234ab685996fc2d1ded4863986a797c1453853 (diff)
parent25e2cd13885207d41344313984322b608a26fbac (diff)
downloadcpython-83fad3e2cedeffb63544bc9357236f7ae9541024.zip
cpython-83fad3e2cedeffb63544bc9357236f7ae9541024.tar.gz
cpython-83fad3e2cedeffb63544bc9357236f7ae9541024.tar.bz2
Merge with 3.2.
-rw-r--r--Lib/http/client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/http/client.py b/Lib/http/client.py
index 82213c3..5775573 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -777,8 +777,8 @@ class HTTPConnection:
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.