[Python-checkins] r79071 - in python/branches/py3k: Doc/library/weakref.rst Include/code.h Lib/test/test_code.py Lib/test/test_sys.py Misc/NEWS Objects/codeobject.c

[Ezio Melotti]

On 19/03/2010 0.46, collin.winter wrote:

> Author: collin.winter
> Date: Thu Mar 18 23:46:40 2010
> New Revision: 79071
>
> Log:
> Merged revisions 79060 via svnmerge from
> svn+ssh://pythondev@svn.python.org/python/trunk
>
> ........
>    r79060 | collin.winter | 2010-03-18 14:54:01 -0700 (Thu, 18 Mar 2010) | 4 lines
>
>    Add support for weak references to code objects. This will be used by an optimization in the incoming Python 3 JIT.
>
>    Patch by Reid Kleckner!
> ........
>
>
> Modified:
>     python/branches/py3k/   (props changed)
>     python/branches/py3k/Doc/library/weakref.rst
>     python/branches/py3k/Include/code.h
>     python/branches/py3k/Lib/test/test_code.py
>     python/branches/py3k/Lib/test/test_sys.py
>     python/branches/py3k/Misc/NEWS
>     python/branches/py3k/Objects/codeobject.c
>
> Modified: python/branches/py3k/Doc/library/weakref.rst
> ==============================================================================
> --- python/branches/py3k/Doc/library/weakref.rst	(original)
> +++ python/branches/py3k/Doc/library/weakref.rst	Thu Mar 18 23:46:40 2010
> @@ -59,10 +59,10 @@
>   Not all objects can be weakly referenced; those objects which can include class
>   instances, functions written in Python (but not in C), instance methods, sets,
>   frozensets, file objects, :term:`generator`\s, type objects, sockets, arrays,
> -deques, and regular expression pattern objects.
> +deques, regular expression pattern objects, and code objects.
>
>   .. versionchanged:: 3.2
> -   Added support for thread.lock and threading.Lock.
> +   Added support for thread.lock, threading.Lock, and code objects.
>
>   Several built-in types such as :class:`list` and :class:`dict` do not directly
>   support weak references but can add support through subclassing::
>
> Modified: python/branches/py3k/Include/code.h
> ==============================================================================
> --- python/branches/py3k/Include/code.h	(original)
> +++ python/branches/py3k/Include/code.h	Thu Mar 18 23:46:40 2010
> @@ -27,6 +27,7 @@
>       PyObject *co_lnotab;	/* string (encoding addr<->lineno mapping) See
>   				   Objects/lnotab_notes.txt for details. */
>       void *co_zombieframe;     /* for optimization only (see frameobject.c) */
> +    PyObject *co_weakreflist;   /* to support weakrefs to code objects */
>   } PyCodeObject;
>
>   /* Masks for co_flags above */
>
> Modified: python/branches/py3k/Lib/test/test_code.py
> ==============================================================================
> --- python/branches/py3k/Lib/test/test_code.py	(original)
> +++ python/branches/py3k/Lib/test/test_code.py	Thu Mar 18 23:46:40 2010
> @@ -103,8 +103,10 @@
>   """
>
>   import unittest
> +import weakref
>   import _testcapi
>
> +
>   def consts(t):
>       """Yield a doctest-safe sequence of object reprs."""
>       for elt in t:
> @@ -131,12 +133,37 @@
>           self.assertEquals(co.co_firstlineno, 15)
>
>
> +class CodeWeakRefTest(unittest.TestCase):
> +
> +    def test_basic(self):
> +        # Create a code object in a clean environment so that we know we have
> +        # the only reference to it left.
> +        namespace = {}
> +        exec("def f(): pass", globals(), namespace)
> +        f = namespace["f"]
> +        del namespace
> +
> +        self.called = False
> +        def callback(code):
> +            self.called = True
> +
> +        # f is now the last reference to the function, and through it, the code
> +        # object.  While we hold it, check that we can create a weakref and
> +        # deref it.  Then delete it, and check that the callback gets called and
> +        # the reference dies.
> +        coderef = weakref.ref(f.__code__, callback)
> +        self.assertTrue(bool(coderef()))
> +        del f
> +        self.assertFalse(bool(coderef()))
> +        self.assertTrue(self.called)
> +
> +
>   def test_main(verbose=None):
>       from test.support import run_doctest, run_unittest
>       from test import test_code
>       run_doctest(test_code, verbose)
> -    run_unittest(CodeTest)
> +    run_unittest(CodeTest, CodeWeakRefTest)
>
>
> -if __name__ == '__main__':
> +if __name__ == "__main__":
>       test_main()
>
> Modified: python/branches/py3k/Lib/test/test_sys.py
> ==============================================================================
> --- python/branches/py3k/Lib/test/test_sys.py	(original)
> +++ python/branches/py3k/Lib/test/test_sys.py	Thu Mar 18 23:46:40 2010
> @@ -588,7 +588,7 @@
>               return inner
>           check(get_cell().__closure__[0], size(h + 'P'))
>           # code
> -        check(get_cell().__code__, size(h + '5i8Pi2P'))
> +        check(get_cell().__code__, size(h + '5i8Pi3P'))
>           # complex
>           check(complex(0,1), size(h + '2d'))
>           # method_descriptor (descriptor object)
>
> Modified: python/branches/py3k/Misc/NEWS
> ==============================================================================
> --- python/branches/py3k/Misc/NEWS	(original)
> +++ python/branches/py3k/Misc/NEWS	Thu Mar 18 23:46:40 2010
> @@ -233,6 +233,8 @@
>     instances from being copied with copy.copy(), and bytes subclasses
>     from being pickled properly.
>
> +- Code objects now support weak references.
> +
>   C-API
>   -----
>
>
> Modified: python/branches/py3k/Objects/codeobject.c
> ==============================================================================
> --- python/branches/py3k/Objects/codeobject.c	(original)
> +++ python/branches/py3k/Objects/codeobject.c	Thu Mar 18 23:46:40 2010
> @@ -108,6 +108,7 @@
>   		Py_INCREF(lnotab);
>   		co->co_lnotab = lnotab;
>                   co->co_zombieframe = NULL;
> +		co->co_weakreflist = NULL;
>   	}
>   	return co;
>   }
> @@ -331,6 +332,8 @@
>   	Py_XDECREF(co->co_lnotab);
>           if (co->co_zombieframe != NULL)
>                   PyObject_GC_Del(co->co_zombieframe);
> +	if (co->co_weakreflist != NULL)
> +		PyObject_ClearWeakRefs((PyObject*)co);
>   	PyObject_DEL(co);
>   }
>
> @@ -462,7 +465,7 @@
>   	0,				/* tp_traverse */
>   	0,				/* tp_clear */
>   	code_richcompare,		/* tp_richcompare */
> -	0,				/* tp_weaklistoffset */
> +	offsetof(PyCodeObject, co_weakreflist),	/* tp_weaklistoffset */
>   	0,				/* tp_iter */
>   	0,				/* tp_iternext */
>   	0,				/* tp_methods */
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins
>
>    
Hi,
there are spaces mixed with tabs in codeobjects.c.
The module uses mainly tabs except the _PyCode_CheckLineNumber function
that uses spaces. In a few other places they are mixed.

Regards,
Ezio Melotti