X Tutup
Skip to content

FIX: search for tkinter first in builtins #7433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NelleV merged 1 commit into from
Nov 9, 2016
Merged

FIX: search for tkinter first in builtins #7433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/_tkagg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,10 +410,19 @@ int load_tkinter_funcs(void)
// Load tkinter global funcs from tkinter compiled module.
// Return 0 for success, non-zero for failure.
int ret = -1;
void *tkinter_lib;
void *main_program, *tkinter_lib;
char *tkinter_libname;
PyObject *pModule = NULL, *pSubmodule = NULL, *pString = NULL;

// Try loading from the main program namespace first
main_program = dlopen(NULL, RTLD_LAZY);
if (_func_loader(main_program) == 0) {
return 0;
}
// Clear exception triggered when we didn't find symbols above.
PyErr_Clear();

// Now try finding the tkinter compiled module
pModule = PyImport_ImportModule(TKINTER_PKG);
if (pModule == NULL) {
goto exit;
Expand Down
X Tutup