Python3 patch for MySQL-python-1.2.3.

Based on https://github.com/davispuh/MySQL-for-Python-3

Removed incompatible (and absolutely unnecessary) changes.

diff -ru MySQL-python-1.2.3/_mysql.c MySQL-Python-1.2.3-python3/_mysql.c

--- MySQL-python-1.2.3/_mysql.c	2010-06-17 09:21:56.000000000 +0200

+++ MySQL-Python-1.2.3-python3/_mysql.c	2011-10-05 12:49:58.000000000 +0200

@@ -31,33 +31,17 @@

 #if defined(MS_WINDOWS)

 #include <winsock2.h>

 #include <windows.h>

-#include <config-win.h>

-#else

-#include "my_config.h"

 #endif

+#include "my_config.h"

 #include "mysql.h"

 #include "mysqld_error.h"

 #include "errmsg.h"

-#if PY_VERSION_HEX < 0x02020000

-# define MyTuple_Resize(t,n,d) _PyTuple_Resize(t, n, d)

-# define MyMember(a,b,c,d,e) {a,b,c,d}

-# define MyMemberlist(x) struct memberlist x

-# define MyAlloc(s,t) PyObject_New(s,&t)

-# define MyFree(o) PyObject_Del(o)

-#else

 # define MyTuple_Resize(t,n,d) _PyTuple_Resize(t, n)

 # define MyMember(a,b,c,d,e) {a,b,c,d,e}

 # define MyMemberlist(x) struct PyMemberDef x

 # define MyAlloc(s,t) (s *) t.tp_alloc(&t,0)

-# define MyFree(ob) ob->ob_type->tp_free((PyObject *)ob) 

-#endif

-

-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)

-typedef int Py_ssize_t;

-#define PY_SSIZE_T_MAX INT_MAX

-#define PY_SSIZE_T_MIN INT_MIN

-#endif

+# define MyFree(ob) ob->ob_base.ob_type->tp_free((PyObject *)ob) 

 static PyObject *_mysql_MySQLError;

 static PyObject *_mysql_Warning;

@@ -86,7 +70,7 @@

 typedef struct {

 	PyObject_HEAD

-	PyObject *conn;

+	_mysql_ConnectionObject *conn;

 	MYSQL_RES *result;

 	int nfields;

 	int use;

@@ -102,17 +86,16 @@

 #define check_server_init(x) if (!_mysql_server_init_done) _mysql_server_init_done = 1

 #endif

-PyObject *

-_mysql_Exception(_mysql_ConnectionObject *c)

+PyObject * _mysql_Exception(_mysql_ConnectionObject *c)

 {

-	PyObject *t, *e;

+	PyObject *t, *e, *code, *message;

 	int merr;

 	if (!(t = PyTuple_New(2))) return NULL;

 	if (!_mysql_server_init_done) {

 		e = _mysql_InternalError;

-		PyTuple_SET_ITEM(t, 0, PyInt_FromLong(-1L));

-		PyTuple_SET_ITEM(t, 1, PyString_FromString("server not initialized"));

+		PyTuple_SET_ITEM(t, 0, PyLong_FromLong(-1L));

+		PyTuple_SET_ITEM(t, 1, PyUnicode_FromString("server not initialized"));

 		PyErr_SetObject(e, t);

 		Py_DECREF(t);

 		return NULL;

@@ -121,8 +104,8 @@

 	if (!merr)

 		e = _mysql_InterfaceError;

 	else if (merr > CR_MAX_ERROR) {

-		PyTuple_SET_ITEM(t, 0, PyInt_FromLong(-1L));

-		PyTuple_SET_ITEM(t, 1, PyString_FromString("error totally whack"));

+		PyTuple_SET_ITEM(t, 0, PyLong_FromLong(-1L));

+		PyTuple_SET_ITEM(t, 1, PyUnicode_FromString("error totally whack"));

 		PyErr_SetObject(_mysql_InterfaceError, t);

 		Py_DECREF(t);

 		return NULL;

@@ -209,8 +192,12 @@

 			e = _mysql_OperationalError;

 		break;

 	}

-	PyTuple_SET_ITEM(t, 0, PyInt_FromLong((long)merr));

-	PyTuple_SET_ITEM(t, 1, PyString_FromString(mysql_error(&(c->connection))));

+	code = PyLong_FromLong((long)merr);

+	message = PyUnicode_FromString(mysql_error(&(c->connection)));

+	PyTuple_SET_ITEM(t, 0, code );

+	PyTuple_SET_ITEM(t, 1, message );

+	PyObject_SetAttrString(e, "code", code );

+	PyObject_SetAttrString(e, "message", message );

 	PyErr_SetObject(e, t);

 	Py_DECREF(t);

 	return NULL;

@@ -259,7 +246,7 @@

 		cmd_args_c = (char **) PyMem_Malloc(cmd_argc*sizeof(char *));

 		for (i=0; i< cmd_argc; i++) {

 			item = PySequence_GetItem(cmd_args, i);

-			s = PyString_AsString(item);

+			s = PyBytes_AsString(item);

 			Py_DECREF(item);

 			if (!s) {

 				PyErr_SetString(PyExc_TypeError,

@@ -284,7 +271,7 @@

 		groups_c = (char **) PyMem_Malloc((1+groupc)*sizeof(char *));

 		for (i=0; i< groupc; i++) {

 			item = PySequence_GetItem(groups, i);

-			s = PyString_AsString(item);

+			s = PyBytes_AsString(item);

 			Py_DECREF(item);

 			if (!s) {

 				PyErr_SetString(PyExc_TypeError,

@@ -339,7 +326,7 @@

 	PyObject *flag;

 	if (!PyArg_ParseTuple(args, "")) return NULL;

 	check_server_init(NULL);

-	if (!(flag=PyInt_FromLong((long)mysql_thread_safe()))) return NULL;

+	if (!(flag=PyLong_FromLong((long)mysql_thread_safe()))) return NULL;

 	return flag;

 }

 #endif

@@ -372,7 +359,7 @@

 		return -1;

 	if (!conv) conv = PyDict_New();

 	if (!conv) return -1;

-	self->conn = (PyObject *) conn;

+	self->conn = conn;

 	Py_INCREF(conn);

 	self->use = use;

 	Py_BEGIN_ALLOW_THREADS ;

@@ -392,7 +379,7 @@

 	fields = mysql_fetch_fields(result);

 	for (i=0; i<n; i++) {

 		PyObject *tmp, *fun;

-		tmp = PyInt_FromLong((long) fields[i].type);

+		tmp = PyLong_FromLong((long) fields[i].type);

 		if (!tmp) return -1;

 		fun = PyObject_GetItem(conv, tmp);

 		Py_DECREF(tmp);

@@ -413,8 +400,8 @@

 					PyObject *pmask=NULL;

 					pmask = PyTuple_GET_ITEM(t, 0);

 					fun2 = PyTuple_GET_ITEM(t, 1);

-					if (PyInt_Check(pmask)) {

-						mask = PyInt_AS_LONG(pmask);

+					if (PyNumber_Check(pmask)) {

+						mask = PyLong_AS_LONG(pmask);

 						if (mask & fields[i].flags) {

 							Py_DECREF(t);

 							break;

@@ -440,7 +427,6 @@

 	return 0;

 }

-#if PY_VERSION_HEX >= 0x02020000

 static int _mysql_ResultObject_traverse(

 	_mysql_ResultObject *self,

 	visitproc visit,

@@ -451,10 +437,9 @@

 		if (!(r = visit(self->converter, arg))) return r;

 	}

 	if (self->conn)

-		return visit(self->conn, arg);

+		return visit((PyObject *)self->conn, arg);

 	return 0;

 }

-#endif

 static int _mysql_ResultObject_clear(

 	_mysql_ResultObject *self)

@@ -515,7 +500,7 @@

 		return -1;

 #define _stringsuck(d,t,s) {t=PyMapping_GetItemString(s,#d);\

-        if(t){d=PyString_AsString(t);Py_DECREF(t);}\

+        if(t){d=PyBytes_AsString(t);Py_DECREF(t);}\

         PyErr_Clear();}

 	if (ssl) {

@@ -663,7 +648,6 @@

 	return (PyObject *) c;

 }

-#if PY_VERSION_HEX >= 0x02020000

 static int _mysql_ConnectionObject_traverse(

 	_mysql_ConnectionObject *self,

 	visitproc visit,

@@ -673,7 +657,7 @@

 		return visit(self->converter, arg);

 	return 0;

 }

-#endif

+

 static int _mysql_ConnectionObject_clear(

 	_mysql_ConnectionObject *self)

@@ -862,7 +846,7 @@

 #endif

 	Py_END_ALLOW_THREADS

 	if (err > 0) return _mysql_Exception(self);

-	return PyInt_FromLong(err);

+	return PyLong_FromLong(err);

 }		

 #if MYSQL_VERSION_ID >= 40100

@@ -885,7 +869,7 @@

 	err = mysql_set_server_option(&(self->connection), flags);

 	Py_END_ALLOW_THREADS

 	if (err) return _mysql_Exception(self);

-	return PyInt_FromLong(err);

+	return PyLong_FromLong(err);

 }		

 static char _mysql_ConnectionObject_sqlstate__doc__[] =

@@ -906,7 +890,7 @@

 	PyObject *args)

 {

 	if (!PyArg_ParseTuple(args, "")) return NULL;

-	return PyString_FromString(mysql_sqlstate(&(self->connection)));

+	return PyUnicode_FromString(mysql_sqlstate(&(self->connection)));

 }		

 static char _mysql_ConnectionObject_warning_count__doc__[] =

@@ -921,7 +905,7 @@

 	PyObject *args)

 {

 	if (!PyArg_ParseTuple(args, "")) return NULL;

-	return PyInt_FromLong(mysql_warning_count(&(self->connection)));

+	return PyLong_FromLong(mysql_warning_count(&(self->connection)));

 }		

 #endif

@@ -939,7 +923,7 @@

 {

 	if (!PyArg_ParseTuple(args, "")) return NULL;

 	check_connection(self);

-	return PyInt_FromLong((long)mysql_errno(&(self->connection)));

+	return PyLong_FromLong((long)mysql_errno(&(self->connection)));

 }

 static char _mysql_ConnectionObject_error__doc__[] =

@@ -955,7 +939,7 @@

 {

 	if (!PyArg_ParseTuple(args, "")) return NULL;

 	check_connection(self);

-	return PyString_FromString(mysql_error(&(self->connection)));

+	return PyUnicode_FromString(mysql_error(&(self->connection)));

 }

 static char _mysql_escape_string__doc__[] =

@@ -966,18 +950,14 @@

 probably better off using connection.escape(o) instead, since\n\

 it will escape entire sequences as well as strings.";

-static PyObject *

-_mysql_escape_string(

-	_mysql_ConnectionObject *self,

-	PyObject *args)

+static PyObject *_mysql_ConnectionObject_escape_string(	_mysql_ConnectionObject *self,	PyObject *args)

 {

 	PyObject *str;

 	char *in, *out;

 	int len, size;

 	if (!PyArg_ParseTuple(args, "s#:escape_string", &in, &size)) return NULL;

-	str = PyString_FromStringAndSize((char *) NULL, size*2+1);

-	if (!str) return PyErr_NoMemory();

-	out = PyString_AS_STRING(str);

+	out = PyMem_New(char, size*2+1);

+	if (!out) return PyErr_NoMemory();

 #if MYSQL_VERSION_ID < 32321

 	len = mysql_escape_string(out, in, size);

 #else

@@ -987,10 +967,16 @@

 	else

 		len = mysql_escape_string(out, in, size);

 #endif

-	if (_PyString_Resize(&str, len) < 0) return NULL;

+	str = PyUnicode_FromString(out);

+	PyMem_Del(out);

 	return (str);

 }

+static PyObject *_mysql_escape_string( PyObject *self, PyObject *args)

+{

+	return _mysql_ConnectionObject_escape_string(NULL, args);

+}

+

 static char _mysql_string_literal__doc__[] =

 "string_literal(obj) -- converts object obj into a SQL string literal.\n\

 This means, any special SQL characters are escaped, and it is enclosed\n\

@@ -1001,43 +987,50 @@

 Use connection.string_literal(obj), if you use it at all.\n\

 _mysql.string_literal(obj) cannot handle character sets.";

-static PyObject *

-_mysql_string_literal(

-	_mysql_ConnectionObject *self,

-	PyObject *args)

+static PyObject *_mysql_ConnectionObject_string_literal(_mysql_ConnectionObject *self, PyObject *args)

 {

-	PyObject *str, *s, *o, *d;

+	PyObject *str, *s, *s2, *o, *d;

 	char *in, *out;

 	int len, size;

 	if (!PyArg_ParseTuple(args, "O|O:string_literal", &o, &d)) return NULL;

 	s = PyObject_Str(o);

 	if (!s) return NULL;

-	in = PyString_AsString(s);

-	size = PyString_GET_SIZE(s);

-	str = PyString_FromStringAndSize((char *) NULL, size*2+3);

-	if (!str) return PyErr_NoMemory();

-	out = PyString_AS_STRING(str);

+	s2 = PyUnicode_AsUTF8String(s);

+	if (!s2) return NULL;

+	in = PyBytes_AsString(s2);

+	if (!in) return NULL;

+	size = PyBytes_GET_SIZE(s2);

+	out = PyMem_New(char, size*2+3);

+	if (!out) return PyErr_NoMemory();

 #if MYSQL_VERSION_ID < 32321

 	len = mysql_escape_string(out+1, in, size);

 #else

 	check_server_init(NULL);

-	if (self && self->open)

+	if (self && self->open )

+	{

 		len = mysql_real_escape_string(&(self->connection), out+1, in, size);

-	else

+	} else

+	{

 		len = mysql_escape_string(out+1, in, size);

+	};

 #endif

 	*out = *(out+len+1) = '\'';

-	if (_PyString_Resize(&str, len+2) < 0) return NULL;

+	*(out+len+2) = '\0';

+	str = PyUnicode_FromString(out);

+	PyMem_Del(out);

+	Py_DECREF(s2);

 	Py_DECREF(s);

 	return (str);

 }

+static PyObject *_mysql_string_literal(PyObject *self, PyObject *args)

+{

+	return _mysql_ConnectionObject_string_literal(NULL, args);

+}

+

 static PyObject *_mysql_NULL;

-static PyObject *

-_escape_item(

-	PyObject *item,

-	PyObject *d)

+static PyObject *_escape_item( PyObject *item, PyObject *d)

 {

 	PyObject *quoted=NULL, *itemtype, *itemconv;

 	if (!(itemtype = PyObject_Type(item)))

@@ -1047,11 +1040,11 @@

 	if (!itemconv) {

 		PyErr_Clear();

 		itemconv = PyObject_GetItem(d,

-				 (PyObject *) &PyString_Type);

+			(PyObject *) &PyUnicode_Type);

 	}

 	if (!itemconv) {

 		PyErr_SetString(PyExc_TypeError,

-				"no default type converter defined");

+			"no default type converter defined");

 		goto error;

 	}

 	quoted = PyObject_CallFunction(itemconv, "OO", item, d);

@@ -1064,32 +1057,33 @@

 "escape(obj, dict) -- escape any special characters in object obj\n\

 using mapping dict to provide quoting functions for each type.\n\

 Returns a SQL literal string.";

-static PyObject *

-_mysql_escape(

-	PyObject *self,

-	PyObject *args)

+static PyObject *_mysql_ConnectionObject_escape( _mysql_ConnectionObject *self, PyObject *args)

 {

 	PyObject *o=NULL, *d=NULL;

 	if (!PyArg_ParseTuple(args, "O|O:escape", &o, &d))

 		return NULL;

 	if (d) {

 		if (!PyMapping_Check(d)) {

-			PyErr_SetString(PyExc_TypeError,

-					"argument 2 must be a mapping");

+			PyErr_SetString(PyExc_TypeError, "argument 2 must be a mapping");

 			return NULL;

 		}

 		return _escape_item(o, d);

-	} else {

-		if (!self) {

-			PyErr_SetString(PyExc_TypeError,

-					"argument 2 must be a mapping");

+	} else

+	{

+		if (!self)

+		{

+			PyErr_SetString(PyExc_TypeError, "argument 2 must be a mapping");

 			return NULL;

 		}

-		return _escape_item(o,

-			   ((_mysql_ConnectionObject *) self)->converter);

+		return _escape_item(o, self->converter);

 	}

 }

+static PyObject *_mysql_escape(	PyObject *self,	PyObject *args)

+{

+	return _mysql_ConnectionObject_escape(NULL, args);

+}

+

 static char _mysql_escape_sequence__doc__[] =

 "escape_sequence(seq, dict) -- escape any special characters in sequence\n\

 seq using mapping dict to provide quoting functions for each type.\n\

@@ -1160,20 +1154,28 @@

 the Cursor.description attribute.\n\

 ";

-static PyObject *

-_mysql_ResultObject_describe(

-	_mysql_ResultObject *self,

-	PyObject *args)

+static PyObject * _mysql_ResultObject_describe ( _mysql_ResultObject *self, PyObject *args)

 {

-	PyObject *d;

+	PyObject *d = NULL;

 	MYSQL_FIELD *fields;

 	unsigned int i, n;

-	if (!PyArg_ParseTuple(args, "")) return NULL;

+	

+	if ( !PyArg_ParseTuple(args, ""))

+	{

+		return NULL;

+	};

+

 	check_result_connection(self);

+

 	n = mysql_num_fields(self->result);

 	fields = mysql_fetch_fields(self->result);

-	if (!(d = PyTuple_New(n))) return NULL;

-	for (i=0; i<n; i++) {

+	d = PyTuple_New(n);

+	if ( d == NULL )

+	{

+		return NULL;

+	};

+	for (i = 0; i < n; i++)

+	{

 		PyObject *t;

 		t = Py_BuildValue("(siiiiii)",

 				  fields[i].name,

@@ -1183,13 +1185,16 @@

 				  (long) fields[i].length,

 				  (long) fields[i].decimals,

 				  (long) !(IS_NOT_NULL(fields[i].flags)));

-		if (!t) goto error;

+		if (t == NULL)

+		{

+			Py_XDECREF(d);

+			d = NULL;

+			break;

+		};

 		PyTuple_SET_ITEM(d, i, t);

-	}

+	};

+	

 	return d;

-  error:

-	Py_XDECREF(d);

-	return NULL;

 }

 static char _mysql_ResultObject_field_flags__doc__[] =

@@ -1211,7 +1216,7 @@

 	if (!(d = PyTuple_New(n))) return NULL;

 	for (i=0; i<n; i++) {

 		PyObject *f;

-		if (!(f = PyInt_FromLong((long)fields[i].flags))) goto error;

+		if (!(f = PyLong_FromLong((long)fields[i].flags))) goto error;

 		PyTuple_SET_ITEM(d, i, f);

 	}

 	return d;

@@ -1221,27 +1226,44 @@

 }

 static PyObject *

-_mysql_field_to_python(

-	PyObject *converter,

-	char *rowitem,

-	unsigned long length)

+_mysql_field_to_python(PyObject *converter, char *rowitem, unsigned long length, const char *charset)

 {

 	PyObject *v;

-	if (rowitem) {

-		if (converter != Py_None)

-			v = PyObject_CallFunction(converter,

-						  "s#",

-						  rowitem,

-						  (int)length);

-		else

-			v = PyString_FromStringAndSize(rowitem,

-						       (int)length);

-		if (!v)

-			return NULL;

-	} else {

+	if (rowitem)

+	{

+		if (charset)

+		{

+			PyObject *rowitem_unicode = PyUnicode_Decode(rowitem, (int)length, charset, "replace");

+			if (rowitem_unicode == NULL)

+			{

+				return NULL;

+			} else

+			{

+				if (converter != Py_None)

+		        {

+					v = PyObject_CallFunction(converter, "O", rowitem_unicode);

+			                Py_XDECREF(rowitem_unicode);

+		        } else