Fixes for the Mac. (Jack)
diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 287c063..dbf59b1 100644
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -667,7 +667,11 @@
try:
# Disable event scanning except for Command-Period
import MacOS
- MacOS.EnableAppswitch(0)
+ try:
+ MacOS.SchedParams(1, 0)
+ except AttributeError:
+ # pre-1.5, use old routine
+ MacOS.EnableAppswitch(0)
except ImportError:
pass
else:
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index 0c8f41f..e97c011 100755
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -28,8 +28,11 @@
jan1 = time.localtime(time.mktime((now[0], 1, 1) + (0,)*6))
- if now[8]: tz = time.tzname[1]
- else: tz = time.tzname[0]
+ try:
+ if now[8]: tz = time.tzname[1]
+ else: tz = time.tzname[0]
+ except AttributeError:
+ tz = ''
if now[3] > 12: clock12 = now[3] - 12
elif now[3] > 0: clock12 = now[3]
@@ -66,7 +69,6 @@
'%m/%d/%y %H:%M:%S'),
('%Y', '%d' % now[0], 'year with century'),
('%y', '%02d' % (now[0]%100), 'year without century'),
- ('%Z', tz, 'time zone name'),
('%%', '%', 'single percent sign'),
)
@@ -80,6 +82,7 @@
'year without century rendered using fieldwidth'),
('%n', '\n', 'newline character'),
('%t', '\t', 'tab character'),
+ ('%Z', tz, 'time zone name'),
)
if verbose:
diff --git a/Lib/tkinter/Tkinter.py b/Lib/tkinter/Tkinter.py
index 287c063..dbf59b1 100755
--- a/Lib/tkinter/Tkinter.py
+++ b/Lib/tkinter/Tkinter.py
@@ -667,7 +667,11 @@
try:
# Disable event scanning except for Command-Period
import MacOS
- MacOS.EnableAppswitch(0)
+ try:
+ MacOS.SchedParams(1, 0)
+ except AttributeError:
+ # pre-1.5, use old routine
+ MacOS.EnableAppswitch(0)
except ImportError:
pass
else: