python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-03-23 19:44:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

BF: make sure tkinter loaded for check

Browse Source 
Make sure that tkinter package is loaded before checking for symbols in
process (Windows).
This commit is contained in:
Matthew Brett 2016-05-27 19:34:21 -04:00
parent 659e294676
commit 6968c0c712
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Tk/tkImaging.c
View File

@ -222,6 +222,15 @@ TkImaging_Init(Tcl_Interp* interp)
/* /*
* Functions to fill global Tcl / Tk function pointers by dynamic loading * Functions to fill global Tcl / Tk function pointers by dynamic loading
*/ */
#if PY_VERSION_HEX >= 0x03000000
#define TKINTER_PKG "tkinter"
#define TKINTER_MOD "_tkinter"
#else
#define TKINTER_PKG "Tkinter"
#define TKINTER_MOD "tkinter"
#endif
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
/* /*
@ -311,6 +320,13 @@ int load_tkinter_funcs(void)
int found_tcl = 0; int found_tcl = 0;
int found_tk = 0; int found_tk = 0;
/* First load tkinter module to make sure libraries are loaded */
PyObject *pModule = PyImport_ImportModule(TKINTER_PKG);
if (pModule == NULL) {
return 1;
}
Py_DECREF(pModule);
/* Returns pseudo-handle that does not need to be closed */ /* Returns pseudo-handle that does not need to be closed */
hProcess = GetCurrentProcess(); hProcess = GetCurrentProcess();
@ -351,10 +367,8 @@ int load_tkinter_funcs(void)
* tkinter dynamic library (module). * tkinter dynamic library (module).
*/ */
#if PY_VERSION_HEX >= 0x03000000
#define TKINTER_PKG "tkinter"
#define TKINTER_MOD "_tkinter"
/* From module __file__ attribute to char *string for dlopen. */ /* From module __file__ attribute to char *string for dlopen. */
#if PY_VERSION_HEX >= 0x03000000
char *fname2char(PyObject *fname) char *fname2char(PyObject *fname)
{ {
PyObject *bytes = PyUnicode_EncodeFSDefault(fname); PyObject *bytes = PyUnicode_EncodeFSDefault(fname);
@ -364,9 +378,6 @@ char *fname2char(PyObject *fname)
return PyBytes_AsString(bytes); return PyBytes_AsString(bytes);
} }
#else #else
#define TKINTER_PKG "Tkinter"
#define TKINTER_MOD "tkinter"
/* From module __file__ attribute to char *string for dlopen */
#define fname2char(s) (PyString_AsString(s)) #define fname2char(s) (PyString_AsString(s))
#endif #endif