Mailman 3 July 2005 - Python-checkins

python/nondist/sandbox/set setobject.c,1.5,1.6
by rhettinger＠users.sourceforge.net July 30, 2005

July 30, 2005

Update of /cvsroot/python/python/nondist/sandbox/set In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25306 Modified Files: setobject.c Log Message: * Restore logic for temporary frozensets in __contains__ , discard, and remove. * Eliminate set_keys_internal in favor of PySequence_List. * Add self-documenting macro for discard's return values. Index: setobject.c =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/set/setobject.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- setobject.c 30 Jul 2005 15:02:21 -0000 1.5 +++ setobject.c 30 Jul 2005 16:21:17 -0000 1.6 @@ -362,11 +362,8 @@ return set_table_resize(mp, mp->ma_used*(mp->ma_used>50000 ? 2 : 4)); } -/* Discard unconditionally removes an entry. - Returns 1 if not found - Returns 0 if found and removed - Returns -1 on hash error -*/ +#define DISCARD_FOUND 0 +#define DISCARD_NOTFOUND 1 static int set_discard_internal(PySetObject *mp, PyObject *key) @@ -383,15 +380,14 @@ return -1; } ep = (mp->ma_lookup)(mp, key, hash); - if (ep->me_key == NULL || ep->me_key == dummy) { - return 1; - } + if (ep->me_key == NULL || ep->me_key == dummy) + return DISCARD_NOTFOUND; old_key = ep->me_key; Py_INCREF(dummy); ep->me_key = dummy; mp->ma_used--; Py_DECREF(old_key); - return 0; + return DISCARD_FOUND; } static int @@ -496,7 +492,7 @@ return 0; ep = mp->ma_table; mask = mp->ma_mask; - while (i <= mask && (ep[i].me_key == NULL || ep[i].me_key == dummy)) // XXX ? can this be simplified + while (i <= mask && (ep[i].me_key == NULL || ep[i].me_key == dummy)) i++; *ppos = i+1; if (i > mask) @@ -541,40 +537,6 @@ return 0; } -static PyObject * -set_keys_internal(register PySetObject *mp) -{ - register PyObject *v; - register int i, j; - setentry *ep; - int mask, n; - - again: - n = mp->ma_used; - v = PyList_New(n); - if (v == NULL) - return NULL; - if (n != mp->ma_used) { - /* Durnit. The allocations caused the set to resize. - * Just start over, this shouldn't normally happen. - */ - Py_DECREF(v); - goto again; - } - ep = mp->ma_table; - mask = mp->ma_mask; - for (i = 0, j = 0; i <= mask; i++) { - if (ep[i].me_key != NULL && ep[i].me_key != dummy) { // XXX can this be simplified - PyObject *key = ep[i].me_key; - Py_INCREF(key); - PyList_SET_ITEM(v, j, key); - j++; - } - } - assert(j == n); - return v; -} - static PyTypeObject PysetiterKey_Type; /* Forward */ static PyObject *set_iter(setobject *); @@ -868,6 +830,38 @@ return ((PySetObject *)so)->ma_used; } +static void +set_swap_bodies(PySetObject *a, PySetObject *b) +{ + int t; + PySetEntry *u; + PySetEntry *(*f)(PySetObject *mp, PyObject *key, long hash); + PySetEntry tab[PySet_MINSIZE]; + long h; + + t = a->ma_fill; a->ma_fill = b->ma_fill; b->ma_fill = t; + t = a->ma_used; a->ma_used = b->ma_used; b->ma_used = t; + t = a->ma_mask; a->ma_mask = b->ma_mask; b->ma_mask = t; + + u = a->ma_table; + if (a->ma_table == a->ma_smalltable) + u = b->ma_smalltable; + a->ma_table = b->ma_table; + if (b->ma_table == b->ma_smalltable) + a->ma_table = a->ma_smalltable; + b->ma_table = u; + + f = a->ma_lookup; a->ma_lookup = b->ma_lookup; b->ma_lookup = f; + + if (a->ma_table == a->ma_smalltable || b->ma_table == b->ma_smalltable) { + memcpy(tab, a->ma_smalltable, sizeof(tab)); + memcpy(a->ma_smalltable, b->ma_smalltable, sizeof(tab)); + memcpy(b->ma_smalltable, tab, sizeof(tab)); + } + + h = a->hash; a->hash = b->hash; b->hash = h; +} + static int set_contains(PySetObject *so, PyObject *key) { @@ -877,10 +871,12 @@ result = set_contains_internal(so, key); if (result == -1 && PyAnySet_Check(key)) { PyErr_Clear(); - tmp = make_new_set(&PyFrozenSet_Type, key); + tmp = make_new_set(&PyFrozenSet_Type, NULL); if (tmp == NULL) return -1; + set_swap_bodies((PySetObject *)tmp, (PySetObject *)key); result = set_contains_internal(so, tmp); + set_swap_bodies((PySetObject *)tmp, (PySetObject *)key); Py_DECREF(tmp); } return result; @@ -1026,42 +1022,6 @@ \n\ (i.e. all elements that are in both sets.)"); - -static void -set_swap_bodies(PySetObject *a, PySetObject *b) -{ - int t; - PySetEntry *u; - PySetEntry *(*f)(PySetObject *mp, PyObject *key, long hash); - PySetEntry tab[PySet_MINSIZE]; - long h; - - t = a->ma_fill; a->ma_fill = b->ma_fill; b->ma_fill = t; - t = a->ma_used; a->ma_used = b->ma_used; b->ma_used = t; - t = a->ma_mask; a->ma_mask = b->ma_mask; b->ma_mask = t; - - u = a->ma_table; - if (a->ma_table == a->ma_smalltable) - u = b->ma_smalltable; - a->ma_table = b->ma_table; - if (b->ma_table == b->ma_smalltable) - a->ma_table = a->ma_smalltable; - b->ma_table = u; - - f = a->ma_lookup; a->ma_lookup = b->ma_lookup; b->ma_lookup = f; - - if (a->ma_table == a->ma_smalltable || b->ma_table == b->ma_smalltable) { - memcpy(tab, a->ma_smalltable, sizeof(tab)); - memcpy(a->ma_smalltable, b->ma_smalltable, sizeof(tab)); - memcpy(b->ma_smalltable, tab, sizeof(tab)); - } - - h = a->hash; a->hash = b->hash; b->hash = h; -} - -static PyObject *set_clear(PySetObject *so); /// XXX remove forward declaration -static int set_tp_clear(PySetObject *so); /// XXX remove forward declaration - static PyObject * set_intersection_update(PySetObject *so, PyObject *other) { @@ -1218,7 +1178,7 @@ rv = set_discard_internal(so, key); if (rv == -1) return NULL; - if (rv == 1) { + if (rv == DISCARD_NOTFOUND) { if (set_add_internal(so, key) == -1) return NULL; } @@ -1241,7 +1201,7 @@ Py_XDECREF(otherset); return NULL; } - if (rv == 1) { + if (rv == DISCARD_NOTFOUND) { if (set_add_internal(so, key) == -1) { Py_XDECREF(otherset); return NULL; @@ -1438,7 +1398,7 @@ { PyObject *keys, *result, *listrepr; - keys = set_keys_internal(so); + keys = PySequence_List((PyObject *)so); if (keys == NULL) return NULL; listrepr = PyObject_Repr(keys); @@ -1508,10 +1468,12 @@ PyObject *tmp, *result; if (PyType_IsSubtype(item->ob_type, &PySet_Type)) { - tmp = make_new_set(&PyFrozenSet_Type, item); + tmp = make_new_set(&PyFrozenSet_Type, NULL); if (tmp == NULL) return NULL; + set_swap_bodies((PySetObject *)item, (PySetObject *)tmp); result = set_remove(so, tmp); + set_swap_bodies((PySetObject *)item, (PySetObject *)tmp); Py_DECREF(tmp); return result; } @@ -1532,10 +1494,12 @@ PyObject *tmp, *result; if (PyType_IsSubtype(item->ob_type, &PySet_Type)) { - tmp = make_new_set(&PyFrozenSet_Type, item); + tmp = make_new_set(&PyFrozenSet_Type, NULL); if (tmp == NULL) return NULL; + set_swap_bodies((PySetObject *)item, (PySetObject *)tmp); result = set_discard(so, tmp); + set_swap_bodies((PySetObject *)item, (PySetObject *)tmp); Py_DECREF(tmp); return result; } @@ -1575,7 +1539,7 @@ { PyObject *keys=NULL, *args=NULL, *result=NULL, *dict=NULL; - keys = set_keys_internal(so); + keys = PySequence_List((PyObject *)so); if (keys == NULL) goto done; args = PyTuple_Pack(1, keys);

1 0

python/nondist/sandbox/set setobject.c,1.4,1.5
by rhettinger＠users.sourceforge.net July 30, 2005

July 30, 2005

Update of /cvsroot/python/python/nondist/sandbox/set In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11269 Modified Files: setobject.c Log Message: Fix spelling. Index: setobject.c =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/set/setobject.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- setobject.c 30 Jul 2005 14:22:10 -0000 1.4 +++ setobject.c 30 Jul 2005 15:02:21 -0000 1.5 @@ -383,7 +383,7 @@ return -1; } ep = (mp->ma_lookup)(mp, key, hash); - if (ep->me_key == NULL || ep->me_key == dummy) { // XXX ? can this be simplified + if (ep->me_key == NULL || ep->me_key == dummy) { return 1; } old_key = ep->me_key; @@ -1028,7 +1028,7 @@ static void -set_swap_bodys(PySetObject *a, PySetObject *b) +set_swap_bodies(PySetObject *a, PySetObject *b) { int t; PySetEntry *u; @@ -1070,7 +1070,7 @@ tmp = set_intersection(so, other); if (tmp == NULL) return NULL; - set_swap_bodys(so, (PySetObject *)tmp); + set_swap_bodies(so, (PySetObject *)tmp); Py_DECREF(tmp); Py_RETURN_NONE; }

1 0

python/nondist/sandbox/set setobject.c,1.3,1.4
by rhettinger＠users.sourceforge.net July 30, 2005

July 30, 2005

Update of /cvsroot/python/python/nondist/sandbox/set In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3511 Modified Files: setobject.c Log Message: Simplify code for symmetric_differences. Index: setobject.c =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/set/setobject.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- setobject.c 29 Jul 2005 19:03:00 -0000 1.3 +++ setobject.c 30 Jul 2005 14:22:10 -0000 1.4 @@ -1258,46 +1258,17 @@ static PyObject * set_symmetric_difference(PySetObject *so, PyObject *other) { - PyObject *rv, *key; - PySetObject *result, *otherset; - int pos = 0; - - if (!PyAnySet_Check(other)) { - otherset = (PySetObject *)make_new_set(so->ob_type, other); - if (otherset == NULL) - return NULL; - rv = set_symmetric_difference_update(otherset, (PyObject *)so); - if (rv == NULL) - return NULL; - Py_DECREF(rv); - return (PyObject *)otherset; - } + PyObject *rv; + PySetObject *otherset; - result = (PySetObject *)make_new_set(so->ob_type, NULL); - if (result == NULL) + otherset = (PySetObject *)make_new_set(so->ob_type, other); + if (otherset == NULL) return NULL; - - otherset = (PySetObject *)other; - while (set_next_internal(otherset, &pos, &key)) { - if (!set_contains_internal(so, key)) { - if (set_add_internal(result, key) == -1) { - Py_DECREF(result); - return NULL; - } - } - } - - pos = 0; - while (set_next_internal(so, &pos, &key)) { - if (!set_contains_internal(otherset, key)) { - if (set_add_internal(result, key) == -1) { - Py_DECREF(result); - return NULL; - } - } - } - - return (PyObject *)result; + rv = set_symmetric_difference_update(otherset, (PyObject *)so); + if (rv == NULL) + return NULL; + Py_DECREF(rv); + return (PyObject *)otherset; } PyDoc_STRVAR(symmetric_difference_doc,

1 0

python/nondist/sandbox/path path.py, 1.7, 1.8 test_path.py, 1.6, 1.7
by birkenfeld＠users.sourceforge.net July 30, 2005

July 30, 2005

Update of /cvsroot/python/python/nondist/sandbox/path In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13772 Modified Files: path.py test_path.py Log Message: Allow constructor to take more args. Path("a", "b") => "a/b". Index: path.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/path/path.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- path.py 25 Jul 2005 16:09:17 -0000 1.7 +++ path.py 30 Jul 2005 12:14:14 -0000 1.8 @@ -60,11 +60,13 @@ """ if not args: return Path(os.curdir) - if len(args) > 1: - raise TypeError("Path() takes at most 1 argument (%i given)" % len(args)) - if not isinstance(args[0], basestring): - raise ValueError("Path() argument must be Path, str or unicode") - return _base.__new__(typ, *args) + for arg in args: + if not isinstance(arg, basestring): + raise ValueError("Path() arguments must be Path, str or unicode") + if len(args) == 1: + return _base.__new__(typ, *args) + else: + return Path(os.path.join(*args)) # Iterating over a string yields its parts def __iter__(self): @@ -234,18 +236,12 @@ """ The UNC mount point for this path. This is empty for paths on local drives. """) - @staticmethod - def join(*args): - if args: - return Path(args[0]).joinwith(args[1:]) - return Path('') - def joinwith(self, *args): """ Join two or more path components, adding a separator character (os.sep) if needed. Returns a new path object. """ - return Path(os.path.join(self, *map(_base, args))) + return Path(os.path.join(self, *args)) joinpath = joinwith @@ -257,7 +253,7 @@ this path (for example, '/' or 'C:\\'). The other items in the list will be strings. - Path.join(*result) will yield the original path. + Path(*result) will yield the original path. """ parts = [] loc = self Index: test_path.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/path/test_path.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- test_path.py 25 Jul 2005 16:06:32 -0000 1.6 +++ test_path.py 30 Jul 2005 12:14:14 -0000 1.7 @@ -28,17 +28,19 @@ class BasicTestCase(unittest.TestCase): def testConstructor(self): - # constructor can only be called with zero or one arguments + # constructor can be called with zero arguments, which is os.curdir p = Path() - self.assert_(p.base() == os.curdir) + self.assertEquals(p.base(), os.curdir) - self.assertRaises(TypeError, Path, "a", "b") - self.assertRaises(TypeError, Path, 1, 2) - - # constructor can only be called with basestring as argument + # constructor can only be called with basestring(s) as argument self.assertRaises(ValueError, Path, None) self.assertRaises(ValueError, Path, 1) + # calling with more than one argument joins them + p1 = Path("a").joinwith("b") + p2 = Path("a", "b") + self.assertEquals(p1, p2) + def testRelpath(self): root = Path(p(nt='C:\\', posix='/'))

1 0

python/nondist/sandbox/set settimings.py, NONE, 1.1
by rhettinger＠users.sourceforge.net July 29, 2005

July 29, 2005

Update of /cvsroot/python/python/nondist/sandbox/set In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16836 Added Files: settimings.py Log Message: Sandbox a benchmarking tool. Compares relative performance of dicts vs sets. Compares set() vs sets.Set(). Compares operations with various input types (sets, dicts, lists, uniqlists). Also useful for comparing the Py2.4 version to the Py2.5 version. --- NEW FILE: settimings.py --- # timings of the new sets module from timeit import Timer setup = """ from random import randrange, seed from sets import Set, ImmutableSet seed(845957276943582345234523452734241L) n = 1000 a = [randrange(n) for i in xrange(n)] b = [randrange(n) for i in xrange(n)] seta = set(a) Seta = Set(a) setb = set(b) dicta = dict.fromkeys(a, True) dictb = dict.fromkeys(b, True) NONE = None TRUE = True listseta = list(seta) listsetb = list(setb) dac = dicta.__contains__ dah = dicta.has_key sac = seta.__contains__ sadd = seta.add setc = set(seta) for _ in setc: pass seta.discard(None) setb.discard(None) """ """ If you don't already have a set, then passing the list form is always better or as good a making a temp set If you do have a set or dict, then passing it is better or as good (w/in 20)% as a listset() The w/20 is because looping over sets is slower than looping over a list. Need more study on difference (first result) and sym_diff_up (second result) -------------- set(a).binop(b) vs set(a).binop(set(b)) when =, it means internally b is first converted to a set if not already when <, it means the binop uses an algo that doesn't make a set first: diff, diff_up, inter, inter_up, union, union_up set(a).binop(listsetb) vs set(a).binop(setb) when >>, it means that the list had to be coerced to a set first diff, sym_diff_up when >, it means that faster merge was used instead of iter union, union_up, when < 1/6, just means looping over dicts is slower than lists which is ok inter, inter_up, diff_up or something else sym_diff has ?flawed strategy of makingset and passing to sym_up B:makeset, A:sparseloop A:contains A-m:adds m:deletes vs. B:makeset, A:sparseloop A:contains A-m:adds B:sparseloop B:contains B-m:adds delete B """ # set_diff use of iterable vs set stmts = [ 'list(seta)', 'list(dicta)', 'dicta.keys()', 'list(listseta)', 'list(setb)', 'setc.__contains__(None); list(setc)', 'setc.discard(None); list(setc)', 'frozenset(setb)', 'frozenset(listsetb)', "'< means binop bypassed forcing to set'", "seta.difference(b)", "seta.difference(set(b))", "Seta.difference(b)", "seta.union(b)", "seta.union(set(b))", "Seta.union(b)", "seta.intersection(b)", "seta.intersection(set(b))", "Seta.intersection(b)", "seta.symmetric_difference(b)", "seta.symmetric_difference(set(b))", "Seta.symmetric_difference(b)", "seta.difference_update(b)", "seta.difference_update(set(b))", "Seta.difference_update(b)", "seta.update(b)", "seta.update(set(b))", "Seta.update(b)", "seta.intersection_update(b)", "seta.intersection_update(set(b))", "Seta.intersection_update(b)", "seta.symmetric_difference_update(b)", "seta.symmetric_difference_update(set(b))", "Seta.symmetric_difference_update(b)", "'>> due to set coercion; > merge faster than iter; < 1/6 dict looping is slow'", "seta.difference(listsetb)", "seta.difference(setb)", "seta.difference(dictb)", "seta.union(listsetb)", "seta.union(setb)", "seta.union(dictb)", "seta.intersection(listsetb)", "seta.intersection(setb)", "seta.intersection(dictb)", "seta.symmetric_difference(listsetb)", "seta.symmetric_difference(setb)", "seta.symmetric_difference(dictb)", "seta.difference_update(listsetb)", "seta.difference_update(setb)", "seta.difference_update(dictb)", "seta.update(listsetb)", "seta.update(setb)", "seta.update(dictb)", "seta.intersection_update(listsetb)", "seta.intersection_update(setb)", "seta.intersection_update(dictb)", "seta.symmetric_difference_update(listsetb)", "seta.symmetric_difference_update(setb)", "seta.symmetric_difference_update(dictb)", "for i in xrange(500): seta.add(i)", "for i in xrange(500): Seta.add(i)", "for i in xrange(500): dicta[i] = NONE", "for i in xrange(500): sadd(i)", "set(b)", "Set(b)", "dict.fromkeys(b, TRUE)", "set(listsetb)", "set(setb)", "set(dictb)", "for i in xrange(200): i in seta", "for i in xrange(200): i in Seta", "for i in xrange(200): i in dicta", "for i in xrange(200): dah(i)", "for i in xrange(200): dac(i)", "for i in xrange(200): sac(i)", "for i in xrange(200): seta.discard(i)", "for i in xrange(20): Seta.discard(i)", "for i in xrange(200): dicta.pop(i, NONE)", # Repeat first five to check validity of timings 'list(seta)', 'list(dicta)', 'dicta.keys()', 'list(listseta)', 'list(setb)', # Uniquification, 'list(set(a))', 'dict.fromkeys(a).keys()', 'list(dict.fromkeys(a))', 'list(set(b))', 'dict.fromkeys(b).keys()', 'list(dict.fromkeys(b))', ] from time import time import gc start = time() for stmt in stmts: gc.collect() print "%f\t%s" % (min(Timer(stmt, setup).repeat(9, 3500)), stmt) end = time() print end-start, "! total elapsed"

1 0

python/nondist/sandbox/set setobject.c,1.2,1.3
by rhettinger＠users.sourceforge.net July 29, 2005

July 29, 2005

Update of /cvsroot/python/python/nondist/sandbox/set In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4100 Modified Files: setobject.c Log Message: * Implement an internal discard function so that client functions don't have to check for and clear KeyErrors. * Simplify code where a contains check is followed by a remove operation. Can be reduced from two lookups to just one. Index: setobject.c =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/set/setobject.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- setobject.c 27 Jul 2005 23:38:40 -0000 1.2 +++ setobject.c 29 Jul 2005 19:03:00 -0000 1.3 @@ -362,8 +362,14 @@ return set_table_resize(mp, mp->ma_used*(mp->ma_used>50000 ? 2 : 4)); } -int -set_remove_internal(PySetObject *mp, PyObject *key) +/* Discard unconditionally removes an entry. + Returns 1 if not found + Returns 0 if found and removed + Returns -1 on hash error +*/ + +static int +set_discard_internal(PySetObject *mp, PyObject *key) { register long hash; register setentry *ep; @@ -378,8 +384,7 @@ } ep = (mp->ma_lookup)(mp, key, hash); if (ep->me_key == NULL || ep->me_key == dummy) { // XXX ? can this be simplified - PyErr_SetObject(PyExc_KeyError, key); - return -1; + return 1; } old_key = ep->me_key; Py_INCREF(dummy); @@ -389,6 +394,18 @@ return 0; } +static int +set_remove_internal(PySetObject *mp, PyObject *key) +{ + int rv = set_discard_internal(mp, key); + + if (rv == 1) { + PyErr_SetObject(PyExc_KeyError, key); + return -1; + } + return rv; +} + static void set_clear_internal(PySetObject *mp) { @@ -1098,14 +1115,10 @@ return NULL; while ((item = PyIter_Next(it)) != NULL) { - if (set_remove_internal(so, item) == -1) { - if (PyErr_ExceptionMatches(PyExc_KeyError)) - PyErr_Clear(); - else { - Py_DECREF(it); - Py_DECREF(item); - return NULL; - } + if (set_discard_internal(so, item) == -1) { + Py_DECREF(it); + Py_DECREF(item); + return NULL; } Py_DECREF(item); } @@ -1200,11 +1213,12 @@ if (PyDict_Check(other)) { PyObject *value; + int rv; while (PyDict_Next(other, &pos, &key, &value)) { - if (set_contains_internal(so, key)) { - if (set_remove_internal(so, key) == -1) - return NULL; - } else { + rv = set_discard_internal(so, key); + if (rv == -1) + return NULL; + if (rv == 1) { if (set_add_internal(so, key) == -1) return NULL; } @@ -1222,12 +1236,12 @@ } while (set_next_internal(otherset, &pos, &key)) { - if (set_contains_internal(so, key)) { - if (set_remove_internal(so, key) == -1) { - Py_XDECREF(otherset); - return NULL; - } - } else { + int rv = set_discard_internal(so, key); + if (rv == -1) { + Py_XDECREF(otherset); + return NULL; + } + if (rv == 1) { if (set_add_internal(so, key) == -1) { Py_XDECREF(otherset); return NULL; @@ -1555,11 +1569,8 @@ return result; } - if (set_remove_internal(so, item) == -1) { - if (!PyErr_ExceptionMatches(PyExc_KeyError)) - return NULL; - PyErr_Clear(); - } + if (set_discard_internal(so, item) == -1) + return NULL; Py_RETURN_NONE; }

1 0

python/dist/src/Doc/texinputs howto.cls, 1.15, 1.16 manual.cls, 1.19, 1.20
by fdrake＠users.sourceforge.net July 29, 2005

July 29, 2005

Update of /cvsroot/python/python/dist/src/Doc/texinputs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12501/texinputs Modified Files: howto.cls manual.cls Log Message: use a test for PDF support that is more portable across teTeX major versions (closes SF bug #1238210) Index: howto.cls =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/texinputs/howto.cls,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- howto.cls 31 Mar 2004 08:08:34 -0000 1.15 +++ howto.cls 29 Jul 2005 17:17:19 -0000 1.16 @@ -50,7 +50,8 @@ % \renewcommand{\maketitle}{ \py@doHorizontalRule - \@ifundefined{pdfinfo}{}{{ + \ifpdf + \begingroup % This \def is required to deal with multi-line authors; it % changes \\ to ', ' (comma-space), making it pass muster for % generating document info in the PDF file. @@ -59,7 +60,8 @@ /Author (\@author) /Title (\@title) } - }} + \endgroup + \fi \begin{flushright} {\rm\Huge\py@HeaderFamily \@title} \par {\em\large\py@HeaderFamily \py@release\releaseinfo} \par Index: manual.cls =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/texinputs/manual.cls,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- manual.cls 31 Mar 2004 08:08:34 -0000 1.19 +++ manual.cls 29 Jul 2005 17:17:19 -0000 1.20 @@ -64,7 +64,8 @@ \let\footnotesize\small \let\footnoterule\relax \py@doHorizontalRule% - \@ifundefined{pdfinfo}{}{{ + \ifpdf + \begingroup % This \def is required to deal with multi-line authors; it % changes \\ to ', ' (comma-space), making it pass muster for % generating document info in the PDF file. @@ -73,7 +74,8 @@ /Author (\@author) /Title (\@title) } - }} + \endgroup + \fi \begin{flushright}% {\rm\Huge\py@HeaderFamily \@title \par}% {\em\LARGE\py@HeaderFamily \py@release\releaseinfo \par}

1 0

python/dist/src/Lib/test test_urlparse.py, 1.13.4.1, 1.13.4.2
by fdrake＠users.sourceforge.net July 29, 2005

July 29, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26913/Lib/test Modified Files: Tag: release24-maint test_urlparse.py Log Message: add support for svn: and svn+ssh: URL schemes to urlparse (backported from trunk urlparse.py 1.48, test_urlparse.py 1.15) Index: test_urlparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_urlparse.py,v retrieving revision 1.13.4.1 retrieving revision 1.13.4.2 diff -u -d -r1.13.4.1 -r1.13.4.2 --- test_urlparse.py 9 Jan 2005 15:32:37 -0000 1.13.4.1 +++ test_urlparse.py 29 Jul 2005 15:57:59 -0000 1.13.4.2 @@ -35,6 +35,11 @@ '', '', ''), ('mms', 'wms.sys.hinet.net', '/cts/Drama/09006251100.asf', '', '')), + ('svn+ssh://svn.zope.org/repos/main/ZConfig/trunk/', + ('svn+ssh', 'svn.zope.org', '/repos/main/ZConfig/trunk/', + '', '', ''), + ('svn+ssh', 'svn.zope.org', '/repos/main/ZConfig/trunk/', + '', '')) ] for url, parsed, split in testcases: self.checkRoundtrips(url, parsed, split)

1 0

python/dist/src/Lib urlparse.py, 1.45.4.1, 1.45.4.2
by fdrake＠users.sourceforge.net July 29, 2005

July 29, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26913/Lib Modified Files: Tag: release24-maint urlparse.py Log Message: add support for svn: and svn+ssh: URL schemes to urlparse (backported from trunk urlparse.py 1.48, test_urlparse.py 1.15) Index: urlparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urlparse.py,v retrieving revision 1.45.4.1 retrieving revision 1.45.4.2 diff -u -d -r1.45.4.1 -r1.45.4.2 --- urlparse.py 9 Jan 2005 15:32:37 -0000 1.45.4.1 +++ urlparse.py 29 Jul 2005 15:57:53 -0000 1.45.4.2 @@ -13,7 +13,8 @@ 'prospero', 'rtsp', 'rtspu', ''] uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'imap', 'wais', 'file', 'mms', 'https', 'shttp', - 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', ''] + 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '', + 'svn', 'svn+ssh'] non_hierarchical = ['gopher', 'hdl', 'mailto', 'news', 'telnet', 'wais', 'imap', 'snews', 'sip'] uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',

1 0

python/dist/src/Lib urlparse.py,1.47,1.48
by fdrake＠users.sourceforge.net July 29, 2005

July 29, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26623/Lib Modified Files: urlparse.py Log Message: add support for svn: and svn+ssh: URL schemes to urlparse Index: urlparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urlparse.py,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- urlparse.py 9 Jan 2005 15:29:10 -0000 1.47 +++ urlparse.py 29 Jul 2005 15:56:32 -0000 1.48 @@ -13,7 +13,8 @@ 'prospero', 'rtsp', 'rtspu', ''] uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'imap', 'wais', 'file', 'mms', 'https', 'shttp', - 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', ''] + 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '', + 'svn', 'svn+ssh'] non_hierarchical = ['gopher', 'hdl', 'mailto', 'news', 'telnet', 'wais', 'imap', 'snews', 'sip'] uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',

1 0