Skip to content
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

Jump to bottom

hooks: tkinter: avoid collecting data from system Tcl/Tk framework on macOS #5217

Merged
merged 2 commits into from
Oct 10, 2020
Merged

hooks: tkinter: avoid collecting data from system Tcl/Tk framework on macOS #5217

merged 2 commits into from
Oct 10, 2020

Commits on Oct 5, 2020

  1. 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.
    @rokm
    rokm committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    af09a05 View commit details
    Browse the repository at this point in the history

  2. Appease the linter

    @rokm
    rokm committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    e4ea3c9 View commit details
    Browse the repository at this point in the history