Skip to content

Commit 6592420

Browse files
committed
Support for Python 3.2 and MySQL 5.5
1 parent ad9e7dc commit 6592420

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Diff for: _mysql.c

+3-5
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ PERFORMANCE OF THIS SOFTWARE.
3131
#if defined(MS_WINDOWS)
3232
#include <winsock2.h>
3333
#include <windows.h>
34-
#include <config-win.h>
35-
#else
36-
#include "my_config.h"
3734
#endif
35+
#include "my_config.h"
3836
#include "mysql.h"
3937
#include "mysqld_error.h"
4038
#include "errmsg.h"
@@ -2741,10 +2739,10 @@ PyMODINIT_FUNC PyInit__mysql(void)
27412739
_mysql_ResultObject_Type.ob_base.ob_base.ob_type = &PyType_Type;
27422740
_mysql_ConnectionObject_Type.tp_alloc = PyType_GenericAlloc;
27432741
_mysql_ConnectionObject_Type.tp_new = PyType_GenericNew;
2744-
_mysql_ConnectionObject_Type.tp_free = _PyObject_GC_Del;
2742+
_mysql_ConnectionObject_Type.tp_free = PyObject_GC_Del;
27452743
_mysql_ResultObject_Type.tp_alloc = PyType_GenericAlloc;
27462744
_mysql_ResultObject_Type.tp_new = PyType_GenericNew;
2747-
_mysql_ResultObject_Type.tp_free = _PyObject_GC_Del;
2745+
_mysql_ResultObject_Type.tp_free = PyObject_GC_Del;
27482746

27492747
if (PyType_Ready(&_mysql_ConnectionObject_Type) < 0) return NULL;
27502748
if (PyType_Ready(&_mysql_ResultObject_Type) < 0) return NULL;

Diff for: setup_windows.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def get_config():
1515
else:
1616
client = "mysqlclient"
1717

18-
library_dirs = [ os.path.join(mysql_root, r'lib\opt') ]
18+
library_dirs = [ os.path.join(mysql_root, r'lib') ]
1919
libraries = [ 'kernel32', 'advapi32', 'wsock32', client ]
2020
include_dirs = [ os.path.join(mysql_root, r'include') ]
2121
extra_compile_args = [ '/Zl' ]

Diff for: win_build.cmd

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@echo off
2+
"python.exe" setup.py install
3+
"python.exe" setup.py install
4+
pause

0 commit comments

Comments
 (0)