Mailman 3 June 2004 - Python-checkins

python/dist/src/Modules posixmodule.c, 2.317, 2.318
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-serv20167/Modules Modified Files: posixmodule.c Log Message: Patch #954115: Fix os.stat handling of UNC roots. Will backport to 2.3. Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.317 retrieving revision 2.318 diff -C2 -d -r2.317 -r2.318 *** posixmodule.c 4 May 2004 08:10:37 -0000 2.317 --- posixmodule.c 2 Jun 2004 09:57:56 -0000 2.318 *************** *** 893,896 **** --- 893,956 ---- } + #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, *************** *** 932,944 **** 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'; } } --- 992,1011 ---- 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'; } } *************** *** 975,988 **** 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; } --- 1042,1064 ---- 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

python/dist/src/Misc NEWS,1.981,1.982
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-serv20167/Misc Modified Files: NEWS Log Message: Patch #954115: Fix os.stat handling of UNC roots. Will backport to 2.3. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.981 retrieving revision 1.982 diff -C2 -d -r1.981 -r1.982 *** NEWS 1 Jun 2004 15:22:41 -0000 1.981 --- NEWS 2 Jun 2004 09:57:55 -0000 1.982 *************** *** 211,214 **** --- 211,216 ---- ----------------- + - nt now properly allows to refer to UNC roots, e.g. in nt.stat(). + - the weakref module now supports additional objects: array.array, sre.pattern_objects, file objects, and sockets.

1 0

python/dist/src/Lib imaplib.py,1.69,1.70
by pierslauder＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30614/dist/src/Lib Modified Files: imaplib.py Log Message: Added IMAP4_stream to __all__ Index: imaplib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/imaplib.py,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** imaplib.py 20 May 2004 11:32:35 -0000 1.69 --- imaplib.py 2 Jun 2004 00:42:36 -0000 1.70 *************** *** 24,28 **** import binascii, os, random, re, socket, sys, time ! __all__ = ["IMAP4", "IMAP4_SSL", "Internaldate2tuple", "Int2AP", "ParseFlags", "Time2Internaldate"] --- 24,28 ---- import binascii, os, random, re, socket, sys, time ! __all__ = ["IMAP4", "IMAP4_SSL", "IMAP4_stream", "Internaldate2tuple", "Int2AP", "ParseFlags", "Time2Internaldate"]

1 0

python/dist/src/Lib/test test_tuple.py,1.3,1.4
by tim_one＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28241 Modified Files: test_tuple.py Log Message: test_hash(): The test here is different enough from the one in the bug report that the stats for expected # of collisions are a little higher. Updated comments accordingly. Index: test_tuple.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tuple.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** test_tuple.py 1 Jun 2004 06:36:24 -0000 1.3 --- test_tuple.py 1 Jun 2004 18:58:04 -0000 1.4 *************** *** 50,56 **** # should be distinct from element hashes: hash(x)!=hash((x,)) # This test exercises those cases. ! # For a pure random hash and N=50, the expected number of collisions ! # is 7.3. Here we allow twice that number. ! # Any worse and the hash function is sorely suspect. N=50 --- 50,60 ---- # should be distinct from element hashes: hash(x)!=hash((x,)) # This test exercises those cases. ! # For a pure random hash and N=50, the expected number of occupied ! # buckets when tossing 252,600 balls into 2**32 buckets ! # is 252,592.6, or about 7.4 expected collisions. The ! # standard deviation is 2.73. On a box with 64-bit hash ! # codes, no collisions are expected. Here we accept no ! # more than 15 collisions. Any worse and the hash function ! # is sorely suspect. N=50

1 0

When I Fall In Love With You
by Julio Harris June 1, 2004

June 1, 2004

ThereÿFFFF92s a whole new world on the Internet Where people fall in love with compatible people. What are you waiting for? Click below and weÿFFFF92ll take you on a magic carpet ride. http://powerfulthing.com/web/?oc=53033998

1 0

python/dist/src/PCbuild pythoncore.vcproj, 1.7, 1.8
by loewis＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/PCbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5828 Modified Files: pythoncore.vcproj Log Message: Add genobject.c Index: pythoncore.vcproj =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/pythoncore.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pythoncore.vcproj 27 Apr 2004 18:34:08 -0000 1.7 --- pythoncore.vcproj 1 Jun 2004 17:21:13 -0000 1.8 *************** *** 994,997 **** --- 994,1000 ---- </File> <File + RelativePath="..\Objects\genobject.c"> + </File> + <File RelativePath="..\Python\getargs.c"> <FileConfiguration

1 0

python/dist/src/PC/VC6 pythoncore.dsp,1.8,1.9
by rhettinger＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/PC/VC6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27164 Modified Files: pythoncore.dsp Log Message: Add genobject.c to the MSVC++ 6.0 build. Index: pythoncore.dsp =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/VC6/pythoncore.dsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pythoncore.dsp 27 Apr 2004 04:52:47 -0000 1.8 --- pythoncore.dsp 1 Jun 2004 16:29:57 -0000 1.9 *************** *** 362,365 **** --- 362,369 ---- # Begin Source File + SOURCE=..\..\Objects\genobject.c + # End Source File + # Begin Source File + SOURCE=..\..\Python\getargs.c # End Source File

1 0

python/dist/src Makefile.pre.in,1.142,1.143
by loewis＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11725 Modified Files: Makefile.pre.in Log Message: Patch #957398: Add public API for Generator Object/Type. Index: Makefile.pre.in =================================================================== RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** Makefile.pre.in 18 Mar 2004 07:51:27 -0000 1.142 --- Makefile.pre.in 1 Jun 2004 15:22:39 -0000 1.143 *************** *** 262,265 **** --- 262,266 ---- Objects/descrobject.o \ Objects/enumobject.o \ + Objects/genobject.o \ Objects/fileobject.o \ Objects/floatobject.o \ *************** *** 479,482 **** --- 480,484 ---- Include/dictobject.h \ Include/enumobject.h \ + Include/genobject.h \ Include/fileobject.h \ Include/floatobject.h \

1 0

python/dist/src/Python ceval.c,2.396,2.397
by loewis＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11725/Python Modified Files: ceval.c Log Message: Patch #957398: Add public API for Generator Object/Type. Index: ceval.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v retrieving revision 2.396 retrieving revision 2.397 diff -C2 -d -r2.396 -r2.397 *** ceval.c 11 Apr 2004 14:59:33 -0000 2.396 --- ceval.c 1 Jun 2004 15:22:42 -0000 2.397 *************** *** 11,14 **** --- 11,15 ---- #include "compile.h" #include "frameobject.h" + #include "genobject.h" #include "eval.h" #include "opcode.h" *************** *** 140,280 **** #endif - static PyTypeObject gentype; - - typedef struct { - PyObject_HEAD - /* The gi_ prefix is intended to remind of generator-iterator. */ - - PyFrameObject *gi_frame; - - /* True if generator is being executed. */ - int gi_running; - - /* List of weak reference. */ - PyObject *gi_weakreflist; - } genobject; - - static PyObject * - gen_new(PyFrameObject *f) - { - genobject *gen = PyObject_GC_New(genobject, &gentype); - if (gen == NULL) { - Py_DECREF(f); - return NULL; - } - gen->gi_frame = f; - gen->gi_running = 0; - gen->gi_weakreflist = NULL; - _PyObject_GC_TRACK(gen); - return (PyObject *)gen; - } - - static int - gen_traverse(genobject *gen, visitproc visit, void *arg) - { - return visit((PyObject *)gen->gi_frame, arg); - } - - static void - gen_dealloc(genobject *gen) - { - _PyObject_GC_UNTRACK(gen); - if (gen->gi_weakreflist != NULL) - PyObject_ClearWeakRefs((PyObject *) gen); - Py_DECREF(gen->gi_frame); - PyObject_GC_Del(gen); - } - - static PyObject * - gen_iternext(genobject *gen) - { - PyThreadState *tstate = PyThreadState_GET(); - PyFrameObject *f = gen->gi_frame; - PyObject *result; - - if (gen->gi_running) { - PyErr_SetString(PyExc_ValueError, - "generator already executing"); - return NULL; - } - if (f->f_stacktop == NULL) - return NULL; - - /* Generators always return to their most recent caller, not - * necessarily their creator. */ - Py_XINCREF(tstate->frame); - assert(f->f_back == NULL); - f->f_back = tstate->frame; - - gen->gi_running = 1; - result = eval_frame(f); - gen->gi_running = 0; - - /* Don't keep the reference to f_back any longer than necessary. It - * may keep a chain of frames alive or it could create a reference - * cycle. */ - Py_XDECREF(f->f_back); - f->f_back = NULL; - - /* If the generator just returned (as opposed to yielding), signal - * that the generator is exhausted. */ - if (result == Py_None && f->f_stacktop == NULL) { - Py_DECREF(result); - result = NULL; - } - - return result; - } - - static PyObject * - gen_getiter(PyObject *gen) - { - Py_INCREF(gen); - return gen; - } - - static PyMemberDef gen_memberlist[] = { - {"gi_frame", T_OBJECT, offsetof(genobject, gi_frame), RO}, - {"gi_running", T_INT, offsetof(genobject, gi_running), RO}, - {NULL} /* Sentinel */ - }; - - static PyTypeObject gentype = { - PyObject_HEAD_INIT(&PyType_Type) - 0, /* ob_size */ - "generator", /* tp_name */ - sizeof(genobject), /* tp_basicsize */ - 0, /* tp_itemsize */ - /* methods */ - (destructor)gen_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_compare */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ - 0, /* tp_doc */ - (traverseproc)gen_traverse, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - offsetof(genobject, gi_weakreflist), /* tp_weaklistoffset */ - (getiterfunc)gen_getiter, /* tp_iter */ - (iternextfunc)gen_iternext, /* tp_iternext */ - 0, /* tp_methods */ - gen_memberlist, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - }; - #ifdef WITH_THREAD --- 141,144 ---- *************** *** 2674,2678 **** /* Create a new generator that owns the ready to run frame * and return that as the value. */ ! return gen_new(f); } --- 2538,2542 ---- /* Create a new generator that owns the ready to run frame * and return that as the value. */ ! return PyGen_New(f); } *************** *** 3408,3411 **** --- 3272,3281 ---- } + PyObject * + PyEval_EvaluateFrame(PyObject *fo) + { + return eval_frame((PyFrameObject *)fo); + } + #define EXT_POP(STACK_POINTER) (*--(STACK_POINTER))

1 0

python/dist/src/Misc NEWS,1.980,1.981
by loewis＠users.sourceforge.net June 1, 2004

June 1, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11725/Misc Modified Files: NEWS Log Message: Patch #957398: Add public API for Generator Object/Type. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.980 retrieving revision 1.981 diff -C2 -d -r1.980 -r1.981 *** NEWS 1 Jun 2004 06:36:23 -0000 1.980 --- NEWS 1 Jun 2004 15:22:41 -0000 1.981 *************** *** 498,501 **** --- 498,504 ---- ----- + - New public functions PyEval_EvaluateFrame and PyGen_New to expose + generator objects. + - New public functions Py_IncRef() and Py_DecRef(), exposing the functionality of the Py_XINCREF() and Py_XDECREF macros. Useful for

1 0