Move boolcheck to PyShell

diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index 5b4744e28a6bd8c143bc50d952dbc0281ec1bf8f..ffdde4ee852bd6e0b34892113d14c6478b61a7e4 100644 (file)
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -12,6 +12,8 @@ import traceback
 import types
 import exceptions
 
+import boolcheck
+
 import linecache
 from code import InteractiveInterpreter
 

diff --git a/Lib/idlelib/macosx_main.py b/Lib/idlelib/macosx_main.py
index 78480fae89871cf03c2d778415397666509b9528..9a965eda4f776af69cccbac391d132092471e70d 100644 (file)
--- a/Lib/idlelib/macosx_main.py
+++ b/Lib/idlelib/macosx_main.py
@@ -27,20 +27,15 @@ idlelib = join(split(__file__)[0], 'idlelib')
 if isdir(idlelib):
   sys.path.append(idlelib)
 
-# Make sure True, False, bool() builtins exist.
-# - preserves 2.2 compatibility - 2.2.1 includes bool, 2.2 does not.
-# - important for Mac OS X because it ships python 2.2
-import boolcheck
-
 # see if we are being asked to execute the subprocess code
 if '-p' in sys.argv:
     # run expects only the port number in sys.argv
     sys.argv.remove('-p')
 
-    # this module will become the namepsace used by the interactive
+    # this module will become the namespace used by the interactive
     # interpreter; remove all variables we have defined.
     del sys, __file__, boolcheck, split, join, isdir
     __import__('run').main()
 else:
     # Load idlelib/idle.py which starts the application.
-    import idle 
+    import idle