Improve exception handling.

diff --git a/Lib/idlelib/idle b/Lib/idlelib/idle
index 0d4e85fdf0944399e430830ec9c0228fc06b7689..c8a8feaf6ce82a9979de71b886ecc0afe95e37df 100755 (executable)
--- a/Lib/idlelib/idle
+++ b/Lib/idlelib/idle
@@ -2,8 +2,9 @@
 
 try:
     import idlelib.PyShell
-    idlelib.PyShell.main()
 except ImportError:
     # IDLE is not installed, but maybe PyShell is on sys.path:
     import PyShell
     PyShell.main()
+else:
+    idlelib.PyShell.main()

diff --git a/Lib/idlelib/idle.py b/Lib/idlelib/idle.py
index 0d4e85fdf0944399e430830ec9c0228fc06b7689..c8a8feaf6ce82a9979de71b886ecc0afe95e37df 100644 (file)
--- a/Lib/idlelib/idle.py
+++ b/Lib/idlelib/idle.py
@@ -2,8 +2,9 @@
 
 try:
     import idlelib.PyShell
-    idlelib.PyShell.main()
 except ImportError:
     # IDLE is not installed, but maybe PyShell is on sys.path:
     import PyShell
     PyShell.main()
+else:
+    idlelib.PyShell.main()

diff --git a/Lib/idlelib/idle.pyw b/Lib/idlelib/idle.pyw
index 0d4e85fdf0944399e430830ec9c0228fc06b7689..c8a8feaf6ce82a9979de71b886ecc0afe95e37df 100644 (file)
--- a/Lib/idlelib/idle.pyw
+++ b/Lib/idlelib/idle.pyw
@@ -2,8 +2,9 @@
 
 try:
     import idlelib.PyShell
-    idlelib.PyShell.main()
 except ImportError:
     # IDLE is not installed, but maybe PyShell is on sys.path:
     import PyShell
     PyShell.main()
+else:
+    idlelib.PyShell.main()