Changeset 391 for python/trunk/Lib/plat-mac/aetools.py
- Timestamp:
- Mar 19, 2014, 11:31:01 PM (11 years ago)
- Location:
- python/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
python/trunk
-
Property svn:mergeinfo
set to
/python/vendor/Python-2.7.6 merged eligible /python/vendor/current merged eligible
-
Property svn:mergeinfo
set to
-
python/trunk/Lib/plat-mac/aetools.py
r2 r391 111 111 ok = keydict.values() 112 112 for k in arguments.keys(): 113 if k eydict.has_key(k):113 if k in keydict: 114 114 v = arguments[k] 115 115 del arguments[k] … … 120 120 def enumsubst(arguments, key, edict): 121 121 """Substitute a single enum keyword argument, if it occurs""" 122 if not arguments.has_key(key)or edict is None:122 if key not in arguments or edict is None: 123 123 return 124 124 v = arguments[key] 125 125 ok = edict.values() 126 if edict.has_key(v):126 if v in edict: 127 127 arguments[key] = Enum(edict[v]) 128 128 elif not v in ok: … … 133 133 errn = arguments['errn'] 134 134 err_a1 = errn 135 if arguments.has_key('errs'):135 if 'errs' in arguments: 136 136 err_a2 = arguments['errs'] 137 137 else: 138 138 err_a2 = MacOS.GetErrorString(errn) 139 if arguments.has_key('erob'):139 if 'erob' in arguments: 140 140 err_a3 = arguments['erob'] 141 141 else: … … 252 252 _reply, _arguments, _attributes = self.send(_code, _subcode, 253 253 _arguments, _attributes) 254 if _arguments.has_key('errn'):254 if 'errn' in _arguments: 255 255 raise Error, decodeerror(_arguments) 256 256 257 if _arguments.has_key('----'):257 if '----' in _arguments: 258 258 return _arguments['----'] 259 259 if asfile: … … 285 285 raise Error, decodeerror(_arguments) 286 286 # XXXX Optionally decode result 287 if _arguments.has_key('----'):287 if '----' in _arguments: 288 288 return _arguments['----'] 289 289 … … 294 294 295 295 def __getattr__(self, name): 296 if self._elemdict.has_key(name):296 if name in self._elemdict: 297 297 cls = self._elemdict[name] 298 298 return DelayedComponentItem(cls, None) 299 if self._propdict.has_key(name):299 if name in self._propdict: 300 300 cls = self._propdict[name] 301 301 return cls() … … 319 319 _reply, _arguments, _attributes = self.send(_code, _subcode, 320 320 _arguments, _attributes) 321 if _arguments.has_key('errn'):321 if 'errn' in _arguments: 322 322 raise Error, decodeerror(_arguments) 323 323 # XXXX Optionally decode result 324 if _arguments.has_key('----'):324 if '----' in _arguments: 325 325 return _arguments['----'] 326 326 #pass
Note:
See TracChangeset
for help on using the changeset viewer.