python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-15 19:31:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

A couple more Python 3 fixes.

Browse Source
This commit is contained in:
adustman
2012-09-07 22:48:55 +00:00
parent 66abb0e8d0
commit c1d15552e6
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MySQLdb/_mysql.c
View File

@ -32,6 +32,7 @@ PERFORMANCE OF THIS SOFTWARE.
#define PyInt_FromLong(n) PyLong_FromLong(n) #define PyInt_FromLong(n) PyLong_FromLong(n)
#define PyInt_Check(n) PyLong_Check(n) #define PyInt_Check(n) PyLong_Check(n)
#define PyInt_AS_LONG(n) PyLong_AS_LONG(n) #define PyInt_AS_LONG(n) PyLong_AS_LONG(n)
#define RO READONLY
#endif #endif
#if PY_VERSION_HEX > 0x02060000 #if PY_VERSION_HEX > 0x02060000
#include "bytesobject.h" #include "bytesobject.h"
@ -58,7 +59,11 @@ PERFORMANCE OF THIS SOFTWARE.
# define MyMember(a,b,c,d,e) {a,b,c,d,e} # define MyMember(a,b,c,d,e) {a,b,c,d,e}
# define MyMemberlist(x) struct PyMemberDef x # define MyMemberlist(x) struct PyMemberDef x
# define MyAlloc(s,t) (s *) t.tp_alloc(&t,0) # define MyAlloc(s,t) (s *) t.tp_alloc(&t,0)
# define MyFree(ob) ob->ob_type->tp_free((PyObject *)ob) #ifdef IS_PY3K
# define MyFree(o) PyObject_Del(o)
#else
# define MyFree(ob) ob->ob_type->tp_free((PyObject *)ob)
#endif
#endif #endif
#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN) #if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
@ -2235,7 +2240,11 @@ _mysql_ResultObject_repr(
char buf[300]; char buf[300];
sprintf(buf, "<_mysql.result object at %lx>", sprintf(buf, "<_mysql.result object at %lx>",
(long)self); (long)self);
#ifdef IS_PY3K
return PyUnicode_FromString(buf);
#else
return PyString_FromString(buf); return PyString_FromString(buf);
#endif
} }
static PyMethodDef _mysql_ConnectionObject_methods[] = { static PyMethodDef _mysql_ConnectionObject_methods[] = {