Don't release GIL in dealloc()

methane · methane · commit 21a91a2ee204 · 2014-10-24T20:07:23.000+09:00
Fixes farcepest/MySQLdb1#84
diff --git a/_mysql.c b/_mysql.c
@@ -2212,12 +2212,10 @@ static void
 _mysql_ConnectionObject_dealloc(
 	_mysql_ConnectionObject *self)
 {
-	PyObject *o;
-
 	PyObject_GC_UnTrack(self);
 	if (self->open) {
-		o = _mysql_ConnectionObject_close(self, NULL);
-		Py_XDECREF(o);
+		mysql_close(&(self->connection));
+		self->open = 0;
 	}
 	MyFree(self);
 }

Original file line number	Diff line number	Diff line change
`@@ -2212,12 +2212,10 @@ static void`
`2212`	`2212`	`_mysql_ConnectionObject_dealloc(`
`2213`	`2213`	`_mysql_ConnectionObject *self)`
`2214`	`2214`	`{`
`2215`		`- PyObject *o;`
`2216`		`-`
`2217`	`2215`	`PyObject_GC_UnTrack(self);`
`2218`	`2216`	`if (self->open) {`
`2219`		`- o = _mysql_ConnectionObject_close(self, NULL);`
`2220`		`- Py_XDECREF(o);`
	`2217`	`+ mysql_close(&(self->connection));`
	`2218`	`+ self->open = 0;`
`2221`	`2219`	`}`
`2222`	`2220`	`MyFree(self);`
`2223`	`2221`	`}`