summaryrefslogtreecommitdiffstats
path: root/Lib/plat-mac/MiniAEFrame.py
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-04-03 18:17:54 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-04-03 18:17:54 (GMT)
commita3a505076efc19ec23669370778c5fa22d030ffa (patch)
tree4d91e9339c5d09bb17147162538fe1835e47e432 /Lib/plat-mac/MiniAEFrame.py
parent5f516edd77d00cae24d287285e455833d44097a7 (diff)
downloadcpython-a3a505076efc19ec23669370778c5fa22d030ffa.zip
cpython-a3a505076efc19ec23669370778c5fa22d030ffa.tar.gz
cpython-a3a505076efc19ec23669370778c5fa22d030ffa.tar.bz2
Silence DeprecationWarnings from uses of has_key and <> in plat-mac.
Diffstat (limited to 'Lib/plat-mac/MiniAEFrame.py')
-rw-r--r--Lib/plat-mac/MiniAEFrame.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/plat-mac/MiniAEFrame.py b/Lib/plat-mac/MiniAEFrame.py
index 8d758c3..d6126bb 100644
--- a/Lib/plat-mac/MiniAEFrame.py
+++ b/Lib/plat-mac/MiniAEFrame.py
@@ -136,11 +136,11 @@ class AEServer:
_class = _attributes['evcl'].type
_type = _attributes['evid'].type
- if self.ae_handlers.has_key((_class, _type)):
+ if (_class, _type) in self.ae_handlers:
_function = self.ae_handlers[(_class, _type)]
- elif self.ae_handlers.has_key((_class, '****')):
+ elif (_class, '****') in self.ae_handlers:
_function = self.ae_handlers[(_class, '****')]
- elif self.ae_handlers.has_key(('****', '****')):
+ elif ('****', '****') in self.ae_handlers:
_function = self.ae_handlers[('****', '****')]
else:
raise 'Cannot happen: AE callback without handler', (_class, _type)
@@ -150,7 +150,7 @@ class AEServer:
_parameters['_attributes'] = _attributes
_parameters['_class'] = _class
_parameters['_type'] = _type
- if _parameters.has_key('----'):
+ if '----' in _parameters:
_object = _parameters['----']
del _parameters['----']
# The try/except that used to be here can mask programmer errors.