Mailman 3 August 2005 - Python-checkins

python/dist/src/Lib/test test_bz2.py,1.19,1.20
by tim_one＠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-serv23937/Lib/test Modified Files: test_bz2.py Log Message: testSeekBackwardsFromEnd(): Repair obvious syntax error. Index: test_bz2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bz2.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- test_bz2.py 26 Aug 2005 13:23:54 -0000 1.19 +++ test_bz2.py 26 Aug 2005 14:33:57 -0000 1.20 @@ -191,7 +191,7 @@ def testSeekBackwardsFromEnd(self): # "Test BZ2File.seek(-150, 2)" self.createTempFile() - )bz2f = BZ2File(self.filename) + bz2f = BZ2File(self.filename) bz2f.seek(-150, 2) self.assertEqual(bz2f.read(), self.TEXT[len(self.TEXT)-150:]) bz2f.close()

1 0

python/dist/src/Lib/test test_bz2.py, 1.16.2.2, 1.16.2.3
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-serv4981/Lib/test Modified Files: Tag: release24-maint test_bz2.py Log Message: Add list() around xreadlines() Index: test_bz2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bz2.py,v retrieving revision 1.16.2.2 retrieving revision 1.16.2.3 diff -u -d -r1.16.2.2 -r1.16.2.3 --- test_bz2.py 25 Aug 2005 13:10:58 -0000 1.16.2.2 +++ test_bz2.py 26 Aug 2005 13:24:09 -0000 1.16.2.3 @@ -256,7 +256,7 @@ bz2f.close() self.assertEqual(lines, ['Test']) bz2f = BZ2File(self.filename) - xlines = bz2f.xreadlines() + xlines = list(bz2f.xreadlines()) bz2f.close() self.assertEqual(lines, ['Test'])

1 0

python/dist/src/Lib/test test_bz2.py,1.18,1.19
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-serv4822/Lib/test Modified Files: test_bz2.py Log Message: Add list() around xreadlines() Index: test_bz2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bz2.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- test_bz2.py 21 Aug 2005 14:16:04 -0000 1.18 +++ test_bz2.py 26 Aug 2005 13:23:54 -0000 1.19 @@ -191,7 +191,7 @@ def testSeekBackwardsFromEnd(self): # "Test BZ2File.seek(-150, 2)" self.createTempFile() - bz2f = BZ2File(self.filename) + )bz2f = BZ2File(self.filename) bz2f.seek(-150, 2) self.assertEqual(bz2f.read(), self.TEXT[len(self.TEXT)-150:]) bz2f.close() @@ -256,7 +256,7 @@ bz2f.close() self.assertEqual(lines, ['Test']) bz2f = BZ2File(self.filename) - xlines = bz2f.xreadlines() + xlines = list(bz2f.xreadlines()) bz2f.close() self.assertEqual(lines, ['Test'])

1 0

python/dist/src/Lib/test/output test_cookie, 1.8, 1.9
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Lib/test/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4388/Lib/test/output Modified Files: test_cookie Log Message: Index: test_cookie =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_cookie,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- test_cookie 27 Jun 2005 05:51:07 -0000 1.8 +++ test_cookie 26 Aug 2005 13:21:50 -0000 1.9 @@ -1,31 +1,31 @@ test_cookie <SimpleCookie: chips='ahoy' vienna='finger'> -Set-Cookie: chips=ahoy; -Set-Cookie: vienna=finger; +Set-Cookie: chips=ahoy +Set-Cookie: vienna=finger chips 'ahoy' 'ahoy' -Set-Cookie: chips=ahoy; +Set-Cookie: chips=ahoy vienna 'finger' 'finger' -Set-Cookie: vienna=finger; +Set-Cookie: vienna=finger <SimpleCookie: keebler='E=mc2; L="Loves"; fudge=\n;'> -Set-Cookie: keebler="E=mc2; L=\"Loves\"; fudge=\012;"; +Set-Cookie: keebler="E=mc2; L=\"Loves\"; fudge=\012;" keebler 'E=mc2; L="Loves"; fudge=\n;' 'E=mc2; L="Loves"; fudge=\n;' -Set-Cookie: keebler="E=mc2; L=\"Loves\"; fudge=\012;"; +Set-Cookie: keebler="E=mc2; L=\"Loves\"; fudge=\012;" <SimpleCookie: keebler='E=mc2'> -Set-Cookie: keebler=E=mc2; +Set-Cookie: keebler=E=mc2 keebler 'E=mc2' 'E=mc2' -Set-Cookie: keebler=E=mc2; -Set-Cookie: Customer="WILE_E_COYOTE"; Path=/acme; +Set-Cookie: keebler=E=mc2 +Set-Cookie: Customer="WILE_E_COYOTE"; Path=/acme <script type="text/javascript">  </script> <script type="text/javascript">  </script>

1 0

python/dist/src/Doc/ref ref3.tex,1.127,1.128
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Doc/ref In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30810/Doc/ref Modified Files: ref3.tex Log Message: __new__ is a static method Index: ref3.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref3.tex,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- ref3.tex 25 Aug 2005 21:56:45 -0000 1.127 +++ ref3.tex 26 Aug 2005 12:56:22 -0000 1.128 @@ -1056,7 +1056,7 @@ \begin{methoddesc}[object]{__new__}{cls\optional{, \moreargs}} Called to create a new instance of class \var{cls}. \method{__new__()} -is a class method (special-cased so you need not declare it as such) +is a static method (special-cased so you need not declare it as such) that takes the class of which an instance was requested as its first argument. The remaining arguments are those passed to the object constructor expression (the call to the class). The return value of

1 0

python/dist/src/Doc/ref ref3.tex, 1.121.2.6, 1.121.2.7
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Doc/ref In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30824/Doc/ref Modified Files: Tag: release24-maint ref3.tex Log Message: __new__ is a static method Index: ref3.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref3.tex,v retrieving revision 1.121.2.6 retrieving revision 1.121.2.7 diff -u -d -r1.121.2.6 -r1.121.2.7 --- ref3.tex 25 Aug 2005 21:56:49 -0000 1.121.2.6 +++ ref3.tex 26 Aug 2005 12:56:17 -0000 1.121.2.7 @@ -1056,7 +1056,7 @@ \begin{methoddesc}[object]{__new__}{cls\optional{, \moreargs}} Called to create a new instance of class \var{cls}. \method{__new__()} -is a class method (special-cased so you need not declare it as such) +is a static method (special-cased so you need not declare it as such) that takes the class of which an instance was requested as its first argument. The remaining arguments are those passed to the object constructor expression (the call to the class). The return value of

1 0

python/dist/src/Modules operator.c, 2.29.4.1, 2.29.4.2
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-serv29960/Modules Modified Files: Tag: release24-maint operator.c Log Message: Important typo Index: operator.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/operator.c,v retrieving revision 2.29.4.1 retrieving revision 2.29.4.2 diff -u -d -r2.29.4.1 -r2.29.4.2 --- operator.c 26 Aug 2005 06:43:16 -0000 2.29.4.1 +++ operator.c 26 Aug 2005 12:50:37 -0000 2.29.4.2 @@ -267,7 +267,7 @@ itemgetterobject *ig; PyObject *item; - if (!_PyArg_NoKeywords("itemgetter()", kdws)) + if (!_PyArg_NoKeywords("itemgetter()", kwds)) return NULL; if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &item))

1 0

python/dist/src/Lib/test test_urllib.py, 1.16, 1.16.4.1
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-serv11552/Lib/test Modified Files: Tag: release24-maint test_urllib.py Log Message: backport 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.16.4.1 diff -u -d -r1.16 -r1.16.4.1 --- test_urllib.py 29 Jun 2004 13:07:53 -0000 1.16 +++ test_urllib.py 26 Aug 2005 08:51:39 -0000 1.16.4.1 @@ -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/Lib urllib.py,1.165,1.165.2.1
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-serv11552/Lib Modified Files: Tag: release24-maint urllib.py Log Message: backport 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.165 retrieving revision 1.165.2.1 diff -u -d -r1.165 -r1.165.2.1 --- urllib.py 11 Oct 2004 13:53:07 -0000 1.165 +++ urllib.py 26 Aug 2005 08:51:39 -0000 1.165.2.1 @@ -228,18 +228,17 @@ self.tempcache[url] = result bs = 1024*8 size = -1 - blocknum = 1 + blocknum = 0 if reporthook: if "content-length" in headers: size = int(headers["Content-Length"]) - reporthook(0, bs, size) - block = fp.read(bs) - if reporthook: - reporthook(1, bs, size) - while block: - tfp.write(block) + reporthook(blocknum, bs, size) + while 1: block = fp.read(bs) - blocknum = blocknum + 1 + if block == "": + break + tfp.write(block) + blocknum += 1 if reporthook: reporthook(blocknum, bs, size) fp.close()

1 0

python/dist/src/Misc NEWS, 1.1193.2.88, 1.1193.2.89
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-serv11552/Misc Modified Files: Tag: release24-maint NEWS Log Message: backport 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.1193.2.88 retrieving revision 1.1193.2.89 diff -u -d -r1.1193.2.88 -r1.1193.2.89 --- NEWS 26 Aug 2005 08:33:28 -0000 1.1193.2.88 +++ NEWS 26 Aug 2005 08:51:39 -0000 1.1193.2.89 @@ -79,6 +79,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. - Bug #1121494: distutils.dir_utils.mkpath now accepts Unicode strings.

1 0