Mailman 3 August 2005 - Python-checkins

python/dist/src/Lib/test test_urllib.py, 1.16, 1.17
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11533/Lib/test Modified Files: test_urllib.py Log Message: patch [ 810023 ] Fix for off-by-one bug in urllib.URLopener.retrieve Index: test_urllib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_urllib.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- test_urllib.py 29 Jun 2004 13:07:53 -0000 1.16 +++ test_urllib.py 26 Aug 2005 08:51:34 -0000 1.17 @@ -6,6 +6,7 @@ from test import test_support import os import mimetools +import tempfile import StringIO def hexescape(char): @@ -125,15 +126,53 @@ """Test urllib.urlretrieve() on local files""" def setUp(self): + # Create a list of temporary files. Each item in the list is a file + # name (absolute path or relative to the current working directory). + # All files in this list will be deleted in the tearDown method. Note, + # this only helps to makes sure temporary files get deleted, but it + # does nothing about trying to close files that may still be open. It + # is the responsibility of the developer to properly close files even + # when exceptional conditions occur. + self.tempFiles = [] + # Create a temporary file. + self.registerFileForCleanUp(test_support.TESTFN) self.text = 'testing urllib.urlretrieve' - FILE = file(test_support.TESTFN, 'wb') - FILE.write(self.text) - FILE.close() + try: + FILE = file(test_support.TESTFN, 'wb') + FILE.write(self.text) + FILE.close() + finally: + try: FILE.close() + except: pass def tearDown(self): - # Delete the temporary file. - os.remove(test_support.TESTFN) + # Delete the temporary files. + for each in self.tempFiles: + try: os.remove(each) + except: pass + + def constructLocalFileUrl(self, filePath): + return "file://%s" % urllib.pathname2url(os.path.abspath(filePath)) + + def createNewTempFile(self, data=""): + """Creates a new temporary file containing the specified data, + registers the file for deletion during the test fixture tear down, and + returns the absolute path of the file.""" + + newFd, newFilePath = tempfile.mkstemp() + try: + self.registerFileForCleanUp(newFilePath) + newFile = os.fdopen(newFd, "wb") + newFile.write(data) + newFile.close() + finally: + try: newFile.close() + except: pass + return newFilePath + + def registerFileForCleanUp(self, fileName): + self.tempFiles.append(fileName) def test_basic(self): # Make sure that a local file just gets its own location returned and @@ -147,15 +186,19 @@ def test_copy(self): # Test that setting the filename argument works. second_temp = "%s.2" % test_support.TESTFN - result = urllib.urlretrieve("file:%s" % test_support.TESTFN, second_temp) + self.registerFileForCleanUp(second_temp) + result = urllib.urlretrieve(self.constructLocalFileUrl( + test_support.TESTFN), second_temp) self.assertEqual(second_temp, result[0]) self.assert_(os.path.exists(second_temp), "copy of the file was not " "made") FILE = file(second_temp, 'rb') try: text = FILE.read() - finally: FILE.close() + finally: + try: FILE.close() + except: pass self.assertEqual(self.text, text) def test_reporthook(self): @@ -167,8 +210,49 @@ self.assertEqual(count, count_holder[0]) count_holder[0] = count_holder[0] + 1 second_temp = "%s.2" % test_support.TESTFN - urllib.urlretrieve(test_support.TESTFN, second_temp, hooktester) - os.remove(second_temp) + self.registerFileForCleanUp(second_temp) + urllib.urlretrieve(self.constructLocalFileUrl(test_support.TESTFN), + second_temp, hooktester) + + def test_reporthook_0_bytes(self): + # Test on zero length file. Should call reporthook only 1 time. + report = [] + def hooktester(count, block_size, total_size, _report=report): + _report.append((count, block_size, total_size)) + srcFileName = self.createNewTempFile() + urllib.urlretrieve(self.constructLocalFileUrl(srcFileName), + test_support.TESTFN, hooktester) + self.assertEqual(len(report), 1) + self.assertEqual(report[0][2], 0) + + def test_reporthook_5_bytes(self): + # Test on 5 byte file. Should call reporthook only 2 times (once when + # the "network connection" is established and once when the block is + # read). Since the block size is 8192 bytes, only one block read is + # required to read the entire file. + report = [] + def hooktester(count, block_size, total_size, _report=report): + _report.append((count, block_size, total_size)) + srcFileName = self.createNewTempFile("x" * 5) + urllib.urlretrieve(self.constructLocalFileUrl(srcFileName), + test_support.TESTFN, hooktester) + self.assertEqual(len(report), 2) + self.assertEqual(report[0][1], 8192) + self.assertEqual(report[0][2], 5) + + def test_reporthook_8193_bytes(self): + # Test on 8193 byte file. Should call reporthook only 3 times (once + # when the "network connection" is established, once for the next 8192 + # bytes, and once for the last byte). + report = [] + def hooktester(count, block_size, total_size, _report=report): + _report.append((count, block_size, total_size)) + srcFileName = self.createNewTempFile("x" * 8193) + urllib.urlretrieve(self.constructLocalFileUrl(srcFileName), + test_support.TESTFN, hooktester) + self.assertEqual(len(report), 3) + self.assertEqual(report[0][1], 8192) + self.assertEqual(report[0][2], 8193) class QuotingTests(unittest.TestCase): """Tests for urllib.quote() and urllib.quote_plus()

1 0

python/dist/src/Misc NEWS,1.1355,1.1356
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11533/Misc Modified Files: NEWS Log Message: patch [ 810023 ] Fix for off-by-one bug in urllib.URLopener.retrieve Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1355 retrieving revision 1.1356 diff -u -d -r1.1355 -r1.1356 --- NEWS 26 Aug 2005 08:34:00 -0000 1.1355 +++ NEWS 26 Aug 2005 08:51:34 -0000 1.1356 @@ -204,6 +204,9 @@ Library ------- +- Patch #810023: Fix off-by-one bug in urllib.urlretrieve reporthook + functionality. + - Bug #1163178: Make IDNA return an empty string when the input is empty. - Patch #848017: Make Cookie more RFC-compliant. Use CRLF as default output

1 0

python/dist/src/Lib urllib.py,1.167,1.168
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11533/Lib Modified Files: urllib.py Log Message: patch [ 810023 ] Fix for off-by-one bug in urllib.URLopener.retrieve Index: urllib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urllib.py,v retrieving revision 1.167 retrieving revision 1.168 diff -u -d -r1.167 -r1.168 --- urllib.py 24 Aug 2005 18:46:39 -0000 1.167 +++ urllib.py 26 Aug 2005 08:51:34 -0000 1.168 @@ -234,19 +234,17 @@ bs = 1024*8 size = -1 read = 0 - blocknum = 1 + blocknum = 0 if reporthook: if "content-length" in headers: size = int(headers["Content-Length"]) - reporthook(0, bs, size) - block = fp.read(bs) - read += len(block) - if reporthook: - reporthook(1, bs, size) - while block: - tfp.write(block) + reporthook(blocknum, bs, size) + while 1: block = fp.read(bs) + if block == "": + break read += len(block) + tfp.write(block) blocknum += 1 if reporthook: reporthook(blocknum, bs, size)

1 0

python/dist/src/Modules structmodule.c, 2.62, 2.62.2.1
by rhettinger＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9577 Modified Files: Tag: release24-maint structmodule.c Log Message: SF bug #1072182: bad arg type to isspace in struct module Index: structmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/structmodule.c,v retrieving revision 2.62 retrieving revision 2.62.2.1 diff -u -d -r2.62 -r2.62.2.1 --- structmodule.c 27 Sep 2004 19:27:51 -0000 2.62 +++ structmodule.c 26 Aug 2005 08:42:13 -0000 2.62.2.1 @@ -959,7 +959,7 @@ s = fmt; size = 0; while ((c = *s++) != '\0') { - if (isspace((int)c)) + if (isspace(Py_CHARMASK(c))) continue; if ('0' <= c && c <= '9') { num = c - '0'; @@ -1059,7 +1059,7 @@ res = restart = PyString_AsString(result); while ((c = *s++) != '\0') { - if (isspace((int)c)) + if (isspace(Py_CHARMASK(c))) continue; if ('0' <= c && c <= '9') { num = c - '0'; @@ -1191,7 +1191,7 @@ str = start; s = fmt; while ((c = *s++) != '\0') { - if (isspace((int)c)) + if (isspace(Py_CHARMASK(c))) continue; if ('0' <= c && c <= '9') { num = c - '0';

1 0

python/dist/src/Modules structmodule.c, 2.62, 2.63
by rhettinger＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8992 Modified Files: structmodule.c Log Message: SF bug #1072182: bad arg type to isspace in struct module Index: structmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/structmodule.c,v retrieving revision 2.62 retrieving revision 2.63 diff -u -d -r2.62 -r2.63 --- structmodule.c 27 Sep 2004 19:27:51 -0000 2.62 +++ structmodule.c 26 Aug 2005 08:39:56 -0000 2.63 @@ -959,7 +959,7 @@ s = fmt; size = 0; while ((c = *s++) != '\0') { - if (isspace((int)c)) + if (isspace(Py_CHARMASK(c))) continue; if ('0' <= c && c <= '9') { num = c - '0'; @@ -1059,7 +1059,7 @@ res = restart = PyString_AsString(result); while ((c = *s++) != '\0') { - if (isspace((int)c)) + if (isspace(Py_CHARMASK(c))) continue; if ('0' <= c && c <= '9') { num = c - '0'; @@ -1191,7 +1191,7 @@ str = start; s = fmt; while ((c = *s++) != '\0') { - if (isspace((int)c)) + if (isspace(Py_CHARMASK(c))) continue; if ('0' <= c && c <= '9') { num = c - '0';

1 0

python/dist/src/Misc NEWS,1.1354,1.1355
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7523/Misc Modified Files: NEWS Log Message: patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1354 retrieving revision 1.1355 diff -u -d -r1.1354 -r1.1355 --- NEWS 26 Aug 2005 06:43:52 -0000 1.1354 +++ NEWS 26 Aug 2005 08:34:00 -0000 1.1355 @@ -133,9 +133,12 @@ Extension Modules ----------------- -- Bug #1191043: Fix bz2.BZ2File.seek() for 64-bit file offsets. +- Patch #756021: Special-case socket.inet_aton('255.255.255.255') for + platforms that don't have inet_aton(). -- Bug #1215928: Fix bz2.BZ2File.(x)readlines for files containing one +- Bug #1215928: Fix bz2.BZ2File.seek() for 64-bit file offsets. + +- Bug #1191043: Fix bz2.BZ2File.(x)readlines for files containing one line without newlines. - Bug #728515: mmap.resize() now resizes the file on Unix as it did

1 0

python/dist/src/Modules socketmodule.c, 1.311, 1.312
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7523/Modules Modified Files: socketmodule.c Log Message: patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Index: socketmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v retrieving revision 1.311 retrieving revision 1.312 diff -u -d -r1.311 -r1.312 --- socketmodule.c 7 Nov 2004 14:24:25 -0000 1.311 +++ socketmodule.c 26 Aug 2005 08:34:00 -0000 1.312 @@ -3238,14 +3238,19 @@ return NULL; #else /* ! HAVE_INET_ATON */ - /* XXX Problem here: inet_aton('255.255.255.255') raises - an exception while it should be a valid address. */ - packed_addr = inet_addr(ip_addr); + /* special-case this address as inet_addr might return INADDR_NONE + * for this */ + if (strcmp(ip_addr, "255.255.255.255") == 0) { + packed_addr = 0xFFFFFFFF; + } else { + + packed_addr = inet_addr(ip_addr); - if (packed_addr == INADDR_NONE) { /* invalid address */ - PyErr_SetString(socket_error, - "illegal IP address string passed to inet_aton"); - return NULL; + if (packed_addr == INADDR_NONE) { /* invalid address */ + PyErr_SetString(socket_error, + "illegal IP address string passed to inet_aton"); + return NULL; + } } return PyString_FromStringAndSize((char *) &packed_addr, sizeof(packed_addr));

1 0

python/dist/src/Lib/test test_socket.py, 1.79, 1.80
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7523/Lib/test Modified Files: test_socket.py Log Message: patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Index: test_socket.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket.py,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- test_socket.py 17 Jul 2005 02:37:00 -0000 1.79 +++ test_socket.py 26 Aug 2005 08:34:00 -0000 1.80 @@ -380,10 +380,12 @@ self.assertEquals('\xff\x00\xff\x00', f('255.0.255.0')) self.assertEquals('\xaa\xaa\xaa\xaa', f('170.170.170.170')) self.assertEquals('\x01\x02\x03\x04', f('1.2.3.4')) + self.assertEquals('\xff\xff\xff\xff', f('255.255.255.255')) self.assertEquals('\x00\x00\x00\x00', g('0.0.0.0')) self.assertEquals('\xff\x00\xff\x00', g('255.0.255.0')) self.assertEquals('\xaa\xaa\xaa\xaa', g('170.170.170.170')) + self.assertEquals('\xff\xff\xff\xff', g('255.255.255.255')) def testIPv6toString(self): if not hasattr(socket, 'inet_pton'):

1 0

python/dist/src/Lib/test test_socket.py, 1.77.2.1, 1.77.2.2
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7366/Lib/test Modified Files: Tag: release24-maint test_socket.py Log Message: backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Index: test_socket.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket.py,v retrieving revision 1.77.2.1 retrieving revision 1.77.2.2 diff -u -d -r1.77.2.1 -r1.77.2.2 --- test_socket.py 12 Mar 2005 06:15:55 -0000 1.77.2.1 +++ test_socket.py 26 Aug 2005 08:33:28 -0000 1.77.2.2 @@ -380,10 +380,12 @@ self.assertEquals('\xff\x00\xff\x00', f('255.0.255.0')) self.assertEquals('\xaa\xaa\xaa\xaa', f('170.170.170.170')) self.assertEquals('\x01\x02\x03\x04', f('1.2.3.4')) + self.assertEquals('\xff\xff\xff\xff', f('255.255.255.255')) self.assertEquals('\x00\x00\x00\x00', g('0.0.0.0')) self.assertEquals('\xff\x00\xff\x00', g('255.0.255.0')) self.assertEquals('\xaa\xaa\xaa\xaa', g('170.170.170.170')) + self.assertEquals('\xff\xff\xff\xff', g('255.255.255.255')) def testIPv6toString(self): if not hasattr(socket, 'inet_pton'):

1 0

python/dist/src/Modules socketmodule.c, 1.311, 1.311.2.1
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7366/Modules Modified Files: Tag: release24-maint socketmodule.c Log Message: backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Index: socketmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v retrieving revision 1.311 retrieving revision 1.311.2.1 diff -u -d -r1.311 -r1.311.2.1 --- socketmodule.c 7 Nov 2004 14:24:25 -0000 1.311 +++ socketmodule.c 26 Aug 2005 08:33:28 -0000 1.311.2.1 @@ -3238,14 +3238,19 @@ return NULL; #else /* ! HAVE_INET_ATON */ - /* XXX Problem here: inet_aton('255.255.255.255') raises - an exception while it should be a valid address. */ - packed_addr = inet_addr(ip_addr); + /* special-case this address as inet_addr might return INADDR_NONE + * for this */ + if (strcmp(ip_addr, "255.255.255.255") == 0) { + packed_addr = 0xFFFFFFFF; + } else { + + packed_addr = inet_addr(ip_addr); - if (packed_addr == INADDR_NONE) { /* invalid address */ - PyErr_SetString(socket_error, - "illegal IP address string passed to inet_aton"); - return NULL; + if (packed_addr == INADDR_NONE) { /* invalid address */ + PyErr_SetString(socket_error, + "illegal IP address string passed to inet_aton"); + return NULL; + } } return PyString_FromStringAndSize((char *) &packed_addr, sizeof(packed_addr));

1 0