Add the new function object attribute names from py3k.

diff --git a/Misc/NEWS b/Misc/NEWS
index 9014f4919651ed2c93a091a5c08143ee9458c80e..badfffd4b65919b442a7b68b5fcb634a9602d920 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.6 alpha 1?
 Core and builtins
 -----------------
 
+- Add new attribute names for function objects.  All the func_* become
+  __*__ attributes.  (Some already existed, e.g., __doc__ and __name__.)
+
 - Add -3 option to the interpreter to warn about features that are
   deprecated and will be changed/removed in Python 3.0.
 

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 1ba74c5a926eb7963084313d1f061a4d466d900d..190765a547f5a4d0df223e6bf707f3d80089c028 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -161,10 +161,14 @@ PyFunction_SetClosure(PyObject *op, PyObject *closure)
 static PyMemberDef func_memberlist[] = {
         {"func_closure",  T_OBJECT,     OFF(func_closure),
         RESTRICTED|READONLY},
+        {"__closure__",  T_OBJECT,      OFF(func_closure),
+        RESTRICTED|READONLY},
         {"func_doc",      T_OBJECT,     OFF(func_doc), WRITE_RESTRICTED},
         {"__doc__",       T_OBJECT,     OFF(func_doc), WRITE_RESTRICTED},
         {"func_globals",  T_OBJECT,     OFF(func_globals),
         RESTRICTED|READONLY},
+        {"__globals__",  T_OBJECT,      OFF(func_globals),
+        RESTRICTED|READONLY},
         {"__module__",    T_OBJECT,     OFF(func_module), WRITE_RESTRICTED},
         {NULL}  /* Sentinel */
 };
@@ -240,7 +244,7 @@ func_set_code(PyFunctionObject *op, PyObject *value)
         * other than a code object. */
        if (value == NULL || !PyCode_Check(value)) {
                PyErr_SetString(PyExc_TypeError,
-                               "func_code must be set to a code object");
+                               "__code__ must be set to a code object");
                return -1;
        }
        nfree = PyCode_GetNumFree((PyCodeObject *)value);
@@ -279,7 +283,7 @@ func_set_name(PyFunctionObject *op, PyObject *value)
         * other than a string object. */
        if (value == NULL || !PyString_Check(value)) {
                PyErr_SetString(PyExc_TypeError,
-                               "func_name must be set to a string object");
+                               "__name__ must be set to a string object");
                return -1;
        }
        tmp = op->func_name;
@@ -315,7 +319,7 @@ func_set_defaults(PyFunctionObject *op, PyObject *value)
                value = NULL;
        if (value != NULL && !PyTuple_Check(value)) {
                PyErr_SetString(PyExc_TypeError,
-                               "func_defaults must be set to a tuple object");
+                               "__defaults__ must be set to a tuple object");
                return -1;
        }
        tmp = op->func_defaults;
@@ -327,8 +331,11 @@ func_set_defaults(PyFunctionObject *op, PyObject *value)
 
 static PyGetSetDef func_getsetlist[] = {
         {"func_code", (getter)func_get_code, (setter)func_set_code},
+        {"__code__", (getter)func_get_code, (setter)func_set_code},
         {"func_defaults", (getter)func_get_defaults,
         (setter)func_set_defaults},
+        {"__defaults__", (getter)func_get_defaults,
+        (setter)func_set_defaults},
        {"func_dict", (getter)func_get_dict, (setter)func_set_dict},
        {"__dict__", (getter)func_get_dict, (setter)func_set_dict},
        {"func_name", (getter)func_get_name, (setter)func_set_name},