Let Python inform the user what went wrong with the import.

 Modified Files:
 	idle idle.py idle.pyw

diff --git a/Lib/idlelib/idle b/Lib/idlelib/idle
index 449fb0ec90ae6567858a56da200c8ec0ee17d500..3b08cae2347ee807a7350dc751a5f928aad45469 100755 (executable)
--- a/Lib/idlelib/idle
+++ b/Lib/idlelib/idle
@@ -7,7 +7,7 @@ except ImportError:
     try:
         import PyShell
     except ImportError:
-        print "Can't locate PyShell.py"
+        raise
     else:
         import os
         idledir = os.path.dirname(os.path.abspath(PyShell.__file__))

diff --git a/Lib/idlelib/idle.py b/Lib/idlelib/idle.py
index 449fb0ec90ae6567858a56da200c8ec0ee17d500..3b08cae2347ee807a7350dc751a5f928aad45469 100644 (file)
--- a/Lib/idlelib/idle.py
+++ b/Lib/idlelib/idle.py
@@ -7,7 +7,7 @@ except ImportError:
     try:
         import PyShell
     except ImportError:
-        print "Can't locate PyShell.py"
+        raise
     else:
         import os
         idledir = os.path.dirname(os.path.abspath(PyShell.__file__))

diff --git a/Lib/idlelib/idle.pyw b/Lib/idlelib/idle.pyw
index 2a61720b40f930e008a7a9f9c345bd00b4a33d8c..767db865a558ce7ce9b2116b4b4615492fb7911e 100644 (file)
--- a/Lib/idlelib/idle.pyw
+++ b/Lib/idlelib/idle.pyw
@@ -5,7 +5,7 @@ except ImportError:
     try:
         import PyShell
     except ImportError:
-        print "Can't locate PyShell.py"
+        raise
     else:
         import os
         idledir = os.path.dirname(os.path.abspath(PyShell.__file__))