From: Kurt B. Kaiser <kbk@shore.net>
Date: Thu, 2 Apr 2009 02:44:54 +0000 (+0000)
Subject: Remove port spec from run.py and fix bug where
X-Git-Tag: v2.7a1~1610
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4724f40bcb69a4a1f84ba61918c14a8f0082a9ac;p=python

Remove port spec from run.py and fix bug where
subprocess fails to extract port from command line
when warnings are present.
---

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 6f912e8bad..b3095e6ad3 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,8 +3,11 @@ What's New in IDLE 2.7a0?
 
 *Release date: XX-XXX-2009*
 
+- Remove port spec from run.py and fix bug where subprocess fails to
+  extract port from command line when warnings are present.
+
 - Tk 8.5 Text widget requires 'wordprocessor' tabstyle attr to handle
-  mixed space/tab properly. Issue 5120, patch by Guilherme Polo.
+  mixed space/tab properly. Issue 5129, patch by Guilherme Polo.
   
 - Issue #3549: On MacOS the preferences menu was not present
 
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index abe94abc8b..2d5c5edaaa 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -67,10 +67,13 @@ def main(del_exitfunc=False):
     global quitting
     global no_exitfunc
     no_exitfunc = del_exitfunc
-    port = 8833
     #time.sleep(15) # test subprocess not responding
-    if sys.argv[1:]:
-        port = int(sys.argv[1])
+    try:
+        assert(len(sys.argv) > 1)
+        port = int(sys.argv[-1])
+    except:
+        print>>sys.stderr, "IDLE Subprocess: no IP port passed in sys.argv."
+        return
     sys.argv[:] = [""]
     sockthread = threading.Thread(target=manage_socket,
                                   name='SockThread',