Mailman 3 November 2003 - Python-checkins

python/dist/src/Objects setobject.c,1.11,1.12
by gvanrossum＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv32176 Modified Files: setobject.c Log Message: Stop GCC warning about int literal that's so long that it becomes an unsigned int (on a 32-bit machine), by adding an explicit 'u' to the literal (a prime used to improve the hash function for frozenset). Index: setobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/setobject.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** setobject.c 24 Nov 2003 02:57:33 -0000 1.11 --- setobject.c 24 Nov 2003 04:13:13 -0000 1.12 *************** *** 728,732 **** elements with nearby hashes so that many distinct combinations collapse to only a handful of distinct hash values. */ ! hash ^= PyObject_Hash(item) * 3644798167; Py_DECREF(item); } --- 728,732 ---- elements with nearby hashes so that many distinct combinations collapse to only a handful of distinct hash values. */ ! hash ^= PyObject_Hash(item) * 3644798167u; Py_DECREF(item); }

1 0

python/dist/src/Modules gcmodule.c, 2.71.10.1, 2.71.10.2
by gvanrossum＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv30852 Modified Files: Tag: release23-maint gcmodule.c Log Message: Silence GCC warning when asserts are turned off. Index: gcmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/gcmodule.c,v retrieving revision 2.71.10.1 retrieving revision 2.71.10.2 diff -C2 -d -r2.71.10.1 -r2.71.10.2 *** gcmodule.c 20 Nov 2003 22:13:51 -0000 2.71.10.1 --- gcmodule.c 24 Nov 2003 04:02:31 -0000 2.71.10.2 *************** *** 515,523 **** PyGC_Head *gc = wr_callbacks->gc.gc_next; PyObject *op = FROM_GC(gc); - PyWeakReference *wr = (PyWeakReference *)op; assert(IS_REACHABLE(op)); assert(PyWeakref_Check(op)); ! assert(wr->wr_callback != NULL); Py_DECREF(op); if (wr_callbacks->gc.gc_next == gc) { --- 515,522 ---- PyGC_Head *gc = wr_callbacks->gc.gc_next; PyObject *op = FROM_GC(gc); assert(IS_REACHABLE(op)); assert(PyWeakref_Check(op)); ! assert(((PyWeakReference *)op)->wr_callback != NULL); Py_DECREF(op); if (wr_callbacks->gc.gc_next == gc) {

1 0

python/dist/src/Modules gcmodule.c,2.74,2.75
by gvanrossum＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv30810 Modified Files: gcmodule.c Log Message: Silence GCC warning when asserts are turned off. Index: gcmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/gcmodule.c,v retrieving revision 2.74 retrieving revision 2.75 diff -C2 -d -r2.74 -r2.75 *** gcmodule.c 20 Nov 2003 21:21:46 -0000 2.74 --- gcmodule.c 24 Nov 2003 04:02:13 -0000 2.75 *************** *** 534,542 **** PyGC_Head *gc = wr_callbacks->gc.gc_next; PyObject *op = FROM_GC(gc); - PyWeakReference *wr = (PyWeakReference *)op; assert(IS_REACHABLE(op)); assert(PyWeakref_Check(op)); ! assert(wr->wr_callback != NULL); Py_DECREF(op); if (wr_callbacks->gc.gc_next == gc) { --- 534,541 ---- PyGC_Head *gc = wr_callbacks->gc.gc_next; PyObject *op = FROM_GC(gc); assert(IS_REACHABLE(op)); assert(PyWeakref_Check(op)); ! assert(((PyWeakReference *)op)->wr_callback != NULL); Py_DECREF(op); if (wr_callbacks->gc.gc_next == gc) {

1 0

python/dist/src/Include setobject.h,2.2,2.3
by rhettinger＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1:/tmp/cvs-serv19524/Include Modified Files: setobject.h Log Message: * Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py). Index: setobject.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/setobject.h,v retrieving revision 2.2 retrieving revision 2.3 diff -C2 -d -r2.2 -r2.3 *** setobject.h 17 Nov 2003 16:42:32 -0000 2.2 --- setobject.h 24 Nov 2003 02:57:33 -0000 2.3 *************** *** 21,25 **** PyAPI_DATA(PyTypeObject) PyFrozenSet_Type; ! #define PyAnySet_Check(ob) \ ((ob)->ob_type == &PySet_Type || (ob)->ob_type == &PyFrozenSet_Type || \ --- 21,25 ---- PyAPI_DATA(PyTypeObject) PyFrozenSet_Type; ! #define PyFrozenSet_CheckExact(ob) ((ob)->ob_type == &PyFrozenSet_Type) #define PyAnySet_Check(ob) \ ((ob)->ob_type == &PySet_Type || (ob)->ob_type == &PyFrozenSet_Type || \

1 0

python/dist/src/Objects setobject.c,1.10,1.11
by rhettinger＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv19524/Objects Modified Files: setobject.c Log Message: * Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py). Index: setobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/setobject.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** setobject.c 23 Nov 2003 02:49:05 -0000 1.10 --- setobject.c 24 Nov 2003 02:57:33 -0000 1.11 *************** *** 13,20 **** make_new_set(PyTypeObject *type, PyObject *iterable) { ! PyObject *data; PyObject *it = NULL; PyObject *item; ! PySetObject *so; /* Get iterator. */ --- 13,20 ---- make_new_set(PyTypeObject *type, PyObject *iterable) { ! PyObject *data = NULL; PyObject *it = NULL; PyObject *item; ! PySetObject *so = NULL; /* Get iterator. */ *************** *** 22,58 **** it = PyObject_GetIter(iterable); if (it == NULL) ! return NULL; } data = PyDict_New(); ! if (data == NULL) { ! Py_DECREF(it); ! return NULL; ! } while (it != NULL && (item = PyIter_Next(it)) != NULL) { if (PyDict_SetItem(data, item, Py_True) == -1) { - Py_DECREF(it); - Py_DECREF(data); Py_DECREF(item); ! return NULL; } Py_DECREF(item); } ! Py_XDECREF(it); ! if (PyErr_Occurred()) { ! Py_DECREF(data); ! return NULL; ! } /* create PySetObject structure */ so = (PySetObject *)type->tp_alloc(type, 0); ! if (so == NULL) { ! Py_DECREF(data); ! return NULL; ! } so->data = data; so->hash = -1; return (PyObject *)so; } --- 22,54 ---- it = PyObject_GetIter(iterable); if (it == NULL) ! goto done; } data = PyDict_New(); ! if (data == NULL) ! goto done; while (it != NULL && (item = PyIter_Next(it)) != NULL) { if (PyDict_SetItem(data, item, Py_True) == -1) { Py_DECREF(item); ! goto done; } Py_DECREF(item); } ! if (PyErr_Occurred()) ! goto done; /* create PySetObject structure */ so = (PySetObject *)type->tp_alloc(type, 0); ! if (so == NULL) ! goto done; ! ! Py_INCREF(data); so->data = data; so->hash = -1; + done: + Py_XDECREF(data); + Py_XDECREF(it); return (PyObject *)so; } *************** *** 65,69 **** if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable)) return NULL; ! if (iterable != NULL && iterable->ob_type == &PyFrozenSet_Type) { Py_INCREF(iterable); return iterable; --- 61,65 ---- if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable)) return NULL; ! if (iterable != NULL && PyFrozenSet_CheckExact(iterable)) { Py_INCREF(iterable); return iterable; *************** *** 162,166 **** frozenset_copy(PySetObject *so) { ! if (so->ob_type == &PyFrozenSet_Type) { Py_INCREF(so); return (PyObject *)so; --- 158,162 ---- frozenset_copy(PySetObject *so) { ! if (PyFrozenSet_CheckExact(so)) { Py_INCREF(so); return (PyObject *)so; *************** *** 172,221 **** static PyObject * - set_union(PySetObject *so, PyObject *other) - { - PySetObject *result; - PyObject *item, *data, *it; - - result = (PySetObject *)set_copy(so); - if (result == NULL) - return NULL; - - if (PyAnySet_Check(other)) { - if (PyDict_Merge(result->data, ((PySetObject *)other)->data, 0) == -1) { - Py_DECREF(result); - return NULL; - } - return (PyObject *)result; - } - - it = PyObject_GetIter(other); - if (it == NULL) { - Py_DECREF(result); - return NULL; - } - data = result->data; - while ((item = PyIter_Next(it)) != NULL) { - if (PyDict_SetItem(data, item, Py_True) == -1) { - Py_DECREF(it); - Py_DECREF(result); - Py_DECREF(item); - return NULL; - } - Py_DECREF(item); - } - Py_DECREF(it); - if (PyErr_Occurred()) { - Py_DECREF(result); - return NULL; - } - return (PyObject *)result; - } - - PyDoc_STRVAR(union_doc, - "Return the union of two sets as a new set.\n\ - \n\ - (i.e. all elements that are in either set.)"); - - static PyObject * set_union_update(PySetObject *so, PyObject *other) { --- 168,171 ---- *************** *** 225,230 **** if (PyDict_Merge(so->data, ((PySetObject *)other)->data, 0) == -1) return NULL; ! Py_INCREF(so); ! return (PyObject *)so; } --- 175,179 ---- if (PyDict_Merge(so->data, ((PySetObject *)other)->data, 0) == -1) return NULL; ! Py_RETURN_NONE; } *************** *** 252,255 **** --- 201,227 ---- static PyObject * + set_union(PySetObject *so, PyObject *other) + { + PySetObject *result; + PyObject *rv; + + result = (PySetObject *)set_copy(so); + if (result == NULL) + return NULL; + rv = set_union_update(result, other); + if (rv == NULL) { + Py_DECREF(result); + return NULL; + } + Py_DECREF(rv); + return (PyObject *)result; + } + + PyDoc_STRVAR(union_doc, + "Return the union of two sets as a new set.\n\ + \n\ + (i.e. all elements that are in either set.)"); + + static PyObject * set_or(PySetObject *so, PyObject *other) { *************** *** 287,291 **** if (result == NULL) return NULL; ! it = PyObject_GetIter(other); if (it == NULL) { --- 259,275 ---- if (result == NULL) return NULL; ! tgtdata = result->data; ! selfdata = so->data; ! ! if (PyAnySet_Check(other) && ! PyDict_Size(((PySetObject *)other)->data) > PyDict_Size(selfdata)) { ! selfdata = ((PySetObject *)other)->data; ! other = (PyObject *)so; ! } else if (PyDict_Check(other) && ! PyDict_Size(other) > PyDict_Size(selfdata)) { ! selfdata = other; ! other = so->data; ! } ! it = PyObject_GetIter(other); if (it == NULL) { *************** *** 294,299 **** } - selfdata = so->data; - tgtdata = result->data; while ((item = PyIter_Next(it)) != NULL) { if (PySequence_Contains(selfdata, item)) { --- 278,281 ---- *************** *** 391,415 **** set_difference(PySetObject *so, PyObject *other) { ! PySetObject *result; ! PyObject *item, *tgtdata, *it; ! result = (PySetObject *)set_copy(so); if (result == NULL) return NULL; ! ! it = PyObject_GetIter(other); if (it == NULL) { Py_DECREF(result); return NULL; } - tgtdata = result->data; while ((item = PyIter_Next(it)) != NULL) { ! if (PyDict_DelItem(tgtdata, item) == -1) { ! if (PyErr_ExceptionMatches(PyExc_KeyError)) ! PyErr_Clear(); ! else { Py_DECREF(it); - Py_DECREF(result); Py_DECREF(item); return NULL; --- 373,409 ---- set_difference(PySetObject *so, PyObject *other) { ! PySetObject *result, *otherset=NULL; ! PyObject *item, *otherdata, *tgtdata, *it; ! result = (PySetObject *)make_new_set(so->ob_type, NULL); if (result == NULL) return NULL; ! tgtdata = result->data; ! ! if (PyDict_Check(other)) ! otherdata = other; ! else if (PyAnySet_Check(other)) ! otherdata = ((PySetObject *)other)->data; ! else { ! otherset = (PySetObject *)make_new_set(so->ob_type, other); ! if (otherset == NULL) { ! Py_DECREF(result); ! return NULL; ! } ! otherdata = otherset->data; ! } ! ! it = PyObject_GetIter(so->data); if (it == NULL) { + Py_XDECREF(otherset); Py_DECREF(result); return NULL; } while ((item = PyIter_Next(it)) != NULL) { ! if (!PySequence_Contains(otherdata, item)) { ! if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { ! Py_XDECREF(otherset); Py_DECREF(it); Py_DECREF(item); return NULL; *************** *** 419,422 **** --- 413,417 ---- } Py_DECREF(it); + Py_XDECREF(otherset); if (PyErr_Occurred()) { Py_DECREF(result); *************** *** 490,505 **** static PyObject * ! set_symmetric_difference(PySetObject *so, PyObject *other) { ! PySetObject *result, *otherset=NULL; ! PyObject *item, *selfdata, *otherdata, *tgtdata, *it; selfdata = so->data; - result = (PySetObject *)set_copy(so); - if (result == NULL) - return NULL; - tgtdata = result->data; - if (PyDict_Check(other)) otherdata = other; --- 485,495 ---- static PyObject * ! set_symmetric_difference_update(PySetObject *so, PyObject *other) { ! PyObject *item, *selfdata, *it, *otherdata; ! PySetObject *otherset = NULL; selfdata = so->data; if (PyDict_Check(other)) otherdata = other; *************** *** 508,559 **** else { otherset = (PySetObject *)make_new_set(so->ob_type, other); ! if (otherset == NULL) { ! Py_DECREF(result); return NULL; - } otherdata = otherset->data; ! } it = PyObject_GetIter(otherdata); ! if (it == NULL) { ! Py_XDECREF(otherset); ! Py_DECREF(result); return NULL; - } while ((item = PyIter_Next(it)) != NULL) { ! if (PyDict_DelItem(tgtdata, item) == -1) { ! PyErr_Clear(); ! if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { Py_DECREF(it); Py_XDECREF(otherset); ! Py_DECREF(result); Py_DECREF(item); return NULL; ! } } Py_DECREF(item); } - Py_DECREF(it); Py_XDECREF(otherset); ! if (PyErr_Occurred()) { ! Py_DECREF(result); return NULL; ! } ! return (PyObject *)result; } ! PyDoc_STRVAR(symmetric_difference_doc, ! "Return the symmetric difference of two sets as a new set.\n\ ! \n\ ! (i.e. all elements that are in exactly one of the sets.)"); static PyObject * ! set_symmetric_difference_update(PySetObject *so, PyObject *other) { ! PyObject *item, *selfdata, *it, *otherdata; ! PySetObject *otherset = NULL; ! ! selfdata = so->data; if (PyDict_Check(other)) --- 498,543 ---- else { otherset = (PySetObject *)make_new_set(so->ob_type, other); ! if (otherset == NULL) return NULL; otherdata = otherset->data; ! } it = PyObject_GetIter(otherdata); ! if (it == NULL) return NULL; while ((item = PyIter_Next(it)) != NULL) { ! if (PySequence_Contains(selfdata, item)) { ! if (PyDict_DelItem(selfdata, item) == -1) { ! Py_XDECREF(otherset); Py_DECREF(it); + Py_DECREF(item); + return NULL; + } + } else { + if (PyDict_SetItem(selfdata, item, Py_True) == -1) { Py_XDECREF(otherset); ! Py_DECREF(it); Py_DECREF(item); return NULL; ! } } Py_DECREF(item); } Py_XDECREF(otherset); ! Py_DECREF(it); ! if (PyErr_Occurred()) return NULL; ! Py_RETURN_NONE; } ! PyDoc_STRVAR(symmetric_difference_update_doc, ! "Update a set with the symmetric difference of itself and another."); static PyObject * ! set_symmetric_difference(PySetObject *so, PyObject *other) { ! PySetObject *result; ! PyObject *item, *selfdata, *otherdata, *tgtdata, *it, *rv, *otherset; if (PyDict_Check(other)) *************** *** 562,586 **** otherdata = ((PySetObject *)other)->data; else { ! otherset = (PySetObject *)make_new_set(so->ob_type, other); if (otherset == NULL) return NULL; ! otherdata = otherset->data; ! } ! it = PyObject_GetIter(otherdata); ! if (it == NULL) return NULL; while ((item = PyIter_Next(it)) != NULL) { ! if (PySequence_Contains(selfdata, item)) { ! if (PyDict_DelItem(selfdata, item) == -1) { ! Py_XDECREF(otherset); Py_DECREF(it); Py_DECREF(item); return NULL; } ! } else { ! if (PyDict_SetItem(selfdata, item, Py_True) == -1) { ! Py_XDECREF(otherset); Py_DECREF(it); Py_DECREF(item); --- 546,594 ---- otherdata = ((PySetObject *)other)->data; else { ! otherset = make_new_set(so->ob_type, other); if (otherset == NULL) return NULL; ! rv = set_symmetric_difference_update((PySetObject *)otherset, (PyObject *)so); ! if (rv == NULL) ! return NULL; ! Py_DECREF(rv); ! return otherset; ! } ! result = (PySetObject *)make_new_set(so->ob_type, NULL); ! if (result == NULL) return NULL; + tgtdata = result->data; + selfdata = so->data; + it = PyObject_GetIter(otherdata); + if (it == NULL) { + Py_DECREF(result); + return NULL; + } while ((item = PyIter_Next(it)) != NULL) { ! if (!PySequence_Contains(selfdata, item)) { ! if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { Py_DECREF(it); Py_DECREF(item); return NULL; } ! } ! Py_DECREF(item); ! } ! Py_DECREF(it); ! if (PyErr_Occurred()) { ! Py_DECREF(result); ! return NULL; ! } ! ! it = PyObject_GetIter(selfdata); ! if (it == NULL) { ! Py_DECREF(result); ! return NULL; ! } ! while ((item = PyIter_Next(it)) != NULL) { ! if (!PySequence_Contains(otherdata, item)) { ! if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { Py_DECREF(it); Py_DECREF(item); *************** *** 590,602 **** Py_DECREF(item); } - Py_XDECREF(otherset); Py_DECREF(it); ! if (PyErr_Occurred()) return NULL; ! Py_RETURN_NONE; } ! PyDoc_STRVAR(symmetric_difference_update_doc, ! "Update a set with the symmetric difference of itself and another."); static PyObject * --- 598,614 ---- Py_DECREF(item); } Py_DECREF(it); ! if (PyErr_Occurred()) { ! Py_DECREF(result); return NULL; ! } ! ! return (PyObject *)result; } ! PyDoc_STRVAR(symmetric_difference_doc, ! "Return the symmetric difference of two sets as a new set.\n\ ! \n\ ! (i.e. all elements that are in exactly one of the sets.)"); static PyObject * *************** *** 1013,1017 **** {"union", (PyCFunction)set_union, METH_O, union_doc}, ! {"union_update",(PyCFunction)set_union_update, METH_O, union_update_doc}, {NULL, NULL} /* sentinel */ --- 1025,1029 ---- {"union", (PyCFunction)set_union, METH_O, union_doc}, ! {"update", (PyCFunction)set_union_update, METH_O, union_update_doc}, {NULL, NULL} /* sentinel */ *************** *** 1160,1165 **** "frozenset", /* tp_name */ sizeof(PySetObject), /* tp_basicsize */ ! 0, /* tp_itemsize */ ! /* methods */ (destructor)set_dealloc, /* tp_dealloc */ (printfunc)set_tp_print, /* tp_print */ --- 1172,1176 ---- "frozenset", /* tp_name */ sizeof(PySetObject), /* tp_basicsize */ ! 0, /* tp_itemsize */ /* methods */ (destructor)set_dealloc, /* tp_dealloc */ (printfunc)set_tp_print, /* tp_print */

1 0

python/dist/src/Doc/lib libstdtypes.tex, 1.140, 1.141
by rhettinger＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv19524/Doc/lib Modified Files: libstdtypes.tex Log Message: * Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py). Index: libstdtypes.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** libstdtypes.tex 30 Oct 2003 06:08:32 -0000 1.140 --- libstdtypes.tex 24 Nov 2003 02:57:33 -0000 1.141 *************** *** 1072,1075 **** --- 1072,1195 ---- \end{description} + \subsection{Set Types \label{types-set}} + \obindex{set} + + A \dfn{set} object is an unordered collection of immutable values. + Common uses include membership testing, removing duplicates from a sequence, + and computing mathematical operations such as intersection, union, difference, + and symmetric difference. + \versionadded{2.4} + + Like other collections, sets support \code{\var{x} in \var{set}}, + \code{len(\var{set})}, and \code{for \var{x} in \var{set}}. Being an + unordered collection, sets do not record element position or order of + insertion. Accordingly, sets do not support indexing, slicing, or + other sequence-like behavior. + + There are currently two builtin set types, \class{set} and \class{frozenset}. + The \class{set} type is mutable --- the contents can be changed using methods + like \method{add()} and \method{remove()}. Since it is mutable, it has no + hash value and cannot be used as either a dictionary key or as an element of + another set. The \class{frozenset} type is immutable and hashable --- its + contents cannot be altered after is created; however, it can be used as + a dictionary key or as an element of another set. + + Instances of \class{set} and \class{frozenset} provide the following operations: + + \begin{tableiii}{c|c|l}{code}{Operation}{Equivalent}{Result} + \lineiii{len(\var{s})}{}{cardinality of set \var{s}} + + \hline + \lineiii{\var{x} in \var{s}}{} + {test \var{x} for membership in \var{s}} + \lineiii{\var{x} not in \var{s}}{} + {test \var{x} for non-membership in \var{s}} + \lineiii{\var{s}.issubset(\var{t})}{\code{\var{s} <= \var{t}}} + {test whether every element in \var{s} is in \var{t}} + \lineiii{\var{s}.issuperset(\var{t})}{\code{\var{s} >= \var{t}}} + {test whether every element in \var{t} is in \var{s}} + + \hline + \lineiii{\var{s}.union(\var{t})}{\var{s} | \var{t}} + {new set with elements from both \var{s} and \var{t}} + \lineiii{\var{s}.intersection(\var{t})}{\var{s} \&\ \var{t}} + {new set with elements common to \var{s} and \var{t}} + \lineiii{\var{s}.difference(\var{t})}{\var{s} - \var{t}} + {new set with elements in \var{s} but not in \var{t}} + \lineiii{\var{s}.symmetric_difference(\var{t})}{\var{s} \^\ \var{t}} + {new set with elements in either \var{s} or \var{t} but not both} + \lineiii{\var{s}.copy()}{} + {new set with a shallow copy of \var{s}} + \end{tableiii} + + Note, the non-operator versions of \method{union()}, \method{intersection()}, + \method{difference()}, and \method{symmetric_difference()}, + \method{issubset()}, and \method{issuperset()} methods will accept any + iterable as an argument. In contrast, their operator based counterparts + require their arguments to be sets. This precludes error-prone constructions + like \code{set('abc') \&\ 'cbs'} in favor of the more readable + \code{set('abc').intersection('cbs')}. + + Both \class{set} and \class{frozenset} support set to set comparisons. + Two sets are equal if and only if every element of each set is contained in + the other (each is a subset of the other). + A set is less than another set if and only if the first set is a proper + subset of the second set (is a subset, but is not equal). + A set is greater than another set if and only if the first set is a proper + superset of the second set (is a superset, but is not equal). + + The subset and equality comparisons do not generalize to a complete + ordering function. For example, any two disjoint sets are not equal and + are not subsets of each other, so \emph{all} of the following return + \code{False}: \code{\var{a}<\var{b}}, \code{\var{a}==\var{b}}, or + \code{\var{a}>\var{b}}. + Accordingly, sets do not implement the \method{__cmp__} method. + + Since sets only define partial ordering (subset relationships), the output + of the \method{list.sort()} method is undefined for lists of sets. + + For convenience in implementing sets of sets, the \method{__contains__()}, + \method{remove()}, and \method{discard()} methods automatically match + instances of the \class{set} class their \class{frozenset} counterparts + inside a set. For example, \code{set('abc') in set([frozenset('abc')])} + returns \code{True}. + + The following table lists operations available for \class{set} + that do not apply to immutable instances of \class{frozenset}: + + \begin{tableiii}{c|c|l}{code}{Operation}{Equivalent}{Result} + \lineiii{\var{s}.update(\var{t})} + {\var{s} |= \var{t}} + {return set \var{s} with elements added from \var{t}} + \lineiii{\var{s}.intersection_update(\var{t})} + {\var{s} \&= \var{t}} + {return set \var{s} keeping only elements also found in \var{t}} + \lineiii{\var{s}.difference_update(\var{t})} + {\var{s} -= \var{t}} + {return set \var{s} after removing elements found in \var{t}} + \lineiii{\var{s}.symmetric_difference_update(\var{t})} + {\var{s} \textasciicircum= \var{t}} + {return set \var{s} with elements from \var{s} or \var{t} + but not both} + + \hline + \lineiii{\var{s}.add(\var{x})}{} + {add element \var{x} to set \var{s}} + \lineiii{\var{s}.remove(\var{x})}{} + {remove \var{x} from set \var{s}; raises KeyError if not present} + \lineiii{\var{s}.discard(\var{x})}{} + {removes \var{x} from set \var{s} if present} + \lineiii{\var{s}.pop()}{} + {remove and return an arbitrary element from \var{s}; raises + \exception{KeyError} if empty} + \lineiii{\var{s}.clear()}{} + {remove all elements from set \var{s}} + \end{tableiii} + + Note, the non-operator versions of the \method{update()}, + \method{intersection_update()}, \method{difference_update()}, and + \method{symmetric_difference_update()} methods will accept any iterable + as an argument. + \subsection{Mapping Types \label{typesmapping}}

1 0

python/dist/src/Lib/test test_set.py,1.6,1.7
by rhettinger＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv19524/Lib/test Modified Files: test_set.py Log Message: * Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py). Index: test_set.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_set.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** test_set.py 23 Nov 2003 02:49:05 -0000 1.6 --- test_set.py 24 Nov 2003 02:57:33 -0000 1.7 *************** *** 47,50 **** --- 47,55 ---- self.assertRaises(PassThru, self.s.union, check_pass_thru()) self.assertRaises(TypeError, self.s.union, [[]]) + for C in set, frozenset, dict.fromkeys, str, unicode, list, tuple: + self.assertEqual(self.thetype('abcba').union(C('cdc')), set('abcd')) + self.assertEqual(self.thetype('abcba').union(C('efgfe')), set('abcefg')) + self.assertEqual(self.thetype('abcba').union(C('ccb')), set('abc')) + self.assertEqual(self.thetype('abcba').union(C('ef')), set('abcef')) def test_or(self): *************** *** 66,69 **** --- 71,79 ---- self.assertEqual(type(i), self.thetype) self.assertRaises(PassThru, self.s.intersection, check_pass_thru()) + for C in set, frozenset, dict.fromkeys, str, unicode, list, tuple: + self.assertEqual(self.thetype('abcba').intersection(C('cdc')), set('cc')) + self.assertEqual(self.thetype('abcba').intersection(C('efgfe')), set('')) + self.assertEqual(self.thetype('abcba').intersection(C('ccb')), set('bc')) + self.assertEqual(self.thetype('abcba').intersection(C('ef')), set('')) def test_and(self): *************** *** 86,89 **** --- 96,104 ---- self.assertRaises(PassThru, self.s.difference, check_pass_thru()) self.assertRaises(TypeError, self.s.difference, [[]]) + for C in set, frozenset, dict.fromkeys, str, unicode, list, tuple: + self.assertEqual(self.thetype('abcba').difference(C('cdc')), set('ab')) + self.assertEqual(self.thetype('abcba').difference(C('efgfe')), set('abc')) + self.assertEqual(self.thetype('abcba').difference(C('ccb')), set('a')) + self.assertEqual(self.thetype('abcba').difference(C('ef')), set('abc')) def test_sub(self): *************** *** 106,109 **** --- 121,129 ---- self.assertRaises(PassThru, self.s.symmetric_difference, check_pass_thru()) self.assertRaises(TypeError, self.s.symmetric_difference, [[]]) + for C in set, frozenset, dict.fromkeys, str, unicode, list, tuple: + self.assertEqual(self.thetype('abcba').symmetric_difference(C('cdc')), set('abd')) + self.assertEqual(self.thetype('abcba').symmetric_difference(C('efgfe')), set('abcefg')) + self.assertEqual(self.thetype('abcba').symmetric_difference(C('ccb')), set('a')) + self.assertEqual(self.thetype('abcba').symmetric_difference(C('ef')), set('abcef')) def test_xor(self): *************** *** 192,196 **** def test_clear(self): self.s.clear() ! self.assertEqual(self.s, set([])) def test_copy(self): --- 212,217 ---- def test_clear(self): self.s.clear() ! self.assertEqual(self.s, set()) ! self.assertEqual(len(self.s), 0) def test_copy(self): *************** *** 202,205 **** --- 223,229 ---- self.s.add('Q') self.assert_('Q' in self.s) + dup = self.s.copy() + self.s.add('Q') + self.assertEqual(self.s, dup) self.assertRaises(TypeError, self.s.add, []) *************** *** 232,242 **** self.assertRaises(KeyError, self.s.pop) ! def test_union_update(self): ! retval = self.s.union_update(self.otherword) self.assertEqual(retval, None) for c in (self.word + self.otherword): self.assert_(c in self.s) ! self.assertRaises(PassThru, self.s.union_update, check_pass_thru()) ! self.assertRaises(TypeError, self.s.union_update, [[]]) def test_ior(self): --- 256,271 ---- self.assertRaises(KeyError, self.s.pop) ! def test_update(self): ! retval = self.s.update(self.otherword) self.assertEqual(retval, None) for c in (self.word + self.otherword): self.assert_(c in self.s) ! self.assertRaises(PassThru, self.s.update, check_pass_thru()) ! self.assertRaises(TypeError, self.s.update, [[]]) ! for p, q in (('cdc', 'abcd'), ('efgfe', 'abcefg'), ('ccb', 'abc'), ('ef', 'abcef')): ! for C in set, frozenset, dict.fromkeys, str, unicode, list, tuple: ! s = self.thetype('abcba') ! self.assertEqual(s.update(C(p)), None) ! self.assertEqual(s, set(q)) def test_ior(self): *************** *** 255,258 **** --- 284,292 ---- self.assertRaises(PassThru, self.s.intersection_update, check_pass_thru()) self.assertRaises(TypeError, self.s.intersection_update, [[]]) + for p, q in (('cdc', 'c'), ('efgfe', ''), ('ccb', 'bc'), ('ef', '')): + for C in set, frozenset, dict.fromkeys, str, unicode, list, tuple: + s = self.thetype('abcba') + self.assertEqual(s.intersection_update(C(p)), None) + self.assertEqual(s, set(q)) def test_iand(self): *************** *** 274,277 **** --- 308,317 ---- self.assertRaises(PassThru, self.s.difference_update, check_pass_thru()) self.assertRaises(TypeError, self.s.difference_update, [[]]) + self.assertRaises(TypeError, self.s.symmetric_difference_update, [[]]) + for p, q in (('cdc', 'ab'), ('efgfe', 'abc'), ('ccb', 'a'), ('ef', 'abc')): + for C in set, frozenset, dict.fromkeys, str, unicode, list, tuple: + s = self.thetype('abcba') + self.assertEqual(s.difference_update(C(p)), None) + self.assertEqual(s, set(q)) def test_isub(self): *************** *** 293,296 **** --- 333,341 ---- self.assertRaises(PassThru, self.s.symmetric_difference_update, check_pass_thru()) self.assertRaises(TypeError, self.s.symmetric_difference_update, [[]]) + for p, q in (('cdc', 'abd'), ('efgfe', 'abcefg'), ('ccb', 'a'), ('ef', 'abcef')): + for C in set, frozenset, dict.fromkeys, str, unicode, list, tuple: + s = self.thetype('abcba') + self.assertEqual(s.symmetric_difference_update(C(p)), None) + self.assertEqual(s, set(q)) def test_ixor(self): *************** *** 636,640 **** def test_union_method_call(self): ! self.set.union_update(set([3, 4, 5])) self.assertEqual(self.set, set([2, 3, 4, 5, 6])) --- 681,685 ---- def test_union_method_call(self): ! self.set.update(set([3, 4, 5])) self.assertEqual(self.set, set([2, 3, 4, 5, 6])) *************** *** 762,774 **** def test_update_empty_tuple(self): ! self.set.union_update(()) self.assertEqual(self.set, set(self.values)) def test_update_unit_tuple_overlap(self): ! self.set.union_update(("a",)) self.assertEqual(self.set, set(self.values)) def test_update_unit_tuple_non_overlap(self): ! self.set.union_update(("a", "z")) self.assertEqual(self.set, set(self.values + ["z"])) --- 807,819 ---- def test_update_empty_tuple(self): ! self.set.update(()) self.assertEqual(self.set, set(self.values)) def test_update_unit_tuple_overlap(self): ! self.set.update(("a",)) self.assertEqual(self.set, set(self.values)) def test_update_unit_tuple_non_overlap(self): ! self.set.update(("a", "z")) self.assertEqual(self.set, set(self.values + ["z"])) *************** *** 873,877 **** self.assertRaises(TypeError, lambda: self.other >= self.set) ! def test_union_update_operator(self): try: self.set |= self.other --- 918,922 ---- self.assertRaises(TypeError, lambda: self.other >= self.set) ! def test_update_operator(self): try: self.set |= self.other *************** *** 881,889 **** self.fail("expected TypeError") ! def test_union_update(self): if self.otherIsIterable: ! self.set.union_update(self.other) else: ! self.assertRaises(TypeError, self.set.union_update, self.other) def test_union(self): --- 926,934 ---- self.fail("expected TypeError") ! def test_update(self): if self.otherIsIterable: ! self.set.update(self.other) else: ! self.assertRaises(TypeError, self.set.update, self.other) def test_union(self): *************** *** 1216,1220 **** def test_inplace_methods(self): for data in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5), 'december'): ! for methname in ('union_update', 'intersection_update', 'difference_update', 'symmetric_difference_update'): for g in (G, I, Ig, S, L, R): --- 1261,1265 ---- def test_inplace_methods(self): for data in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5), 'december'): ! for methname in ('update', 'intersection_update', 'difference_update', 'symmetric_difference_update'): for g in (G, I, Ig, S, L, R):

1 0

python/dist/src/Lib/idlelib NEWS.txt, 1.23.4.2, 1.23.4.3 idlever.py, 1.15, 1.15.4.1 run.py, 1.25, 1.25.8.1
by kbk＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1:/tmp/cvs-serv15104 Modified Files: Tag: release23-maint NEWS.txt idlever.py run.py Log Message: Backport: - After an exception, run.py was not setting the exception vector. Noam Raphael suggested correcting this so pdb's postmortem pm() would work. IDLEfork Patch 844675 Update NEWS and include some items missed in IDLE1.0b2. Bump the version. Modified Files: Tag: release23-maint NEWS.txt idlever.py run.py Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.23.4.2 retrieving revision 1.23.4.3 diff -C2 -d -r1.23.4.2 -r1.23.4.3 *** NEWS.txt 23 Sep 2003 08:12:13 -0000 1.23.4.2 --- NEWS.txt 24 Nov 2003 02:34:01 -0000 1.23.4.3 *************** *** 1,2 **** --- 1,16 ---- + What's New in IDLE 1.0.2? + =================================== + + *Release date: XX-Dec-2003* + + - After an exception, run.py was not setting the exception vector. Noam + Raphael suggested correcting this so pdb's postmortem pm() would work. + IDLEfork Patch 844675 + + - IDLE now does not fail to save the file anymore if the Tk buffer is not a + Unicode string, yet eol_convention is. Python Bugs 774680, 788378 + + - IDLE will use the Python html docs on the system, if found + What's New in IDLE 1.0.1? =================================== *************** *** 52,55 **** --- 66,79 ---- *Release date: 29-Jun-2003* + + - Extend AboutDialog.ViewFile() to support file encodings. Make the CREDITS + file Latin-1. + + - Updated the About dialog to reflect re-integration into Python. Provide + buttons to display Python's NEWS, License, and Credits, plus additional + buttons for IDLE's README and NEWS. + + - TextViewer() now has a third parameter which allows inserting text into the + viewer instead of reading from a file. - (Created the .../Lib/idlelib directory in the Python CVS, which is a clone of Index: idlever.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/idlever.py,v retrieving revision 1.15 retrieving revision 1.15.4.1 diff -C2 -d -r1.15 -r1.15.4.1 *** idlever.py 27 Jul 2003 00:56:41 -0000 1.15 --- idlever.py 24 Nov 2003 02:34:01 -0000 1.15.4.1 *************** *** 1 **** ! IDLE_VERSION = "1.0" --- 1 ---- ! IDLE_VERSION = "1.0.1+" Index: run.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/run.py,v retrieving revision 1.25 retrieving revision 1.25.8.1 diff -C2 -d -r1.25 -r1.25.8.1 *** run.py 22 Jun 2003 07:52:56 -0000 1.25 --- run.py 24 Nov 2003 02:34:01 -0000 1.25.8.1 *************** *** 112,116 **** flush_stdout() efile = sys.stderr ! typ, val, tb = sys.exc_info() tbe = traceback.extract_tb(tb) print >>efile, '\nTraceback (most recent call last):' --- 112,117 ---- flush_stdout() efile = sys.stderr ! typ, val, tb = excinfo = sys.exc_info() ! sys.last_type, sys.last_value, sys.last_traceback = excinfo tbe = traceback.extract_tb(tb) print >>efile, '\nTraceback (most recent call last):'

1 0

python/dist/src/Lib/test test_mimetypes.py, 1.7, 1.8
by bwarsaw＠users.sourceforge.net Nov. 23, 2003

Nov. 23, 2003

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv31749 Modified Files: test_mimetypes.py Log Message: test_guess_all_types(): Use a more robust test for checking that guess_all_extensions() returns (at least) what we expect. As Jeff Epler suggests in http://mail.python.org/pipermail/python-dev/2003-September/038264.html We use a set to test the results. This fixes the test when test_urllib2 is run before test_mimetypes. Index: test_mimetypes.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mimetypes.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** test_mimetypes.py 18 Jul 2003 15:13:37 -0000 1.7 --- test_mimetypes.py 23 Nov 2003 16:21:55 -0000 1.8 *************** *** 2,5 **** --- 2,6 ---- import StringIO import unittest + from sets import Set from test import test_support *************** *** 47,54 **** def test_guess_all_types(self): eq = self.assertEqual ! # First try strict ! all = self.db.guess_all_extensions('text/plain', strict=True) ! all.sort() ! eq(all, ['.bat', '.c', '.h', '.ksh', '.pl', '.txt']) # And now non-strict all = self.db.guess_all_extensions('image/jpg', strict=False) --- 48,57 ---- def test_guess_all_types(self): eq = self.assertEqual ! unless = self.failUnless ! # First try strict. Use a set here for testing the results because if ! # test_urllib2 is run before test_mimetypes, global state is modified ! # such that the 'all' set will have more items in it. ! all = Set(self.db.guess_all_extensions('text/plain', strict=True)) ! unless(all >= Set(['.bat', '.c', '.h', '.ksh', '.pl', '.txt'])) # And now non-strict all = self.db.guess_all_extensions('image/jpg', strict=False)

1 0

python/dist/src/Lib/test test_mimetypes.py, 1.7, 1.7.6.1
by bwarsaw＠users.sourceforge.net Nov. 23, 2003

Nov. 23, 2003

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv30963 Modified Files: Tag: release23-maint test_mimetypes.py Log Message: test_guess_all_types(): Use a more robust test for checking that guess_all_extensions() returns (at least) what we expect. As Jeff Epler suggests in http://mail.python.org/pipermail/python-dev/2003-September/038264.html We use a set to test the results. This fixes the test when test_urllib2 is run before test_mimetypes. Index: test_mimetypes.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mimetypes.py,v retrieving revision 1.7 retrieving revision 1.7.6.1 diff -C2 -d -r1.7 -r1.7.6.1 *** test_mimetypes.py 18 Jul 2003 15:13:37 -0000 1.7 --- test_mimetypes.py 23 Nov 2003 16:17:42 -0000 1.7.6.1 *************** *** 2,5 **** --- 2,6 ---- import StringIO import unittest + from sets import Set from test import test_support *************** *** 47,54 **** def test_guess_all_types(self): eq = self.assertEqual ! # First try strict ! all = self.db.guess_all_extensions('text/plain', strict=True) ! all.sort() ! eq(all, ['.bat', '.c', '.h', '.ksh', '.pl', '.txt']) # And now non-strict all = self.db.guess_all_extensions('image/jpg', strict=False) --- 48,57 ---- def test_guess_all_types(self): eq = self.assertEqual ! unless = self.failUnless ! # First try strict. Use a set here for testing the results because if ! # test_urllib2 is run before test_mimetypes, global state is modified ! # such that the 'all' set will have more items in it. ! all = Set(self.db.guess_all_extensions('text/plain', strict=True)) ! unless(all >= Set(['.bat', '.c', '.h', '.ksh', '.pl', '.txt'])) # And now non-strict all = self.db.guess_all_extensions('image/jpg', strict=False)

1 0