From 996e13c838a9926087532755ea43b7ecba1ddb50 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sat, 2 Oct 2010 10:35:24 +0000 Subject: [PATCH] Merged revisions 85169 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85169 | senthil.kumaran | 2010-10-02 16:03:13 +0530 (Sat, 02 Oct 2010) | 3 lines Use proper variable name 'data' instead of 'str' in the send method. ........ --- Lib/http/client.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Lib/http/client.py b/Lib/http/client.py index d490b3ded6..9348870c3d 100644 --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -724,8 +724,8 @@ class HTTPConnection: self.__response = None self.__state = _CS_IDLE - def send(self, str): - """Send `str' to the server.""" + def send(self, data): + """Send `data' to the server.""" if self.sock is None: if self.auto_open: self.connect() @@ -738,14 +738,14 @@ class HTTPConnection: # NOTE: we DO propagate the error, though, because we cannot simply # ignore the error... the caller will know if they can retry. if self.debuglevel > 0: - print("send:", repr(str)) + print("send:", repr(data)) blocksize = 8192 - if hasattr(str, "read") : + if hasattr(data, "read") : if self.debuglevel > 0: print("sendIng a read()able") encode = False try: - mode = str.mode + mode = data.mode except AttributeError: # io.BytesIO and other file-like objects don't have a `mode` # attribute. @@ -756,14 +756,14 @@ class HTTPConnection: if self.debuglevel > 0: print("encoding file using iso-8859-1") while 1: - data = str.read(blocksize) - if not data: + datablock = data.read(blocksize) + if not datablock: break if encode: - data = data.encode("iso-8859-1") - self.sock.sendall(data) + datablock = datablock.encode("iso-8859-1") + self.sock.sendall(datablock) else: - self.sock.sendall(str) + self.sock.sendall(data) def _output(self, s): """Add a line of output to the current request buffer. -- 2.40.0