-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
hooks: tkinter: avoid collecting data from system Tcl/Tk framework on…
… macOS On macOS, we do not collect system libraries in general; if tkinter uses system Tcl/Tk 8.5 framework (older 32/64-bit python.org builds, or brew python), we do not collect its Tk and Tcl shared library, either. Therefore, it makes little sense to collect the data (scripts and modules) from the system framework, either. This commit modifies the behavior of both _tkinter stdhook and rthook on macOS. The stdhook now treats (None, None) returned by _find_tcl_tk() as an indicator that the system framework is used and that data directories should not be collected. The rthook now sets TCL_LIBRARY and TK_LIBRARY environment variables if collected tcl and tk directories exist, but does not raise error anymore if they do not (under assumption that they have not been collected from the system framework). The behavior under other OSes remains unchanged.
- Loading branch information
Showing
2 changed files
with
46 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters