From 0f71f4415603d36e0fabec812f93dc80547466b3 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Wed, 21 Mar 2012 13:23:41 +0200 Subject: [PATCH] #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 0a4f98e9fba..4482be2024a 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,3 +1,10 @@ +What's New in IDLE 3.2.3? +========================= + +- Issue #3573: IDLE hangs when passing invalid command line args + (directory(ies) instead of file(s)). + + What's New in IDLE 3.2.1? ========================= diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 6bf0a8c65df..74a37db862e 100644 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -1389,8 +1389,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 3375decccdf..dcf4e2359d8 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -28,6 +28,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.