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.

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

Add Builtin quit and exit #388

Merged
merged 1 commit into from Mar 8, 2022

Conversation

mrclary
Copy link

@mrclary mrclary commented Oct 29, 2021

Fixes #387.

  • Added builtin definitions for 'quit' and 'exit'
  • Set ENABLE_USER_SITE=False

@mrclary mrclary marked this pull request as draft October 29, 2021 16:02
@mrclary
Copy link
Author

mrclary commented Oct 29, 2021

@ronaldoussoren, I included a temporary fix for the Qt issue in this PR just so it would work in my build tests. Upon resolution of #380 I can revert the relevant commit.

@MAKOMO
Copy link
Contributor

MAKOMO commented Dec 11, 2021

Shouldn't that temporary fix for #380 also be applied to the PyQt6 version?

@mrclary
Copy link
Author

mrclary commented Dec 11, 2021

@MAKOMO I haven't worked with Qt6 yet, but if you think it should be applied feel free to add another commit to this PR.

@mrclary mrclary changed the title Fix ENABLE_USER_SITE Add Builtin quit and exit Feb 6, 2022
@mrclary mrclary marked this pull request as ready for review February 6, 2022 16:15
@mrclary
Copy link
Author

mrclary commented Feb 6, 2022

@ronaldoussoren, since you added ENABLE_USER_SITE in 5150910, I changed this PR to only include the addition of quit and exit to the builtins. I also removed the temporary fix for Qt5.

@ronaldoussoren
Copy link
Owner

PR looks OK. Thanks!

@ronaldoussoren ronaldoussoren merged commit 958cd17 into ronaldoussoren:master Mar 8, 2022
@mrclary mrclary deleted the fix-enable-user-site branch March 8, 2022 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ENABLE_USER_SITE not defined in site.py
3 participants