Get rid of a bunch more has_key() uses. We *really* need a tool for this.
test_aepack now passes. IDLE still needs to be converted (among others).
diff --git a/Lib/plat-mac/EasyDialogs.py b/Lib/plat-mac/EasyDialogs.py
index b33d1be..1bd46a8 100644
--- a/Lib/plat-mac/EasyDialogs.py
+++ b/Lib/plat-mac/EasyDialogs.py
@@ -577,9 +577,9 @@
if args[k] is None:
del args[k]
# Set some defaults, and modify some arguments
- if not args.has_key('dialogOptionFlags'):
+ if 'dialogOptionFlags' not in args:
args['dialogOptionFlags'] = dftflags
- if args.has_key('defaultLocation') and \
+ if 'defaultLocation' in args and \
not isinstance(args['defaultLocation'], Carbon.AE.AEDesc):
defaultLocation = args['defaultLocation']
if isinstance(defaultLocation, (Carbon.File.FSSpec, Carbon.File.FSRef)):
@@ -587,7 +587,7 @@
else:
defaultLocation = Carbon.File.FSRef(defaultLocation)
args['defaultLocation'] = aepack.pack(defaultLocation)
- if args.has_key('typeList') and not isinstance(args['typeList'], Carbon.Res.ResourceType):
+ if 'typeList' in args and not isinstance(args['typeList'], Carbon.Res.ResourceType):
typeList = args['typeList'][:]
# Workaround for OSX typeless files:
if 'TEXT' in typeList and not '\0\0\0\0' in typeList:
@@ -597,7 +597,7 @@
data = data+type
args['typeList'] = Carbon.Res.Handle(data)
tpwanted = str
- if args.has_key('wanted'):
+ if 'wanted' in args:
tpwanted = args['wanted']
del args['wanted']
return args, tpwanted