Mailman 3 February 2004 - Python-checkins

python/dist/src/Doc/lib libweakref.tex, 1.19.8.3, 1.19.8.4
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-serv16525 Modified Files: Tag: release23-maint libweakref.tex Log Message: Clarify minor point about the ref() and proxy() constructors. This matches what is already documented for corresponding feature of the C API. Index: libweakref.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libweakref.tex,v retrieving revision 1.19.8.3 retrieving revision 1.19.8.4 diff -C2 -d -r1.19.8.3 -r1.19.8.4 *** libweakref.tex 27 Nov 2003 19:43:12 -0000 1.19.8.3 --- libweakref.tex 3 Feb 2004 20:50:45 -0000 1.19.8.4 *************** *** 58,63 **** 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, it will be called when the object is about to be finalized; the weak reference object will be passed as the only parameter to the callback; the referent will no longer be available. --- 58,64 ---- 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 finalized; the weak reference object will be passed as the only parameter to the callback; the referent will no longer be available. *************** *** 191,195 **** 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

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

Feb. 3, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22377/Lib/test Modified Files: Tag: release23-maint test_weakref.py Log Message: - add tests that exercise fixes for the PyWeakref_NewRef() and PyWeakref_NewProxy() constructors from the C API - elaborate the getweakrefcount() and getweakrefs() tests slightly, including additional checks pulled from the trunk Index: test_weakref.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_weakref.py,v retrieving revision 1.28.6.3 retrieving revision 1.28.6.4 diff -C2 -d -r1.28.6.3 -r1.28.6.4 *** test_weakref.py 20 Nov 2003 22:13:50 -0000 1.28.6.3 --- test_weakref.py 3 Feb 2004 20:18:20 -0000 1.28.6.4 *************** *** 185,188 **** --- 185,220 ---- self.assertEqual(L3[2:5], p3[2:5]) + # The PyWeakref_* C API is documented as allowing either NULL or + # None as the value for the callback, where either means "no + # callback". The "no callback" ref and proxy objects are supposed + # to be shared so long as they exist by all callers so long as + # they are active. In Python 2.3.3 and earlier, this guaranttee + # was not honored, and was broken in different ways for + # PyWeakref_NewRef() and PyWeakref_NewProxy(). (Two tests.) + + def test_shared_ref_without_callback(self): + self.check_shared_without_callback(weakref.ref) + + def test_shared_proxy_without_callback(self): + self.check_shared_without_callback(weakref.proxy) + + def check_shared_without_callback(self, makeref): + o = Object(1) + p1 = makeref(o, None) + p2 = makeref(o, None) + self.assert_(p1 is p2, "both callbacks were None in the C API") + del p1, p2 + p1 = makeref(o) + p2 = makeref(o, None) + self.assert_(p1 is p2, "callbacks were NULL, None in the C API") + del p1, p2 + p1 = makeref(o) + p2 = makeref(o) + self.assert_(p1 is p2, "both callbacks were NULL in the C API") + del p1, p2 + p1 = makeref(o, None) + p2 = makeref(o) + self.assert_(p1 is p2, "callbacks were None, NULL in the C API") + def test_callable_proxy(self): o = Callable() *************** *** 251,254 **** --- 283,295 ---- "got wrong number of weak reference objects") + del ref1, ref2, proxy1, proxy2 + self.assert_(weakref.getweakrefcount(o) == 0, + "weak reference objects not unlinked from" + " referent when discarded.") + + # assumes ints do not support weakrefs + self.assert_(weakref.getweakrefcount(1) == 0, + "got wrong number of weak reference objects for int") + def test_getweakrefs(self): o = C() *************** *** 266,269 **** --- 307,318 ---- "list of refs does not match") + del ref1 + self.assert_(weakref.getweakrefs(o) == [], + "list of refs not cleared") + + # assumes ints do not support weakrefs + self.assert_(weakref.getweakrefs(1) == [], + "list of refs does not match for int") + def test_newstyle_number_ops(self): class F(float):

1 0

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

Feb. 3, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/Objects Modified Files: Tag: release23-maint weakrefobject.c Log Message: Fix bug in interpretation of the "callback" argument in the constructors for weakref ref and proxy objects; None was not being treated as identical to NULL, though it was documented as equivalent. Index: weakrefobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/weakrefobject.c,v retrieving revision 1.13.6.1 retrieving revision 1.13.6.2 diff -C2 -d -r1.13.6.1 -r1.13.6.2 *** weakrefobject.c 20 Nov 2003 22:13:51 -0000 1.13.6.1 --- weakrefobject.c 3 Feb 2004 20:15:31 -0000 1.13.6.2 *************** *** 625,629 **** list = GET_WEAKREFS_LISTPTR(ob); get_basic_refs(*list, &ref, &proxy); ! if (callback == NULL || callback == Py_None) /* return existing weak reference if it exists */ result = ref; --- 625,631 ---- list = GET_WEAKREFS_LISTPTR(ob); get_basic_refs(*list, &ref, &proxy); ! if (callback == Py_None) ! callback = NULL; ! if (callback == NULL) /* return existing weak reference if it exists */ result = ref; *************** *** 665,668 **** --- 667,672 ---- list = GET_WEAKREFS_LISTPTR(ob); get_basic_refs(*list, &ref, &proxy); + if (callback == Py_None) + callback = NULL; if (callback == NULL) /* attempt to return an existing weak reference if it exists */

1 0

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

Feb. 3, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4631/Lib/test Modified Files: test_weakref.py Log Message: - add tests that exercise fixes for the PyWeakref_NewRef() and PyWeakref_NewProxy() constructors from the C API - elaborate the getweakrefcount() and getweakrefs() tests slightly Index: test_weakref.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_weakref.py,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** test_weakref.py 11 Dec 2003 12:33:54 -0000 1.33 --- test_weakref.py 3 Feb 2004 19:56:46 -0000 1.34 *************** *** 184,187 **** --- 184,219 ---- self.assertEqual(L3[2:5], p3[2:5]) + # The PyWeakref_* C API is documented as allowing either NULL or + # None as the value for the callback, where either means "no + # callback". The "no callback" ref and proxy objects are supposed + # to be shared so long as they exist by all callers so long as + # they are active. In Python 2.3.3 and earlier, this guaranttee + # was not honored, and was broken in different ways for + # PyWeakref_NewRef() and PyWeakref_NewProxy(). (Two tests.) + + def test_shared_ref_without_callback(self): + self.check_shared_without_callback(weakref.ref) + + def test_shared_proxy_without_callback(self): + self.check_shared_without_callback(weakref.proxy) + + def check_shared_without_callback(self, makeref): + o = Object(1) + p1 = makeref(o, None) + p2 = makeref(o, None) + self.assert_(p1 is p2, "both callbacks were None in the C API") + del p1, p2 + p1 = makeref(o) + p2 = makeref(o, None) + self.assert_(p1 is p2, "callbacks were NULL, None in the C API") + del p1, p2 + p1 = makeref(o) + p2 = makeref(o) + self.assert_(p1 is p2, "both callbacks were NULL in the C API") + del p1, p2 + p1 = makeref(o, None) + p2 = makeref(o) + self.assert_(p1 is p2, "callbacks were None, NULL in the C API") + def test_callable_proxy(self): o = Callable() *************** *** 250,253 **** --- 282,290 ---- "got wrong number of weak reference objects") + del ref1, ref2, proxy1, proxy2 + self.assert_(weakref.getweakrefcount(o) == 0, + "weak reference objects not unlinked from" + " referent when discarded.") + # assumes ints do not support weakrefs self.assert_(weakref.getweakrefcount(1) == 0, *************** *** 269,272 **** --- 306,313 ---- "list of refs does not match") + del ref1 + self.assert_(weakref.getweakrefs(o) == [], + "list of refs not cleared") + # assumes ints do not support weakrefs self.assert_(weakref.getweakrefs(1) == [],

1 0

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

Feb. 3, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1276/Objects Modified Files: weakrefobject.c Log Message: Fix bug in interpretation of the "callback" argument in the constructors for weakref ref and proxy objects; None was not being treated as identical to NULL, though it was documented as equivalent. Index: weakrefobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/weakrefobject.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** weakrefobject.c 20 Nov 2003 21:21:46 -0000 1.14 --- weakrefobject.c 3 Feb 2004 19:52:56 -0000 1.15 *************** *** 625,629 **** list = GET_WEAKREFS_LISTPTR(ob); get_basic_refs(*list, &ref, &proxy); ! if (callback == NULL || callback == Py_None) /* return existing weak reference if it exists */ result = ref; --- 625,631 ---- list = GET_WEAKREFS_LISTPTR(ob); get_basic_refs(*list, &ref, &proxy); ! if (callback == Py_None) ! callback = NULL; ! if (callback == NULL) /* return existing weak reference if it exists */ result = ref; *************** *** 665,668 **** --- 667,672 ---- list = GET_WEAKREFS_LISTPTR(ob); get_basic_refs(*list, &ref, &proxy); + if (callback == Py_None) + callback = NULL; if (callback == NULL) /* attempt to return an existing weak reference if it exists */

1 0

python/dist/src/Doc/lib libweakref.tex,1.22,1.23
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-serv26448 Modified Files: libweakref.tex Log Message: Clarify minor point about the ref() and proxy() constructors. This matches what is already documented for corresponding feature of the C API. Index: libweakref.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libweakref.tex,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** libweakref.tex 30 Dec 2003 16:15:35 -0000 1.22 --- libweakref.tex 3 Feb 2004 19:44:26 -0000 1.23 *************** *** 59,63 **** alive; if the referent is no longer alive, calling the reference object will cause \code{None} to be returned. If \var{callback} is ! provided, it will be called when the object is about to be finalized; the weak reference object will be passed as the only parameter to the callback; the referent will no longer be available. --- 59,64 ---- 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 finalized; the weak reference object will be passed as the only parameter to the callback; the referent will no longer be available.

1 0

92.TR. hi
by Harold Vogel Feb. 3, 2004

Feb. 3, 2004

Rejuvenate your skin with Botox in a Bottle. HOT TICKET ITEM! Special price on this amazing Anti-Aging Anti-Wrinkle serum. See these incredible Before and After photos. http://www.lowdealz.biz/promo.php?id=93976 This special anti-wrinkle serum works like BOTOX but without the doctor, the needle, and the expensive price that accompanies it. PROVEN TO WORK OR YOUR MONEY BACK! YOU WILL SEE RESULTS FAST! GREAT GIFT FOR ALL! http://www.lowdealz.biz/promo.php?id=93976 This communication is privileged and contains confidential information intended only for the person(s) to whom it is addressed. Any unauthorized disclosure, copying, other distribution of this communication or taking any action on its contents is strictly prohibited. If you have received this message in error, please notify us immediately OR remove yourself from our list if there is no interest in regards to our services or products. http://www.lowdealz.biz/remove.php?id=93976 deanna demarcate ignoramus alcoholic reed vanity coexistent goa tanzania argo capricorn melancholy debenture a1

1 0

python/dist/src/Python bltinmodule.c,2.307,2.308
by perky＠projects.sourceforge.net Feb. 2, 2004

Feb. 2, 2004

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18238/Python Modified Files: bltinmodule.c Log Message: Fix input() builtin function to respect compiler flags. (SF patch 876178, patch by mwh, unittest by perky) Index: bltinmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v retrieving revision 2.307 retrieving revision 2.308 diff -C2 -d -r2.307 -r2.308 *** bltinmodule.c 4 Jan 2004 11:00:07 -0000 2.307 --- bltinmodule.c 2 Feb 2004 13:39:01 -0000 2.308 *************** *** 980,983 **** --- 980,984 ---- PyObject *res; PyObject *globals, *locals; + PyCompilerFlags cf; line = builtin_raw_input(self, args); *************** *** 995,999 **** return NULL; } ! res = PyRun_String(str, Py_eval_input, globals, locals); Py_DECREF(line); return res; --- 996,1002 ---- return NULL; } ! cf.cf_flags = 0; ! PyEval_MergeCompilerFlags(&cf); ! res = PyRun_StringFlags(str, Py_eval_input, globals, locals, &cf); Py_DECREF(line); return res;

1 0

python/dist/src/Lib/test test_builtin.py, 1.27, 1.28
by perky＠projects.sourceforge.net Feb. 2, 2004

Feb. 2, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18238/Lib/test Modified Files: test_builtin.py Log Message: Fix input() builtin function to respect compiler flags. (SF patch 876178, patch by mwh, unittest by perky) Index: test_builtin.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_builtin.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** test_builtin.py 17 Dec 2003 20:43:32 -0000 1.27 --- test_builtin.py 2 Feb 2004 13:39:01 -0000 1.28 *************** *** 932,935 **** --- 932,948 ---- sys.stdin = cStringIO.StringIO() self.assertRaises(EOFError, input) + + # SF 876178: make sure input() respect future options. + sys.stdin = cStringIO.StringIO('1/2') + sys.stdout = cStringIO.StringIO() + exec compile('print input()', 'test_builtin_tmp', 'exec') + sys.stdin.seek(0, 0) + exec compile('from __future__ import division;print input()', + 'test_builtin_tmp', 'exec') + sys.stdin.seek(0, 0) + exec compile('print input()', 'test_builtin_tmp', 'exec') + self.assertEqual(sys.stdout.getvalue().splitlines(), + ['0', '0.5', '0']) + del sys.stdout self.assertRaises(RuntimeError, input, 'prompt')

1 0

python/dist/src/Misc NEWS,1.925,1.926
by perky＠projects.sourceforge.net Feb. 2, 2004

Feb. 2, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18238/Misc Modified Files: NEWS Log Message: Fix input() builtin function to respect compiler flags. (SF patch 876178, patch by mwh, unittest by perky) Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.925 retrieving revision 1.926 diff -C2 -d -r1.925 -r1.926 *** NEWS 31 Jan 2004 12:34:16 -0000 1.925 --- NEWS 2 Feb 2004 13:39:00 -0000 1.926 *************** *** 13,16 **** --- 13,19 ---- ----------------- + - input() builtin function now respects compiler flags such as + __future__ statements. SF patch 876178. + - Removed PendingDeprecationWarning from apply(). apply() remains deprecated, but the nuisance warning will not be issued.

1 0