Mailing List Archive

Update of /cvsroot/python/python/dist/src/Mac/Lib/lib-scriptpackages/Finder
In directory usw-pr-cvs1:/tmp/cvs-serv22902/Python/Mac/Lib/lib-scriptpackages/Finder

Modified Files:
Finder_items.py
Log Message:
Second part of fix for #493826: regenerated suite modules so errn exists but == 0 doesn't signal an error.

Bugfix candidate.

Index: Finder_items.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/lib-scriptpackages/Finder/Finder_items.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Finder_items.py 17 May 2001 12:39:53 -0000 1.2
--- Finder_items.py 23 Apr 2002 21:06:31 -0000 1.3
***************
*** 2,6 ****
Level 1, version 1

! Generated from Macintosh HD:Systeemmap:Finder
AETE/AEUT resource version 0/144, language 0, script 0
"""
--- 2,6 ----
Level 1, version 1

! Generated from Moes:Systeemmap:Finder
AETE/AEUT resource version 0/144, language 0, script 0
"""
***************
*** 27,31 ****
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.has_key('errn'):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
--- 27,31 ----
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.get('errn', 0):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
***************
*** 52,56 ****
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.has_key('errn'):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
--- 52,56 ----
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.get('errn', 0):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
***************
*** 72,76 ****
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.has_key('errn'):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
--- 72,76 ----
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.get('errn', 0):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
***************
*** 92,96 ****
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.has_key('errn'):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
--- 92,96 ----
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.get('errn', 0):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
***************
*** 112,116 ****
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.has_key('errn'):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
--- 112,116 ----
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.get('errn', 0):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
***************
*** 118,124 ****
--- 118,129 ----
return _arguments['----']

+ _argmap_put_away = {
+ 'asking' : 'fask',
+ }
+
def put_away(self, _object, _attributes={}, **_arguments):
"""put away: Put away the specified object(s)
Required argument: the items to put away
+ Keyword argument asking: Specifies whether or not to present a dialog to confirm putting this item away.
Keyword argument _attributes: AppleEvent attribute dictionary
Returns: the object put away in its put-away location
***************
*** 127,137 ****
_subcode = 'ptwy'

! if _arguments: raise TypeError, 'No optional args expected'
_arguments['----'] = _object


_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.has_key('errn'):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
--- 132,143 ----
_subcode = 'ptwy'

! aetools.keysubst(_arguments, self._argmap_put_away)
_arguments['----'] = _object

+ aetools.enumsubst(_arguments, 'fask', _Enum_bool)

_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.get('errn', 0):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
***************
*** 153,157 ****
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.has_key('errn'):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
--- 159,163 ----
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.get('errn', 0):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
***************
*** 173,177 ****
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.has_key('errn'):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
--- 179,183 ----
_reply, _arguments, _attributes = self.send(_code, _subcode,
_arguments, _attributes)
! if _arguments.get('errn', 0):
raise aetools.Error, aetools.decodeerror(_arguments)
# XXXX Optionally decode result
***************
*** 294,297 ****
--- 300,304 ----
item._elemdict = {
}
+ _Enum_bool = None # XXXX enum bool not found!!

#
***************
*** 303,327 ****

_propdeclarations = {
! 'iwnd' : information_window,
! 'cdis' : disk,
! 'asmo' : modification_date,
! 'ascd' : creation_date,
! 'pnam' : name,
'labi' : label_index,
! 'ID ' : id,
! 'iimg' : icon,
'pidx' : index,
! 'dwnd' : content_space,
'cwin' : window,
! 'comt' : comment,
! 'dscr' : description,
'asdr' : folder,
! 'issl' : selected,
! 'pbnd' : bounds,
! 'ctnr' : container,
! 'phys' : physical_size,
! 'ptsz' : size,
! 'kind' : kind,
! 'posn' : position,
}

--- 310,334 ----

_propdeclarations = {
! 'posn' : position,
! 'kind' : kind,
! 'ptsz' : size,
! 'phys' : physical_size,
! 'dwnd' : content_space,
! 'pbnd' : bounds,
! 'issl' : selected,
'labi' : label_index,
! 'dscr' : description,
! 'comt' : comment,
! 'ctnr' : container,
'pidx' : index,
! 'iimg' : icon,
! 'ID ' : id,
'cwin' : window,
! 'pnam' : name,
! 'ascd' : creation_date,
! 'cdis' : disk,
! 'asmo' : modification_date,
'asdr' : folder,
! 'iwnd' : information_window,
}