[Python-checkins] cpython: #3573: idle now doesn't hungs if launched as: idle -e <directory>

Tue Mar 20 22:04:54 CET 2012

http://hg.python.org/cpython/rev/01404295138d
changeset: 75845:01404295138d
user: Andrew Svetlov <andrew.svetlov at gmail.com>
date: Tue Mar 20 23:03:26 2012 +0200
summary:
 #3573: idle now doesn't hungs if launched as: idle -e <directory>
Patch by Guilherme Polo.
files:
 Lib/idlelib/PyShell.py | 6 ++++--
 Misc/NEWS | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1403,8 +1403,10 @@
 
 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,11 @@
 Core and Builtins
 -----------------
 
+- Issue #3573: IDLE hangs when passing invalid command line args
+ (directory(ies) instead of file(s))
+
+ Thanks to Guilherme Polo for patch and to Roger Serwy for review.
+
 - Issue #1683368: object.__new__ and object.__init__ raise a TypeError if they
 are passed arguments and their complementary method is not overridden.
 
-- 
Repository URL: http://hg.python.org/cpython
