[Python-3000-checkins] r65329 - in python/branches/py3k: Lib/tkinter/__init__.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Jul 31 17:20:45 2008
New Revision: 65329

Log:
Merged revisions 65328 via svnmerge from
svn+ssh://pythondev at svn.python.org/python/trunk

........
r65328 | benjamin.peterson | 2008-07-31 10:15:45 -0500 (Thu, 31 Jul 2008) | 1 line

remove usage of MacOS from Tkinter
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/tkinter/__init__.py

Modified: python/branches/py3k/Lib/tkinter/__init__.py
==============================================================================
--- python/branches/py3k/Lib/tkinter/__init__.py (original)
+++ python/branches/py3k/Lib/tkinter/__init__.py Thu Jul 31 17:20:45 2008
@@ -39,10 +39,6 @@
import _tkinter # If this fails your Python may not be configured for Tk
TclError = _tkinter.TclError
from tkinter.constants import *
-try:
- import MacOS; _MacOS = MacOS; del MacOS
-except ImportError:
- _MacOS = None

wantobjects = 1

@@ -1650,12 +1646,6 @@
def _loadtk(self):
self._tkloaded = 1
global _default_root
- if _MacOS and hasattr(_MacOS, 'SchedParams'):
- # Disable event scanning except for Command-Period
- _MacOS.SchedParams(1, 0)
- # Work around nasty MacTk bug
- # XXX Is this one still needed?
- self.update()
# Version sanity checks
tk_version = self.tk.getvar('tk_version')
if tk_version != _tkinter.TK_VERSION: