From f24fde089a0b2019d70ca975b016e9fe011fca45 Mon Sep 17 00:00:00 2001
From: adustman <adustman@9fc6cd9a-920d-0410-adcf-ac96716ed7e8>
Date: Tue, 19 Mar 2002 16:31:23 +0000
Subject: [PATCH] More (de)allocation cleanups, based on suggestions from
 python-dev and Skip Montanaro

---
 MySQLdb/_mysql.c | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/MySQLdb/_mysql.c b/MySQLdb/_mysql.c
index 5e4898c..a762ac9 100644
--- a/MySQLdb/_mysql.c
+++ b/MySQLdb/_mysql.c
@@ -42,6 +42,11 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "mysqld_error.h"
 #include "errmsg.h"
 
+#if PY_VERSION_HEX < 0x01060000
+# define PyObject_Del(x) PyMem_Free((char *) x) 
+# define PyObject_New(x,y) PyObject_NEW(x,y)
+#endif 
+
 static PyObject *_mysql_MySQLError;
 static PyObject *_mysql_Warning;
 static PyObject *_mysql_Error;
@@ -160,11 +165,7 @@ _mysql_ResultObject_New(
 	MYSQL_FIELD *fields;
 	_mysql_ResultObject *r;
 
-#if PY_VERSION_HEX < 0x02000100
-	r = PyObject_NEW(_mysql_ResultObject, &_mysql_ResultObject_Type);
-#else
 	r = PyObject_New(_mysql_ResultObject, &_mysql_ResultObject_Type);
-#endif
 	if (!r) return NULL;
 	r->conn = (PyObject *) conn;
 	r->use = use;
@@ -240,13 +241,8 @@ _mysql_connect(
 	     *read_default_group=NULL;
 	_mysql_ConnectionObject *c=NULL;
 	
-#if PY_VERSION_HEX < 0x02000100
-	c = PyObject_NEW(_mysql_ConnectionObject,
-			 &_mysql_ConnectionObject_Type);
-#else
 	c = PyObject_New(_mysql_ConnectionObject,
 			 &_mysql_ConnectionObject_Type);
-#endif
 	if (c == NULL) return NULL;
 	c->converter = NULL;
 	c->open = 0;
@@ -1180,11 +1176,7 @@ _mysql_ConnectionObject_dealloc(
 		o = _mysql_ConnectionObject_close(self, NULL);
 		Py_XDECREF(o);
 	}
-#if PY_VERSION_HEX < 0x02000100
-	PyMem_Free((char *) self);
-#else
 	PyObject_Del(self);
-#endif
 }
 
 static PyObject *
@@ -1255,11 +1247,7 @@ _mysql_ResultObject_dealloc(
 	mysql_free_result(self->result);
 	Py_DECREF(self->conn);
 	Py_XDECREF(self->converter);
-#if PY_VERSION_HEX < 0x02000100
-	PyMem_Free((char *) self);
-#else
 	PyObject_Del(self);
-#endif
 }
 
 static PyObject *