mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-36429: Fix starting IDLE with pyshell (#12548)

Browse source 
Add idlelib.pyshell alias at top; remove pyshell alias at bottom.
Remove obsolete __name__=='__main__' command.
This commit is contained in:
Terry Jan Reedy 2019-03-26 19:58:19 -04:00 • committed by GitHub
parent 6da20a4950
commit 6a258c8890
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/idlelib/NEWS.txt
View file

@ -3,6 +3,15 @@ Released on 2019-10-20?
====================================== ======================================
bpo-36429: Fix starting IDLE with pyshell.
Add idlelib.pyshell alias at top; remove pyshell alias at bottom.
Remove obsolete __name__=='__main__' command.
bpo-30348: Increase test coverage of idlelib.autocomplete by 30%.
Patch by Louie Lu.
bpo-23205: Add tests and refactor grep's findfiles.
bpo-36405: Use dict unpacking in idlelib. bpo-36405: Use dict unpacking in idlelib.
bpo-36396: Remove fgBg param of idlelib.config.GetHighlight(). bpo-36396: Remove fgBg param of idlelib.config.GetHighlight().

8
Lib/idlelib/pyshell.py
View file

@ -1,6 +1,8 @@
#! /usr/bin/env python3 #! /usr/bin/env python3
import sys import sys
if __name__ == "__main__":
sys.modules['idlelib.pyshell'] = sys.modules['__main__']
try: try:
from tkinter import * from tkinter import *
@ -416,10 +418,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
# run from the IDLE source directory. # run from the IDLE source directory.
del_exitf = idleConf.GetOption('main', 'General', 'delete-exitfunc', del_exitf = idleConf.GetOption('main', 'General', 'delete-exitfunc',
default=False, type='bool') default=False, type='bool')
if __name__ == 'idlelib.pyshell': command = "__import__('idlelib.run').run.main(%r)" % (del_exitf,)
command = "__import__('idlelib.run').run.main(%r)" % (del_exitf,)
else:
command = "__import__('run').main(%r)" % (del_exitf,)
return [sys.executable] + w + ["-c", command, str(self.port)] return [sys.executable] + w + ["-c", command, str(self.port)]
def start_subprocess(self): def start_subprocess(self):
@ -1574,7 +1573,6 @@ def main():
capture_warnings(False) capture_warnings(False)
if __name__ == "__main__": if __name__ == "__main__":
sys.modules['pyshell'] = sys.modules['__main__']
main() main()
capture_warnings(False) # Make sure turned off; see issue 18081 capture_warnings(False) # Make sure turned off; see issue 18081

2
Misc/NEWS.d/next/IDLE/2019-03-26-00-09-50.bpo-36429.w-jL2e.rst Normal file
View file

@ -0,0 +1,2 @@
Fix starting IDLE with pyshell. Add idlelib.pyshell alias at top; remove
pyshell alias at bottom. Remove obsolete __name__=='__main__' command.