From 7c010ee00cc0bfb859c326d9a78bd8dd2bf92246 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Wed, 21 Mar 2012 13:35:08 +0200 Subject: #3573: idle now doesn't hungs if launched as: idle -e Patch by Guilherme Polo. --- Lib/idlelib/NEWS.txt | 7 +++++++ Lib/idlelib/PyShell.py | 6 ++++-- Misc/NEWS | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 46ef3cb..205b9f3 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,3 +1,10 @@ +What's New in IDLE 2.7.3? +======================= + +- Issue #3573: IDLE hangs when passing invalid command line args + (directory(ies) instead of file(s)). + + What's New in IDLE 2.7.2? ======================= diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 895d7da..eeb33e1 100644 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -1412,8 +1412,10 @@ def main(): if enable_edit: if not (cmd or script): - for filename in args: - flist.open(filename) + for filename in args[:]: + if flist.open(filename) is None: + # filename is a directory actually, disconsider it + args.remove(filename) if not args: flist.new() if enable_shell: diff --git a/Misc/NEWS b/Misc/NEWS index 0b3668f..65b5c17 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -27,6 +27,9 @@ Core and Builtins Library ------- +- Issue #3573: IDLE hangs when passing invalid command line args + (directory(ies) instead of file(s)) (Patch by Guilherme Polo) + - Issue #13694: asynchronous connect in asyncore.dispatcher does not set addr attribute. -- cgit v0.12