Mailman 3 August 2005 - Python-checkins

python/dist/src/Misc NEWS, 1.1193.2.89, 1.1193.2.90
by loewis＠users.sourceforge.net 27 Aug '05

27 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29574/Misc Modified Files: Tag: release24-maint NEWS Log Message: Patch #1168594: set sizes of non-regular files to zero. Fixes #1167128. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.89 retrieving revision 1.1193.2.90 diff -u -d -r1.1193.2.89 -r1.1193.2.90 --- NEWS 26 Aug 2005 08:51:39 -0000 1.1193.2.89 +++ NEWS 27 Aug 2005 10:08:21 -0000 1.1193.2.90 @@ -79,6 +79,8 @@ Library ------- +- Bug #1167128: Fix size of a symlink in a tarfile to be 0. + - Patch #810023: Fix off-by-one bug in urllib.urlretrieve reporthook functionality.

1 0

python/dist/src/Lib tarfile.py, 1.21.2.4, 1.21.2.5
by loewis＠users.sourceforge.net 27 Aug '05

27 Aug '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29574/Lib Modified Files: Tag: release24-maint tarfile.py Log Message: Patch #1168594: set sizes of non-regular files to zero. Fixes #1167128. Index: tarfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/tarfile.py,v retrieving revision 1.21.2.4 retrieving revision 1.21.2.5 diff -u -d -r1.21.2.4 -r1.21.2.5 --- tarfile.py 24 Aug 2005 06:44:55 -0000 1.21.2.4 +++ tarfile.py 27 Aug 2005 10:08:21 -0000 1.21.2.5 @@ -1132,17 +1132,16 @@ # Fill the TarInfo object with all # information we can get. - tarinfo.name = arcname - tarinfo.mode = stmd - tarinfo.uid = statres.st_uid - tarinfo.gid = statres.st_gid - if stat.S_ISDIR(stmd): - # For a directory, the size must be 0 - tarinfo.size = 0 - else: + tarinfo.name = arcname + tarinfo.mode = stmd + tarinfo.uid = statres.st_uid + tarinfo.gid = statres.st_gid + if stat.S_ISREG(stmd): tarinfo.size = statres.st_size + else: + tarinfo.size = 0L tarinfo.mtime = statres.st_mtime - tarinfo.type = type + tarinfo.type = type tarinfo.linkname = linkname if pwd: try: @@ -1233,16 +1232,15 @@ self.addfile(tarinfo, f) f.close() - if tarinfo.type in (LNKTYPE, SYMTYPE, FIFOTYPE, CHRTYPE, BLKTYPE): - tarinfo.size = 0L - self.addfile(tarinfo) - - if tarinfo.isdir(): + elif tarinfo.isdir(): self.addfile(tarinfo) if recursive: for f in os.listdir(name): self.add(os.path.join(name, f), os.path.join(arcname, f)) + else: + self.addfile(tarinfo) + def addfile(self, tarinfo, fileobj=None): """Add the TarInfo object `tarinfo' to the archive. If `fileobj' is given, tarinfo.size bytes are read from it and added to the archive.

1 0

python/dist/src/Lib/test test_tarfile.py, 1.16, 1.16.2.1
by loewis＠users.sourceforge.net 27 Aug '05

27 Aug '05

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29574/Lib/test Modified Files: Tag: release24-maint test_tarfile.py Log Message: Patch #1168594: set sizes of non-regular files to zero. Fixes #1167128. Index: test_tarfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tarfile.py,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -d -r1.16 -r1.16.2.1 --- test_tarfile.py 25 Oct 2004 03:19:41 -0000 1.16 +++ test_tarfile.py 27 Aug 2005 10:08:21 -0000 1.16.2.1 @@ -208,6 +208,40 @@ else: self.dst.addfile(tarinfo, f) +class WriteSize0Test(BaseTest): + mode = 'w' + + def setUp(self): + self.tmpdir = dirname() + self.dstname = tmpname() + self.dst = tarfile.open(self.dstname, "w") + + def tearDown(self): + self.dst.close() + + def test_file(self): + path = os.path.join(self.tmpdir, "file") + file(path, "w") + tarinfo = self.dst.gettarinfo(path) + self.assertEqual(tarinfo.size, 0) + file(path, "w").write("aaa") + tarinfo = self.dst.gettarinfo(path) + self.assertEqual(tarinfo.size, 3) + + def test_directory(self): + path = os.path.join(self.tmpdir, "directory") + os.mkdir(path) + tarinfo = self.dst.gettarinfo(path) + self.assertEqual(tarinfo.size, 0) + + def test_symlink(self): + if hasattr(os, "symlink"): + path = os.path.join(self.tmpdir, "symlink") + os.symlink("link_target", path) + tarinfo = self.dst.gettarinfo(path) + self.assertEqual(tarinfo.size, 0) + + class WriteStreamTest(WriteTest): sep = '|' @@ -366,6 +400,7 @@ ReadTest, ReadStreamTest, WriteTest, + WriteSize0Test, WriteStreamTest, WriteGNULongTest, ]

1 0

python/dist/src/Lib tarfile.py,1.31,1.32
by loewis＠users.sourceforge.net 27 Aug '05

27 Aug '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29364/Lib Modified Files: tarfile.py Log Message: Patch #1168594: set sizes of non-regular files to zero. Fixes #1167128. Will backport to 2.4. Index: tarfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/tarfile.py,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- tarfile.py 24 Aug 2005 06:43:09 -0000 1.31 +++ tarfile.py 27 Aug 2005 10:07:56 -0000 1.32 @@ -1179,17 +1179,16 @@ # Fill the TarInfo object with all # information we can get. - tarinfo.name = arcname - tarinfo.mode = stmd - tarinfo.uid = statres.st_uid - tarinfo.gid = statres.st_gid - if stat.S_ISDIR(stmd): - # For a directory, the size must be 0 - tarinfo.size = 0 - else: + tarinfo.name = arcname + tarinfo.mode = stmd + tarinfo.uid = statres.st_uid + tarinfo.gid = statres.st_gid + if stat.S_ISREG(stmd): tarinfo.size = statres.st_size + else: + tarinfo.size = 0L tarinfo.mtime = statres.st_mtime - tarinfo.type = type + tarinfo.type = type tarinfo.linkname = linkname if pwd: try: @@ -1280,16 +1279,15 @@ self.addfile(tarinfo, f) f.close() - if tarinfo.type in (LNKTYPE, SYMTYPE, FIFOTYPE, CHRTYPE, BLKTYPE): - tarinfo.size = 0L - self.addfile(tarinfo) - - if tarinfo.isdir(): + elif tarinfo.isdir(): self.addfile(tarinfo) if recursive: for f in os.listdir(name): self.add(os.path.join(name, f), os.path.join(arcname, f)) + else: + self.addfile(tarinfo) + def addfile(self, tarinfo, fileobj=None): """Add the TarInfo object `tarinfo' to the archive. If `fileobj' is given, tarinfo.size bytes are read from it and added to the archive.

1 0

python/dist/src/Misc NEWS,1.1356,1.1357
by loewis＠users.sourceforge.net 27 Aug '05

27 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29364/Misc Modified Files: NEWS Log Message: Patch #1168594: set sizes of non-regular files to zero. Fixes #1167128. Will backport to 2.4. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1356 retrieving revision 1.1357 diff -u -d -r1.1356 -r1.1357 --- NEWS 26 Aug 2005 08:51:34 -0000 1.1356 +++ NEWS 27 Aug 2005 10:07:56 -0000 1.1357 @@ -204,6 +204,8 @@ Library ------- +- Bug #1167128: Fix size of a symlink in a tarfile to be 0. + - Patch #810023: Fix off-by-one bug in urllib.urlretrieve reporthook functionality.

1 0

python/dist/src/Lib/test test_tarfile.py, 1.18, 1.19
by loewis＠users.sourceforge.net 27 Aug '05

27 Aug '05

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29364/Lib/test Modified Files: test_tarfile.py Log Message: Patch #1168594: set sizes of non-regular files to zero. Fixes #1167128. Will backport to 2.4. Index: test_tarfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tarfile.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- test_tarfile.py 5 Mar 2005 12:47:42 -0000 1.18 +++ test_tarfile.py 27 Aug 2005 10:07:56 -0000 1.19 @@ -230,6 +230,40 @@ else: self.dst.addfile(tarinfo, f) +class WriteSize0Test(BaseTest): + mode = 'w' + + def setUp(self): + self.tmpdir = dirname() + self.dstname = tmpname() + self.dst = tarfile.open(self.dstname, "w") + + def tearDown(self): + self.dst.close() + + def test_file(self): + path = os.path.join(self.tmpdir, "file") + file(path, "w") + tarinfo = self.dst.gettarinfo(path) + self.assertEqual(tarinfo.size, 0) + file(path, "w").write("aaa") + tarinfo = self.dst.gettarinfo(path) + self.assertEqual(tarinfo.size, 3) + + def test_directory(self): + path = os.path.join(self.tmpdir, "directory") + os.mkdir(path) + tarinfo = self.dst.gettarinfo(path) + self.assertEqual(tarinfo.size, 0) + + def test_symlink(self): + if hasattr(os, "symlink"): + path = os.path.join(self.tmpdir, "symlink") + os.symlink("link_target", path) + tarinfo = self.dst.gettarinfo(path) + self.assertEqual(tarinfo.size, 0) + + class WriteStreamTest(WriteTest): sep = '|' @@ -399,6 +433,7 @@ ReadAsteriskTest, ReadStreamAsteriskTest, WriteTest, + WriteSize0Test, WriteStreamTest, WriteGNULongTest, ]

1 0

python/dist/src/Lib/distutils dir_util.py, 1.16, 1.17
by tim_one＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Lib/distutils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv805/Lib/distutils Modified Files: dir_util.py Log Message: Whitespace normalization (via reindent.py). Index: dir_util.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/dir_util.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- dir_util.py 24 Aug 2005 14:55:22 -0000 1.16 +++ dir_util.py 26 Aug 2005 15:20:47 -0000 1.17 @@ -31,7 +31,7 @@ global _path_created # Detect a common bug -- name is None - if not isinstance(name, StringTypes): + if not isinstance(name, StringTypes): raise DistutilsInternalError, \ "mkpath: 'name' must be a string (got %r)" % (name,)

1 0

python/dist/src/Lib hashlib.py, 1.1, 1.2 random.py, 1.72, 1.73 urllib2.py, 1.86, 1.87
by tim_one＠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-serv805/Lib Modified Files: hashlib.py random.py urllib2.py Log Message: Whitespace normalization (via reindent.py). Index: hashlib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/hashlib.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- hashlib.py 21 Aug 2005 18:46:00 -0000 1.1 +++ hashlib.py 26 Aug 2005 15:20:47 -0000 1.2 @@ -107,4 +107,3 @@ sha256 = __get_builtin_constructor('sha256') sha384 = __get_builtin_constructor('sha384') sha512 = __get_builtin_constructor('sha512') - Index: random.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/random.py,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- random.py 19 Aug 2005 01:36:35 -0000 1.72 +++ random.py 26 Aug 2005 15:20:47 -0000 1.73 @@ -303,7 +303,7 @@ result = [None] * k setsize = 21 # size of a small set minus size of an empty list if k > 5: - setsize += 4 ** _ceil(_log(k * 3, 4)) # table size for big sets + setsize += 4 ** _ceil(_log(k * 3, 4)) # table size for big sets if n <= setsize: # is an n-length list smaller than a k-length set pool = list(population) for i in xrange(k): # invariant: non-selected at [0,n-i) Index: urllib2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- urllib2.py 24 Aug 2005 22:20:32 -0000 1.86 +++ urllib2.py 26 Aug 2005 15:20:47 -0000 1.87 @@ -1069,7 +1069,7 @@ def parse_http_list(s): """Parse lists as described by RFC 2068 Section 2. - + In particular, parse comma-separated lists where the elements of the list may include quoted-strings. A quoted-string could contain a comma. A non-quoted string could have quotes in the @@ -1101,7 +1101,7 @@ if cur == '"': quote = True - + part += cur # append last part

1 0

python/dist/src/Lib/test seq_tests.py, 1.5, 1.6 test_generators.py, 1.47, 1.48 test_hashlib_speed.py, 1.1, 1.2 test_mmap.py, 1.33, 1.34
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-serv805/Lib/test Modified Files: seq_tests.py test_generators.py test_hashlib_speed.py test_mmap.py Log Message: Whitespace normalization (via reindent.py). Index: seq_tests.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/seq_tests.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- seq_tests.py 24 Aug 2005 09:08:57 -0000 1.5 +++ seq_tests.py 26 Aug 2005 15:20:48 -0000 1.6 @@ -228,7 +228,7 @@ class StopCompares: def __eq__(self, other): raise DoNotTestEq - + checkfirst = self.type2test([1, StopCompares()]) self.assert_(1 in checkfirst) checklast = self.type2test([StopCompares(), 1]) Index: test_generators.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_generators.py,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- test_generators.py 24 Aug 2005 09:02:29 -0000 1.47 +++ test_generators.py 26 Aug 2005 15:20:48 -0000 1.48 @@ -709,18 +709,18 @@ Ye olde Fibonacci generator, tee style. >>> def fib(): -... +... ... def _isum(g, h): ... while 1: ... yield g.next() + h.next() -... +... ... def _fib(): ... yield 1 ... yield 2 ... fibTail.next() # throw first away ... for res in _isum(fibHead, fibTail): ... yield res -... +... ... fibHead, fibTail, fibRes = tee(_fib(), 3) ... return fibRes Index: test_hashlib_speed.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_hashlib_speed.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- test_hashlib_speed.py 21 Aug 2005 18:46:01 -0000 1.1 +++ test_hashlib_speed.py 26 Aug 2005 15:20:48 -0000 1.2 @@ -90,4 +90,3 @@ test_scaled_msg(scale=106, name='[small data]') test_scaled_msg(scale=creatorFunc().digest_size, name='[digest_size data]') test_scaled_msg(scale=10, name='[tiny data]') - Index: test_mmap.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mmap.py,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- test_mmap.py 24 Aug 2005 07:17:40 -0000 1.33 +++ test_mmap.py 26 Aug 2005 15:20:48 -0000 1.34 @@ -126,7 +126,7 @@ f.seek(0, 2) verify(f.tell() == 512, 'Underlying file not truncated') f.close() - verify(m.size() == 512, 'New size not reflected in file') + verify(m.size() == 512, 'New size not reflected in file') m.close()

1 0

python/dist/src/Tools/scripts findnocoding.py, 1.1, 1.2 pysource.py, 1.1, 1.2
by tim_one＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Tools/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv805/Tools/scripts Modified Files: findnocoding.py pysource.py Log Message: Whitespace normalization (via reindent.py). Index: findnocoding.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/scripts/findnocoding.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- findnocoding.py 24 Aug 2005 18:28:41 -0000 1.1 +++ findnocoding.py 26 Aug 2005 15:20:48 -0000 1.2 @@ -26,8 +26,8 @@ if filename.endswith(".py"): yield os.path.join(root, filename) pysource = pysource() - - + + print >>sys.stderr, ("The pysource module is not available; " "no sophisticated Python source file search will be done.") @@ -56,19 +56,19 @@ line1 = infile.readline() line2 = infile.readline() - + if get_declaration(line1) or get_declaration(line2): # the file does have an encoding declaration, so trust it infile.close() return False - + # check the whole file for non-ASCII characters rest = infile.read() infile.close() - + if has_correct_encoding(line1+line2+rest, "ascii"): return False - + return True @@ -102,5 +102,3 @@ result = needs_declaration(fullpath) if result: print fullpath - - Index: pysource.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/scripts/pysource.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pysource.py 24 Aug 2005 18:28:41 -0000 1.1 +++ pysource.py 26 Aug 2005 15:20:48 -0000 1.2 @@ -57,12 +57,12 @@ line = infile.readline() infile.close() - + if binary_re.search(line): # file appears to be binary print_debug("%s: appears to be binary" % fullpath) return False - + if fullpath.endswith(".py") or fullpath.endswith(".pyw"): return True elif "python" in line: @@ -95,12 +95,12 @@ paths: a list of files and/or directories to be checked. is_python: a function that takes a file name and checks whether it is a Python source file - exclude_dirs: a list of directory base names that should be excluded in + exclude_dirs: a list of directory base names that should be excluded in the search """ if exclude_dirs is None: exclude_dirs=[] - + for path in paths: print_debug("testing: %s" % path) if os.path.isfile(path):

1 0