Mailman 3 February 2004 - Python-checkins

[Python-checkins] python/dist/src/Objects unicodeobject.c, 2.190.6.9, 2.190.6.10
by doerwalter＠users.sourceforge.net Feb. 5, 2004

Feb. 5, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10527/Objects Modified Files: Tag: release23-maint unicodeobject.c Log Message: Backport checkin: Fix reallocation bug in unicode.translate(): The code was comparing characters instead of character pointers to determine space requirements. Index: unicodeobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v retrieving revision 2.190.6.9 retrieving revision 2.190.6.10 diff -C2 -d -r2.190.6.9 -r2.190.6.10 *** unicodeobject.c 24 Oct 2003 15:05:29 -0000 2.190.6.9 --- unicodeobject.c 5 Feb 2004 17:44:26 -0000 2.190.6.10 *************** *** 3272,3276 **** /* more than one character */ int requiredsize = (*outp-PyUnicode_AS_UNICODE(*outobj)) + ! (insize - (*curinp-*startinp)) + repsize - 1; if (charmaptranslate_makespace(outobj, outp, requiredsize)) --- 3272,3276 ---- /* more than one character */ int requiredsize = (*outp-PyUnicode_AS_UNICODE(*outobj)) + ! (insize - (curinp-startinp)) + repsize - 1; if (charmaptranslate_makespace(outobj, outp, requiredsize))

1 0

[Python-checkins] python/dist/src/Lib/test test_unicode.py, 1.84.8.1, 1.84.8.2
by doerwalter＠users.sourceforge.net Feb. 5, 2004

Feb. 5, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10527/Lib/test Modified Files: Tag: release23-maint test_unicode.py Log Message: Backport checkin: Fix reallocation bug in unicode.translate(): The code was comparing characters instead of character pointers to determine space requirements. Index: test_unicode.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicode.py,v retrieving revision 1.84.8.1 retrieving revision 1.84.8.2 diff -C2 -d -r1.84.8.1 -r1.84.8.2 *** test_unicode.py 5 Aug 2003 06:20:23 -0000 1.84.8.1 --- test_unicode.py 5 Feb 2004 17:44:26 -0000 1.84.8.2 *************** *** 130,133 **** --- 130,134 ---- self.checkequalnofix(u'c', u'abababc', 'translate', {ord('a'):None, ord('b'):u''}) self.checkequalnofix(u'c', u'abababc', 'translate', {ord('a'):None, ord('b'):u''}) + self.checkequalnofix(u'xyyx', u'xzx', 'translate', {ord('z'):u'yy'}) self.assertRaises(TypeError, u'hello'.translate)

1 0

python/dist/src/Lib/test test_unicode.py, 1.86, 1.87
by doerwalter＠users.sourceforge.net Feb. 5, 2004

Feb. 5, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8673/Lib/test Modified Files: test_unicode.py Log Message: Fix reallocation bug in unicode.translate(): The code was comparing characters instead of character pointers to determine space requirements. Index: test_unicode.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicode.py,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** test_unicode.py 6 Oct 2003 05:08:26 -0000 1.86 --- test_unicode.py 5 Feb 2004 17:36:00 -0000 1.87 *************** *** 137,140 **** --- 137,141 ---- self.checkequalnofix(u'c', u'abababc', 'translate', {ord('a'):None, ord('b'):u''}) self.checkequalnofix(u'c', u'abababc', 'translate', {ord('a'):None, ord('b'):u''}) + self.checkequalnofix(u'xyyx', u'xzx', 'translate', {ord('z'):u'yy'}) self.assertRaises(TypeError, u'hello'.translate)

1 0

python/dist/src/Objects unicodeobject.c, 2.209, 2.210
by doerwalter＠users.sourceforge.net Feb. 5, 2004

Feb. 5, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8673/Objects Modified Files: unicodeobject.c Log Message: Fix reallocation bug in unicode.translate(): The code was comparing characters instead of character pointers to determine space requirements. Index: unicodeobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v retrieving revision 2.209 retrieving revision 2.210 diff -C2 -d -r2.209 -r2.210 *** unicodeobject.c 3 Jan 2004 19:35:43 -0000 2.209 --- unicodeobject.c 5 Feb 2004 17:35:59 -0000 2.210 *************** *** 3284,3288 **** /* more than one character */ int requiredsize = (*outp-PyUnicode_AS_UNICODE(*outobj)) + ! (insize - (*curinp-*startinp)) + repsize - 1; if (charmaptranslate_makespace(outobj, outp, requiredsize)) --- 3284,3288 ---- /* more than one character */ int requiredsize = (*outp-PyUnicode_AS_UNICODE(*outobj)) + ! (insize - (curinp-startinp)) + repsize - 1; if (charmaptranslate_makespace(outobj, outp, requiredsize))

1 0

59.VVW. Order Generic C.I.A.L.I.S ONLINE! No prior prescription needed
by Erna Steele Feb. 4, 2004

Feb. 4, 2004

PRIVATE OFFSHORE PHARMACY! No Questions asked! The Newest Drug on the Market is on SALE Super Viaggra - CIALIS is Here - as advertised during the SUPER BOWL Dubbed "The Weekend Pill" * LONGER LIFE * ACTS FASTER * BEST SEX EVER "Cialis works in 15 minutes and lasts for 36 hours giving you strong healthy erections whenever you want or need them!" COMPLETE PRIVACY & CONFIDENTIATLITY. 128-bit encrypted website for maximum security. We also have an assortment of other drugs such as soma, valium, xanax, meridia, etc. http://maynard.amilsdcx.com/m0013/index.php?id=m0013 No more of this sort of material. Honoured in 24-48 hours. http://snuffle.amilsdcx.com/a.html earthmoving noose lubbock sound effusive extractor crewel diachronic brevity builtin dub dakar irritable ithaca c's monotonous soutane barlow bp

1 0

python/dist/src/Objects weakrefobject.c, 1.15, 1.16
by fdrake＠users.sourceforge.net Feb. 4, 2004

Feb. 4, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22056/Objects Modified Files: weakrefobject.c Log Message: Allocating a new weakref object can cause existing weakref objects for the same object to be collected by the cyclic GC support if they are only referenced by a cycle. If the weakref being collected was one of the weakrefs without callbacks, some local variables for the constructor became invalid and have to be re-computed. The test caused a segfault under a debug build without the fix applied. Index: weakrefobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/weakrefobject.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** weakrefobject.c 3 Feb 2004 19:52:56 -0000 1.15 --- weakrefobject.c 4 Feb 2004 23:14:14 -0000 1.16 *************** *** 631,636 **** result = ref; if (result != NULL) ! Py_XINCREF(result); else { result = new_weakref(ob, callback); if (result != NULL) { --- 631,641 ---- result = ref; if (result != NULL) ! Py_INCREF(result); else { + /* Note: new_weakref() can trigger cyclic GC, so the weakref + list on ob can be mutated. This means that the ref and + proxy pointers we got back earlier may have been collected, + so we need to compute these values again before we use + them. */ result = new_weakref(ob, callback); if (result != NULL) { *************** *** 639,644 **** } else { ! PyWeakReference *prev = (proxy == NULL) ? ref : proxy; if (prev == NULL) insert_head(result, list); --- 644,651 ---- } else { ! PyWeakReference *prev; + get_basic_refs(*list, &ref, &proxy); + prev = (proxy == NULL) ? ref : proxy; if (prev == NULL) insert_head(result, list); *************** *** 673,678 **** result = proxy; if (result != NULL) ! Py_XINCREF(result); else { result = new_weakref(ob, callback); if (result != NULL) { --- 680,690 ---- result = proxy; if (result != NULL) ! Py_INCREF(result); else { + /* Note: new_weakref() can trigger cyclic GC, so the weakref + list on ob can be mutated. This means that the ref and + proxy pointers we got back earlier may have been collected, + so we need to compute these values again before we use + them. */ result = new_weakref(ob, callback); if (result != NULL) { *************** *** 683,686 **** --- 695,699 ---- else result->ob_type = &_PyWeakref_ProxyType; + get_basic_refs(*list, &ref, &proxy); if (callback == NULL) prev = ref;

1 0

python/dist/src/Lib/test test_weakref.py, 1.34, 1.35
by fdrake＠users.sourceforge.net Feb. 4, 2004

Feb. 4, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22056/Lib/test Modified Files: test_weakref.py Log Message: Allocating a new weakref object can cause existing weakref objects for the same object to be collected by the cyclic GC support if they are only referenced by a cycle. If the weakref being collected was one of the weakrefs without callbacks, some local variables for the constructor became invalid and have to be re-computed. The test caused a segfault under a debug build without the fix applied. Index: test_weakref.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_weakref.py,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** test_weakref.py 3 Feb 2004 19:56:46 -0000 1.34 --- test_weakref.py 4 Feb 2004 23:14:14 -0000 1.35 *************** *** 1,2 **** --- 1,3 ---- + import gc import sys import unittest *************** *** 592,595 **** --- 593,627 ---- self.assertEqual(alist, []) + def test_gc_during_ref_creation(self): + self.check_gc_during_creation(weakref.ref) + + def test_gc_during_proxy_creation(self): + self.check_gc_during_creation(weakref.proxy) + + def check_gc_during_creation(self, makeref): + thresholds = gc.get_threshold() + gc.set_threshold(1, 1, 1) + gc.collect() + class A: + pass + + def callback(*args): + pass + + referenced = A() + + a = A() + a.a = a + a.wr = makeref(referenced) + + try: + # now make sure the object and the ref get labeled as + # cyclic trash: + a = A() + a.wrc = weakref.ref(referenced, callback) + + finally: + gc.set_threshold(*thresholds) + class Object: def __init__(self, arg):

1 0

[Python-checkins] python/dist/src/Objects weakrefobject.c, 1.13.6.2, 1.13.6.3
by fdrake＠users.sourceforge.net Feb. 4, 2004

Feb. 4, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21840/Objects Modified Files: Tag: release23-maint weakrefobject.c Log Message: Allocating a new weakref object can cause existing weakref objects for the same object to be collected by the cyclic GC support if they are only referenced by a cycle. If the weakref being collected was one of the weakrefs without callbacks, some local variables for the constructor became invalid and have to be re-computed. The test caused a segfault under a debug build without the fix applied. Index: weakrefobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/weakrefobject.c,v retrieving revision 1.13.6.2 retrieving revision 1.13.6.3 diff -C2 -d -r1.13.6.2 -r1.13.6.3 *** weakrefobject.c 3 Feb 2004 20:15:31 -0000 1.13.6.2 --- weakrefobject.c 4 Feb 2004 23:13:43 -0000 1.13.6.3 *************** *** 631,636 **** result = ref; if (result != NULL) ! Py_XINCREF(result); else { result = new_weakref(ob, callback); if (result != NULL) { --- 631,641 ---- result = ref; if (result != NULL) ! Py_INCREF(result); else { + /* Note: new_weakref() can trigger cyclic GC, so the weakref + list on ob can be mutated. This means that the ref and + proxy pointers we got back earlier may have been collected, + so we need to compute these values again before we use + them. */ result = new_weakref(ob, callback); if (result != NULL) { *************** *** 639,644 **** } else { ! PyWeakReference *prev = (proxy == NULL) ? ref : proxy; if (prev == NULL) insert_head(result, list); --- 644,651 ---- } else { ! PyWeakReference *prev; + get_basic_refs(*list, &ref, &proxy); + prev = (proxy == NULL) ? ref : proxy; if (prev == NULL) insert_head(result, list); *************** *** 673,678 **** result = proxy; if (result != NULL) ! Py_XINCREF(result); else { result = new_weakref(ob, callback); if (result != NULL) { --- 680,690 ---- result = proxy; if (result != NULL) ! Py_INCREF(result); else { + /* Note: new_weakref() can trigger cyclic GC, so the weakref + list on ob can be mutated. This means that the ref and + proxy pointers we got back earlier may have been collected, + so we need to compute these values again before we use + them. */ result = new_weakref(ob, callback); if (result != NULL) { *************** *** 683,686 **** --- 695,699 ---- else result->ob_type = &_PyWeakref_ProxyType; + get_basic_refs(*list, &ref, &proxy); if (callback == NULL) prev = ref;

1 0

[Python-checkins] python/dist/src/Lib/test test_weakref.py, 1.28.6.4, 1.28.6.5
by fdrake＠users.sourceforge.net Feb. 4, 2004

Feb. 4, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21840/Lib/test Modified Files: Tag: release23-maint test_weakref.py Log Message: Allocating a new weakref object can cause existing weakref objects for the same object to be collected by the cyclic GC support if they are only referenced by a cycle. If the weakref being collected was one of the weakrefs without callbacks, some local variables for the constructor became invalid and have to be re-computed. The test caused a segfault under a debug build without the fix applied. Index: test_weakref.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_weakref.py,v retrieving revision 1.28.6.4 retrieving revision 1.28.6.5 diff -C2 -d -r1.28.6.4 -r1.28.6.5 *** test_weakref.py 3 Feb 2004 20:18:20 -0000 1.28.6.4 --- test_weakref.py 4 Feb 2004 23:13:43 -0000 1.28.6.5 *************** *** 1,2 **** --- 1,3 ---- + import gc import sys import unittest *************** *** 593,596 **** --- 594,628 ---- self.assertEqual(alist, []) + def test_gc_during_ref_creation(self): + self.check_gc_during_creation(weakref.ref) + + def test_gc_during_proxy_creation(self): + self.check_gc_during_creation(weakref.proxy) + + def check_gc_during_creation(self, makeref): + thresholds = gc.get_threshold() + gc.set_threshold(1, 1, 1) + gc.collect() + class A: + pass + + def callback(*args): + pass + + referenced = A() + + a = A() + a.a = a + a.wr = makeref(referenced) + + try: + # now make sure the object and the ref get labeled as + # cyclic trash: + a = A() + a.wrc = weakref.ref(referenced, callback) + + finally: + gc.set_threshold(*thresholds) + class Object: def __init__(self, arg):

1 0

python/dist/src/Doc/lib libweakref.tex,1.23,1.24
by fdrake＠users.sourceforge.net Feb. 3, 2004

Feb. 3, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19980 Modified Files: libweakref.tex Log Message: minor markup adjustments Index: libweakref.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libweakref.tex,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** libweakref.tex 3 Feb 2004 19:44:26 -0000 1.23 --- libweakref.tex 3 Feb 2004 20:55:15 -0000 1.24 *************** *** 58,62 **** retrieved by calling the reference object if the referent is still alive; if the referent is no longer alive, calling the reference ! object will cause \code{None} to be returned. If \var{callback} is provided and not \constant{None}, it will be called when the object is about to be --- 58,62 ---- retrieved by calling the reference object if the referent is still alive; if the referent is no longer alive, calling the reference ! object will cause \constant{None} to be returned. If \var{callback} is provided and not \constant{None}, it will be called when the object is about to be *************** *** 192,196 **** If the referent no longer exists, calling the reference object returns ! \code{None}: \begin{verbatim} --- 192,196 ---- If the referent no longer exists, calling the reference object returns ! \constant{None}: \begin{verbatim}

1 0