Improve exception handling.

diff --git a/Lib/idlelib/idle b/Lib/idlelib/idle
index 131e8d3694a5744d8295b30f932588b6352f075d..0d4e85fdf0944399e430830ec9c0228fc06b7689 100755 (executable)
--- a/Lib/idlelib/idle
+++ b/Lib/idlelib/idle
@@ -1,9 +1,9 @@
-#! /usr/bin/env python
+#!/usr/bin/python
 
 try:
     import idlelib.PyShell
     idlelib.PyShell.main()
-except:
+except ImportError:
     # IDLE is not installed, but maybe PyShell is on sys.path:
     import PyShell
     PyShell.main()

diff --git a/Lib/idlelib/idle.py b/Lib/idlelib/idle.py
index 131e8d3694a5744d8295b30f932588b6352f075d..0d4e85fdf0944399e430830ec9c0228fc06b7689 100644 (file)
--- a/Lib/idlelib/idle.py
+++ b/Lib/idlelib/idle.py
@@ -1,9 +1,9 @@
-#! /usr/bin/env python
+#!/usr/bin/python
 
 try:
     import idlelib.PyShell
     idlelib.PyShell.main()
-except:
+except ImportError:
     # IDLE is not installed, but maybe PyShell is on sys.path:
     import PyShell
     PyShell.main()

diff --git a/Lib/idlelib/idle.pyw b/Lib/idlelib/idle.pyw
index 131e8d3694a5744d8295b30f932588b6352f075d..0d4e85fdf0944399e430830ec9c0228fc06b7689 100644 (file)
--- a/Lib/idlelib/idle.pyw
+++ b/Lib/idlelib/idle.pyw
@@ -1,9 +1,9 @@
-#! /usr/bin/env python
+#!/usr/bin/python
 
 try:
     import idlelib.PyShell
     idlelib.PyShell.main()
-except:
+except ImportError:
     # IDLE is not installed, but maybe PyShell is on sys.path:
     import PyShell
     PyShell.main()