Mailman 3 June 2004 - Python-checkins

python/dist/src/Doc/ref ref2.tex,1.51,1.52
by loewis＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Doc/ref In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16133 Modified Files: ref2.tex Log Message: Fix typo reported in #964592. Will backport to 2.3. Index: ref2.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref2.tex,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** ref2.tex 8 Feb 2004 20:18:26 -0000 1.51 --- ref2.tex 2 Jun 2004 12:48:20 -0000 1.52 *************** *** 349,353 **** \item[\code{__*}] Class-private names. Names in this category, when used within the ! context of a class definition, are re-written to use a mangled for to help avoid name clashes between ``private'' attributes of base and derived classes. --- 349,353 ---- \item[\code{__*}] Class-private names. Names in this category, when used within the ! context of a class definition, are re-written to use a mangled form to help avoid name clashes between ``private'' attributes of base and derived classes.

1 0

python/dist/src/Doc/api concrete.tex, 1.25.10.7, 1.25.10.8
by loewis＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Doc/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15695 Modified Files: Tag: release23-maint concrete.tex Log Message: Document PyModule_AddIntConstant to take a long. Fixes #962471. Index: concrete.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/api/concrete.tex,v retrieving revision 1.25.10.7 retrieving revision 1.25.10.8 diff -C2 -d -r1.25.10.7 -r1.25.10.8 *** concrete.tex 25 Mar 2004 08:55:58 -0000 1.25.10.7 --- concrete.tex 2 Jun 2004 12:45:46 -0000 1.25.10.8 *************** *** 2236,2240 **** \begin{cfuncdesc}{int}{PyModule_AddIntConstant}{PyObject *module, ! char *name, int value} Add an integer constant to \var{module} as \var{name}. This convenience function can be used from the module's initialization --- 2236,2240 ---- \begin{cfuncdesc}{int}{PyModule_AddIntConstant}{PyObject *module, ! char *name, long value} Add an integer constant to \var{module} as \var{name}. This convenience function can be used from the module's initialization

1 0

python/dist/src/Doc/api concrete.tex,1.40,1.41
by loewis＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Doc/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15579 Modified Files: concrete.tex Log Message: Document PyModule_AddIntConstant to take a long. Fixes #962471. Will backport to 2.3. Index: concrete.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/api/concrete.tex,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** concrete.tex 1 Jun 2004 15:22:40 -0000 1.40 --- concrete.tex 2 Jun 2004 12:45:27 -0000 1.41 *************** *** 2264,2268 **** \begin{cfuncdesc}{int}{PyModule_AddIntConstant}{PyObject *module, ! char *name, int value} Add an integer constant to \var{module} as \var{name}. This convenience function can be used from the module's initialization --- 2264,2268 ---- \begin{cfuncdesc}{int}{PyModule_AddIntConstant}{PyObject *module, ! char *name, long value} Add an integer constant to \var{module} as \var{name}. This convenience function can be used from the module's initialization

1 0

python/dist/src/Misc NEWS, 1.831.4.113, 1.831.4.114
by loewis＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14087/Misc Modified Files: Tag: release23-maint NEWS Log Message: Patch #924294: Do not check for AF_INET6 if it is not defined. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.113 retrieving revision 1.831.4.114 diff -C2 -d -r1.831.4.113 -r1.831.4.114 *** NEWS 2 Jun 2004 10:07:00 -0000 1.831.4.113 --- NEWS 2 Jun 2004 12:36:48 -0000 1.831.4.114 *************** *** 13,16 **** --- 13,18 ---- ----------------- + - Patch #924294: Do no check for AF_INET6 if it is not defined. + - Patch #954115: Properly handle UNC roots in nt.stat.

1 0

[Python-checkins] python/dist/src/Modules socketmodule.c, 1.271.6.7, 1.271.6.8
by loewis＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14087/Modules Modified Files: Tag: release23-maint socketmodule.c Log Message: Patch #924294: Do not check for AF_INET6 if it is not defined. Index: socketmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v retrieving revision 1.271.6.7 retrieving revision 1.271.6.8 diff -C2 -d -r1.271.6.7 -r1.271.6.8 *** socketmodule.c 11 Apr 2004 12:10:03 -0000 1.271.6.7 --- socketmodule.c 2 Jun 2004 12:36:49 -0000 1.271.6.8 *************** *** 2976,2980 **** } ! #ifndef ENABLE_IPV6 if(af == AF_INET6) { PyErr_SetString(socket_error, --- 2976,2980 ---- } ! #if !defined(ENABLE_IPV6) && defined(AF_INET6) if(af == AF_INET6) { PyErr_SetString(socket_error,

1 0

python/dist/src/Modules socketmodule.c, 1.289, 1.290
by loewis＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13779/Modules Modified Files: socketmodule.c Log Message: Patch #924294: Do not check for AF_INET6 if it is not defined. Will backport to 2.3. Index: socketmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v retrieving revision 1.289 retrieving revision 1.290 diff -C2 -d -r1.289 -r1.290 *** socketmodule.c 26 May 2004 17:06:31 -0000 1.289 --- socketmodule.c 2 Jun 2004 12:35:29 -0000 1.290 *************** *** 3101,3105 **** } ! #ifndef ENABLE_IPV6 if(af == AF_INET6) { PyErr_SetString(socket_error, --- 3101,3105 ---- } ! #if !defined(ENABLE_IPV6) && defined(AF_INET6) if(af == AF_INET6) { PyErr_SetString(socket_error,

1 0

Get Your Diploma Today mitten ferreira
by Beulah Mcallister June 2, 2004

June 2, 2004

1 0

python/dist/src/Lib/test test_logging.py, 1.13, 1.14
by vsajip＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28928 Modified Files: test_logging.py Log Message: Copyright year changed Index: test_logging.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_logging.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** test_logging.py 20 Feb 2004 13:19:16 -0000 1.13 --- test_logging.py 2 Jun 2004 10:51:05 -0000 1.14 *************** *** 1,5 **** #!/usr/bin/env python # ! # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its --- 1,5 ---- #!/usr/bin/env python # ! # Copyright 2001-2004 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its

1 0

python/dist/src/Misc NEWS, 1.831.4.112, 1.831.4.113
by loewis＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21802/Misc Modified Files: Tag: release23-maint NEWS Log Message: Patch #954115: Fix os.stat handling of UNC roots. Closes #513572. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.112 retrieving revision 1.831.4.113 diff -C2 -d -r1.831.4.112 -r1.831.4.113 *** NEWS 25 May 2004 18:36:41 -0000 1.831.4.112 --- NEWS 2 Jun 2004 10:07:00 -0000 1.831.4.113 *************** *** 8,11 **** --- 8,21 ---- =================================== + *Release date: xx-xxx-2004* + + Extension modules + ----------------- + + - Patch #954115: Properly handle UNC roots in nt.stat. + + What's New in Python 2.3.4 (final)? + =================================== + *Release date: 27-May-2004*

1 0

python/dist/src/Modules posixmodule.c, 2.300.8.9, 2.300.8.10
by loewis＠users.sourceforge.net June 2, 2004

June 2, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21802/Modules Modified Files: Tag: release23-maint posixmodule.c Log Message: Patch #954115: Fix os.stat handling of UNC roots. Closes #513572. Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.300.8.9 retrieving revision 2.300.8.10 diff -C2 -d -r2.300.8.9 -r2.300.8.10 *** posixmodule.c 4 May 2004 08:07:49 -0000 2.300.8.9 --- posixmodule.c 2 Jun 2004 10:07:01 -0000 2.300.8.10 *************** *** 903,906 **** --- 903,966 ---- } + #ifdef MS_WINDOWS + + /* IsUNCRoot -- test whether the supplied path is of the form \\SERVER\SHARE\, + where / can be used in place of \ and the trailing slash is optional. + Both SERVER and SHARE must have at least one character. + */ + + #define ISSLASHA(c) ((c) == '\\' || (c) == '/') + #define ISSLASHW(c) ((c) == L'\\' || (c) == L'/') + #define ARRAYSIZE(a) (sizeof(a) / sizeof(a[0])) + + static BOOL + IsUNCRootA(char *path, int pathlen) + { + #define ISSLASH ISSLASHA + + int i, share; + + if (pathlen < 5 || !ISSLASH(path[0]) || !ISSLASH(path[1])) + /* minimum UNCRoot is \\x\y */ + return FALSE; + for (i = 2; i < pathlen ; i++) + if (ISSLASH(path[i])) break; + if (i == 2 || i == pathlen) + /* do not allow \\\SHARE or \\SERVER */ + return FALSE; + share = i+1; + for (i = share; i < pathlen; i++) + if (ISSLASH(path[i])) break; + return (i != share && (i == pathlen || i == pathlen-1)); + + #undef ISSLASH + } + + #ifdef Py_WIN_WIDE_FILENAMES + static BOOL + IsUNCRootW(Py_UNICODE *path, int pathlen) + { + #define ISSLASH ISSLASHW + + int i, share; + + if (pathlen < 5 || !ISSLASH(path[0]) || !ISSLASH(path[1])) + /* minimum UNCRoot is \\x\y */ + return FALSE; + for (i = 2; i < pathlen ; i++) + if (ISSLASH(path[i])) break; + if (i == 2 || i == pathlen) + /* do not allow \\\SHARE or \\SERVER */ + return FALSE; + share = i+1; + for (i = share; i < pathlen; i++) + if (ISSLASH(path[i])) break; + return (i != share && (i == pathlen || i == pathlen-1)); + + #undef ISSLASH + } + #endif /* Py_WIN_WIDE_FILENAMES */ + #endif /* MS_WINDOWS */ + static PyObject * posix_do_stat(PyObject *self, PyObject *args, *************** *** 942,954 **** drive root (/ or \) or a specific drive's root (like c:\ or c:/). */ ! if (pathlen > 0 && ! (wpath[pathlen-1]== L'\\' || wpath[pathlen-1] == L'/')) { ! /* It does end with a slash -- exempt the root drive cases. */ ! /* XXX UNC root drives should also be exempted? */ ! if (pathlen == 1 || (pathlen == 3 && wpath[1] == L':')) ! /* leave it alone */; ! else { ! /* nuke the trailing backslash */ ! wpath[pathlen-1] = L'\0'; } } --- 1002,1021 ---- drive root (/ or \) or a specific drive's root (like c:\ or c:/). */ ! if (pathlen > 0) { ! if (ISSLASHW(wpath[pathlen-1])) { ! /* It does end with a slash -- exempt the root drive cases. */ ! if (pathlen == 1 || (pathlen == 3 && wpath[1] == L':') || ! IsUNCRootW(wpath, pathlen)) ! /* leave it alone */; ! else { ! /* nuke the trailing backslash */ ! wpath[pathlen-1] = L'\0'; ! } ! } ! else if (ISSLASHW(wpath[1]) && pathlen < ARRAYSIZE(wpath)-1 && ! IsUNCRootW(wpath, pathlen)) { ! /* UNC root w/o trailing slash: add one when there's room */ ! wpath[pathlen++] = L'\\'; ! wpath[pathlen] = L'\0'; } } *************** *** 985,998 **** drive root (/ or \) or a specific drive's root (like c:\ or c:/). */ ! if (pathlen > 0 && ! (path[pathlen-1]== '\\' || path[pathlen-1] == '/')) { ! /* It does end with a slash -- exempt the root drive cases. */ ! /* XXX UNC root drives should also be exempted? */ ! if (pathlen == 1 || (pathlen == 3 && path[1] == ':')) ! /* leave it alone */; ! else { ! /* nuke the trailing backslash */ strncpy(pathcopy, path, pathlen); ! pathcopy[pathlen-1] = '\0'; path = pathcopy; } --- 1052,1074 ---- drive root (/ or \) or a specific drive's root (like c:\ or c:/). */ ! if (pathlen > 0) { ! if (ISSLASHA(path[pathlen-1])) { ! /* It does end with a slash -- exempt the root drive cases. */ ! if (pathlen == 1 || (pathlen == 3 && path[1] == ':') || ! IsUNCRootA(path, pathlen)) ! /* leave it alone */; ! else { ! /* nuke the trailing backslash */ ! strncpy(pathcopy, path, pathlen); ! pathcopy[pathlen-1] = '\0'; ! path = pathcopy; ! } ! } ! else if (ISSLASHA(path[1]) && pathlen < ARRAYSIZE(pathcopy)-1 && ! IsUNCRootA(path, pathlen)) { ! /* UNC root w/o trailing slash: add one when there's room */ strncpy(pathcopy, path, pathlen); ! pathcopy[pathlen++] = '\\'; ! pathcopy[pathlen] = '\0'; path = pathcopy; }

1 0