thread._local, threading.local Python issue 1868 & 3710

Modules/threadmodule.c

 
 /* Thread module */
 /* Interface to Sjoerd's portable C thread library */
 
 #include "Python.h"
 
 #ifndef WITH_THREAD
 #error "Error!  The rest of Python is not compiled with thread support."
 #error "Rerun configure, adding a --with-threads option."
 #error "Then run `make clean' followed by `make'."
@@ skipping 186 matching lines @@
         if (localdict == NULL)
                 goto err;
 
         tdict = PyThreadState_GetDict();
         if (tdict == NULL) {
                 PyErr_SetString(PyExc_SystemError,
                                 "Couldn't get thread-state dictionary");
                 goto err;
         }
 
-        if (PyDict_SetItem(tdict, self->key, localdict) < 0)

[Antoine Pitrou, 2008/08/28 09:29:49]

A Py_DECREF(localdict) is needed just before bailing out.

[gregory.p.smith, 2008/09/02 06:43:30]

On 2008/08/28 09:29:49, Antoine Pitrou wrote:
> A Py_DECREF(localdict) is needed just before bailing out.
> 

Done.

+        if (PyDict_SetItem(tdict, self->key, localdict) < 0) {
+                Py_DECREF(localdict);
                 goto err;
+        }
         Py_DECREF(localdict);
 
         return (PyObject *)self;
 
   err:
         Py_DECREF(self);
         return NULL;
 }
 
 static int
@@ skipping 69 matching lines @@
                 }
                 
         }
 
         return ldict;
 }
 
 static int
 local_setattro(localobject *self, PyObject *name, PyObject *v)
 {
-        int res = PyObject_GenericSetAttr((PyObject *)self, name, v);
-
-        if (res < 0 && PyErr_ExceptionMatches(PyExc_AttributeError)) {

[Antoine Pitrou, 2008/08/28 09:29:49]

Why did you add this fallback? Is it really necessary?

[gregory.p.smith, 2008/09/02 06:43:30]

On 2008/08/28 09:29:49, Antoine Pitrou wrote:
> Why did you add this fallback? Is it really necessary?
> 

this has been rewritten so that subclasses work.  please have another look.

-                PyObject *ldict = _ldict(self);
-                if (ldict == NULL) 
-                        return -1;
-
-                PyErr_Clear();
-
-                res = PyDict_SetItem(ldict, name, v);
-        }
-
-        return res;
+        PyObject *ldict = _ldict(self);
+        if (ldict == NULL) 
+                return -1;
+
+        if (v != NULL) {
+                return PyDict_SetItem(ldict, name, v);
+        } else {
+                int res;
+                res = PyDict_DelItem(ldict, name);
+                if ((res < 0) && PyErr_ExceptionMatches(PyExc_KeyError)) {
+                        PyErr_SetObject(PyExc_AttributeError, name);
+                }
+                return res;
+        }
 }
 
 static PyObject *
 local_getdict(localobject *self, void *closure)
 {
         PyObject *ldict = _ldict(self);
         if (ldict == NULL) {
                 PyErr_SetString(PyExc_AttributeError, "__dict__");
                 return NULL;
         }
@@ skipping 55 matching lines @@
 
 static PyObject *
 local_getattro(localobject *self, PyObject *name)
 {
         PyObject *ldict, *value;
 
         ldict = _ldict(self);
         if (ldict == NULL) 
                 return NULL;
 
-        if (Py_TYPE(self) != &localtype)
-                /* use generic lookup for subtypes */
-                return PyObject_GenericGetAttr((PyObject *)self, name);
-
         /* Optimization: just look in dict ourselves */
         value = PyDict_GetItem(ldict, name);
         if (value == NULL) 
                 /* Fall back on generic to get __class__ and __dict__ */
                 return PyObject_GenericGetAttr((PyObject *)self, name);
 
         Py_INCREF(value);
         return value;
 }
 
@@ skipping 306 matching lines @@
         Py_INCREF(&Locktype);
         PyDict_SetItemString(d, "LockType", (PyObject *)&Locktype);
 
         Py_INCREF(&localtype);
         if (PyModule_AddObject(m, "_local", (PyObject *)&localtype) < 0)
                 return;
 
         /* Initialize the C thread library */
         PyThread_init_thread();
 }