Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 05:31:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes for the Mac. (Jack)

Browse source
This commit is contained in:
Guido van Rossum 1997-08-12 18:21:08 +00:00
parent a5e9fb6a65
commit 9d9af2c7a8
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/lib-tk/Tkinter.py
View file

@ -667,7 +667,11 @@ def __init__(self, screenName=None, baseName=None, className='Tk'):
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:

9
Lib/test/test_strftime.py
View file

@ -28,8 +28,11 @@ def strftest(now):
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 @@ def strftest(now):
'%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 @@ def strftest(now):
'year without century rendered using fieldwidth'),
('%n', '\n', 'newline character'),
('%t', '\t', 'tab character'),
('%Z', tz, 'time zone name'),
)
if verbose:

6
Lib/tkinter/Tkinter.py
View file

@ -667,7 +667,11 @@ def __init__(self, screenName=None, baseName=None, className='Tk'):
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: