Mailman 3 October 2004 - Python-checkins

python/dist/src/Lib/logging __init__.py, 1.23, 1.24
by vsajip＠users.sourceforge.net 21 Oct '04

21 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/logging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4738 Modified Files: __init__.py Log Message: Fixed bug in handling of args in LogRecord.__init__. Index: __init__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/logging/__init__.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- __init__.py 20 Oct 2004 08:39:40 -0000 1.23 +++ __init__.py 21 Oct 2004 21:24:27 -0000 1.24 @@ -204,7 +204,7 @@ # 'Value is %d' instead of 'Value is 0'. # For the use case of passing a dictionary, this should not be a # problem. - if args and (len(args) == 1) and args[0]: + if args and (len(args) == 1) and args[0] and (type(args[0]) == types.DictType): args = args[0] self.args = args self.levelname = getLevelName(level)

1 0

[Python-checkins] python/dist/src/Lib/test test_subprocess.py, 1.12, 1.13
by astrand＠users.sourceforge.net 21 Oct '04

21 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14067 Modified Files: test_subprocess.py Log Message: Removed test_close_fds, because it's too unreliable. We simply cannot know that the newly-started Python process only has 3 filedescriptors open. Fixes bug 1048808. Index: test_subprocess.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_subprocess.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- test_subprocess.py 14 Oct 2004 04:16:54 -0000 1.12 +++ test_subprocess.py 21 Oct 2004 19:28:34 -0000 1.13 @@ -421,16 +421,6 @@ preexec_fn=lambda: os.putenv("FRUIT", "apple")) self.assertEqual(p.stdout.read(), "apple") - def test_close_fds(self): - # Make sure we have some fds open - os.pipe() - p = subprocess.Popen([sys.executable, "-c", - 'import sys,os;' \ - 'sys.stdout.write(str(os.dup(0)))'], - stdout=subprocess.PIPE, close_fds=1) - # When all fds are closed, the next free fd should be 3. - self.assertEqual(p.stdout.read(), "3") - def test_args_string(self): # args is a string f, fname = self.mkstemp()

1 0

python/dist/src/Misc NEWS,1.1170,1.1171
by akuchling＠users.sourceforge.net 20 Oct '04

20 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4611/Misc Modified Files: NEWS Log Message: Add item Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1170 retrieving revision 1.1171 diff -u -d -r1.1170 -r1.1171 --- NEWS 20 Oct 2004 08:21:57 -0000 1.1170 +++ NEWS 20 Oct 2004 11:56:15 -0000 1.1171 @@ -32,6 +32,8 @@ - Bug #1048816: fix bug in Ctrl-K at start of line in curses.textpad.Textbox +- Bug #1017553: fix bug in tarfile.filemode() + Build -----

1 0

python/dist/src/Misc NEWS, 1.831.4.155, 1.831.4.156
by akuchling＠users.sourceforge.net 20 Oct '04

20 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4490 Modified Files: Tag: release23-maint NEWS Log Message: Add item Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.155 retrieving revision 1.831.4.156 diff -u -d -r1.831.4.155 -r1.831.4.156 --- NEWS 19 Oct 2004 19:55:35 -0000 1.831.4.155 +++ NEWS 20 Oct 2004 11:55:54 -0000 1.831.4.156 @@ -122,6 +122,8 @@ - Bug #1048816: fix bug in Ctrl-K at start of line in curses.textpad.Textbox +- Bug #1017553: fix bug in tarfile.filemode() + Tools/Demos -----------

1 0

python/dist/src/Lib tarfile.py,1.8.12.4,1.8.12.5
by akuchling＠users.sourceforge.net 20 Oct '04

20 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3031 Modified Files: Tag: release23-maint tarfile.py Log Message: [Patch #1043972, for bug #1017553] filemode() returns an incorrect value for the mode 07111 Index: tarfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/tarfile.py,v retrieving revision 1.8.12.4 retrieving revision 1.8.12.5 diff -u -d -r1.8.12.4 -r1.8.12.5 --- tarfile.py 25 Aug 2004 10:53:30 -0000 1.8.12.4 +++ tarfile.py 20 Oct 2004 11:49:28 -0000 1.8.12.5 @@ -174,39 +174,46 @@ return filemode_table = ( - (S_IFLNK, "l", - S_IFREG, "-", - S_IFBLK, "b", - S_IFDIR, "d", - S_IFCHR, "c", - S_IFIFO, "p"), - (TUREAD, "r"), - (TUWRITE, "w"), - (TUEXEC, "x", TSUID, "S", TUEXEC|TSUID, "s"), - (TGREAD, "r"), - (TGWRITE, "w"), - (TGEXEC, "x", TSGID, "S", TGEXEC|TSGID, "s"), - (TOREAD, "r"), - (TOWRITE, "w"), - (TOEXEC, "x", TSVTX, "T", TOEXEC|TSVTX, "t")) + ((S_IFLNK, "l"), + (S_IFREG, "-"), + (S_IFBLK, "b"), + (S_IFDIR, "d"), + (S_IFCHR, "c"), + (S_IFIFO, "p")), + + ((TUREAD, "r"),), + ((TUWRITE, "w"),), + ((TUEXEC|TSUID, "s"), + (TSUID, "S"), + (TUEXEC, "x")), + + ((TGREAD, "r"),), + ((TGWRITE, "w"),), + ((TGEXEC|TSGID, "s"), + (TSGID, "S"), + (TGEXEC, "x")), + + ((TOREAD, "r"),), + ((TOWRITE, "w"),), + ((TOEXEC|TSVTX, "t"), + (TSVTX, "T"), + (TOEXEC, "x")) +) def filemode(mode): """Convert a file's mode to a string of the form -rwxrwxrwx. Used by TarFile.list() """ - s = "" - for t in filemode_table: - while True: - if mode & t[0] == t[0]: - s += t[1] - elif len(t) > 2: - t = t[2:] - continue - else: - s += "-" - break - return s + perm = [] + for table in filemode_table: + for bit, char in table: + if mode & bit == bit: + perm.append(char) + break + else: + perm.append("-") + return "".join(perm) if os.sep != "/": normpath = lambda path: os.path.normpath(path).replace(os.sep, "/")

1 0

python/dist/src/Lib tarfile.py,1.20,1.21
by akuchling＠users.sourceforge.net 20 Oct '04

20 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2800 Modified Files: tarfile.py Log Message: [Patch #1043972, for bug #1017553] filemode() returns an incorrect value for the mode 07111 Index: tarfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/tarfile.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- tarfile.py 18 Sep 2004 09:08:50 -0000 1.20 +++ tarfile.py 20 Oct 2004 11:48:42 -0000 1.21 @@ -174,39 +174,46 @@ return filemode_table = ( - (S_IFLNK, "l", - S_IFREG, "-", - S_IFBLK, "b", - S_IFDIR, "d", - S_IFCHR, "c", - S_IFIFO, "p"), - (TUREAD, "r"), - (TUWRITE, "w"), - (TUEXEC, "x", TSUID, "S", TUEXEC|TSUID, "s"), - (TGREAD, "r"), - (TGWRITE, "w"), - (TGEXEC, "x", TSGID, "S", TGEXEC|TSGID, "s"), - (TOREAD, "r"), - (TOWRITE, "w"), - (TOEXEC, "x", TSVTX, "T", TOEXEC|TSVTX, "t")) + ((S_IFLNK, "l"), + (S_IFREG, "-"), + (S_IFBLK, "b"), + (S_IFDIR, "d"), + (S_IFCHR, "c"), + (S_IFIFO, "p")), + + ((TUREAD, "r"),), + ((TUWRITE, "w"),), + ((TUEXEC|TSUID, "s"), + (TSUID, "S"), + (TUEXEC, "x")), + + ((TGREAD, "r"),), + ((TGWRITE, "w"),), + ((TGEXEC|TSGID, "s"), + (TSGID, "S"), + (TGEXEC, "x")), + + ((TOREAD, "r"),), + ((TOWRITE, "w"),), + ((TOEXEC|TSVTX, "t"), + (TSVTX, "T"), + (TOEXEC, "x")) +) def filemode(mode): """Convert a file's mode to a string of the form -rwxrwxrwx. Used by TarFile.list() """ - s = "" - for t in filemode_table: - while True: - if mode & t[0] == t[0]: - s += t[1] - elif len(t) > 2: - t = t[2:] - continue - else: - s += "-" - break - return s + perm = [] + for table in filemode_table: + for bit, char in table: + if mode & bit == bit: + perm.append(char) + break + else: + perm.append("-") + return "".join(perm) if os.sep != "/": normpath = lambda path: os.path.normpath(path).replace(os.sep, "/")

1 0

python/dist/src/Lib/test test_tarfile.py, 1.14, 1.15
by akuchling＠users.sourceforge.net 20 Oct '04

20 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2365/Lib/test Modified Files: test_tarfile.py Log Message: Add test case for bug #1017553 Index: test_tarfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tarfile.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- test_tarfile.py 22 Aug 2004 21:28:33 -0000 1.14 +++ test_tarfile.py 20 Oct 2004 11:47:01 -0000 1.15 @@ -327,6 +327,14 @@ class WriteStreamTestGzip(WriteStreamTest): comp = "gz" +# Filemode test cases + +class FileModeTest(unittest.TestCase): + def test_modes(self): + self.assertEqual(tarfile.filemode(0755), '-rwxr-xr-x') + self.assertEqual(tarfile.filemode(07111), '---s--s--t') + + if bz2: # Bzip2 TestCases class ReadTestBzip2(ReadTestGzip): @@ -354,6 +362,7 @@ bz2.BZ2File(tarname("bz2"), "wb").write(file(tarname(), "rb").read()) tests = [ + FileModeTest, ReadTest, ReadStreamTest, WriteTest,

1 0

python/dist/src/Lib/xml/sax saxutils.py, 1.24, 1.25
by fdrake＠users.sourceforge.net 20 Oct '04

20 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/xml/sax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24823 Modified Files: saxutils.py Log Message: when only using half of the return value of os.path.split(), use os.path.dirname() or os.path.basename() instead Index: saxutils.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/xml/sax/saxutils.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- saxutils.py 20 Oct 2004 08:21:19 -0000 1.24 +++ saxutils.py 20 Oct 2004 11:08:35 -0000 1.25 @@ -283,7 +283,7 @@ if source.getByteStream() is None: sysid = source.getSystemId() - basehead = os.path.split(os.path.normpath(base))[0] + basehead = os.path.dirname(os.path.normpath(base)) sysidfilename = os.path.join(basehead, sysid) if os.path.isfile(sysidfilename): source.setSystemId(sysidfilename)

1 0

python/dist/src/Lib/logging __init__.py, 1.22, 1.23
by vsajip＠users.sourceforge.net 20 Oct '04

20 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/logging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23159 Modified Files: __init__.py Log Message: Changed handling of args in LogRecord.__init__. Index: __init__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/logging/__init__.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- __init__.py 3 Oct 2004 19:10:53 -0000 1.22 +++ __init__.py 20 Oct 2004 08:39:40 -0000 1.23 @@ -36,8 +36,8 @@ __author__ = "Vinay Sajip <vinay_sajip(a)red-dove.com>" __status__ = "beta" -__version__ = "0.4.9.5" -__date__ = "02 October 2004" +__version__ = "0.4.9.6" +__date__ = "20 October 2004" #--------------------------------------------------------------------------- # Miscellaneous module data @@ -191,6 +191,21 @@ ct = time.time() self.name = name self.msg = msg + # + # The following statement allows passing of a dictionary as a sole + # argument, so that you can do something like + # logging.debug("a %(a)d b %(b)s", {'a':1, 'b':2}) + # Suggested by Stefan Behnel. + # Note that without the test for args[0], we get a problem because + # during formatting, we test to see if the arg is present using + # 'if self.args:'. If the event being logged is e.g. 'Value is %d' + # and if the passed arg fails 'if self.args:' then no formatting + # is done. For example, logger.warn('Value is %d', 0) would log + # 'Value is %d' instead of 'Value is 0'. + # For the use case of passing a dictionary, this should not be a + # problem. + if args and (len(args) == 1) and args[0]: + args = args[0] self.args = args self.levelname = getLevelName(level) self.levelno = level

1 0

python/dist/src/Misc NEWS,1.1169,1.1170
by rhettinger＠users.sourceforge.net 20 Oct '04

20 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19135 Modified Files: NEWS Log Message: SF bug #902037: relative on-disk SYSTEM id handling is incorrect Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1169 retrieving revision 1.1170 diff -u -d -r1.1169 -r1.1170 --- NEWS 20 Oct 2004 07:17:15 -0000 1.1169 +++ NEWS 20 Oct 2004 08:21:57 -0000 1.1170 @@ -22,6 +22,9 @@ Library ------- +- Bug #902037: XML.sax.saxutils.prepare_input_source() now combines relative + paths with a base path before checking os.path.isfile(). + - The whichdb module can now be run from the command line. - Bug #1045381: time.strptime() can now infer the date using %U or %W (week of

1 0