Remove the 2.2 compatibility module boolcheck.py and related code

M PyShell.py
R boolcheck.py
M run.py

diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index d65ec27aac08e87e0c34fe09e975111f46f9dcce..60fe3c20bc9be6cb65892f9afff784ded746ac2a 100644 (file)
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -19,9 +19,6 @@ from code import InteractiveInterpreter
 from Tkinter import *
 import tkMessageBox
 
-# Preserve 2.2 compatibility for Mac OS X:
-import boolcheck
-
 from EditorWindow import EditorWindow, fixwordbreaks
 from FileList import FileList
 from ColorDelegator import ColorDelegator

diff --git a/Lib/idlelib/boolcheck.py b/Lib/idlelib/boolcheck.py
deleted file mode 100644 (file)
index f682232..0000000
--- a/Lib/idlelib/boolcheck.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"boolcheck - import this module to ensure True, False, bool() builtins exist."
-try:
-    True
-except NameError:
-    import __builtin__
-    __builtin__.True = 1
-    __builtin__.False = 0
-    from operator import truth
-    __builtin__.bool = truth

diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index 7ff8b55cc2d3fcdc1d717f37f02dc467575e9c72..be91d5459d3283d3c6858458e42434fb3872806c 100644 (file)
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -7,8 +7,6 @@ import thread
 import threading
 import Queue
 
-import boolcheck
-
 import CallTips
 import RemoteDebugger
 import RemoteObjectBrowser