[Python-checkins] python/dist/src/Mac/Lib/lib-scriptpackages/Finder Finder_Basics.py,1.2,1.3

jackjansen@sourceforge.net jackjansen@sourceforge.net
Tue, 23 Apr 2002 14:07:20 -0700


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

Modified Files:
	Finder_Basics.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_Basics.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/lib-scriptpackages/Finder/Finder_Basics.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Finder_Basics.py	17 May 2001 12:40:24 -0000	1.2
--- Finder_Basics.py	23 Apr 2002 21:07:18 -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
  """
***************
*** 33,37 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 33,37 ----
  		_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
***************
*** 71,75 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 71,75 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 90,94 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 90,94 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 109,113 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 109,113 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 135,139 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 135,139 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 197,200 ****
--- 197,204 ----
  	which = 'desk'
  	want = 'cdsk'
+ class execution_state(aetools.NProperty):
+ 	"""execution state - the current execution state of the Finder """
+ 	which = 'exec'
+ 	want = 'ese0'
  class Finder_preferences(aetools.NProperty):
  	"""Finder preferences - Various preferences that apply to the Finder as a whole """
***************
*** 225,228 ****
--- 229,233 ----
  #        element 'cwnd' as ['indx', 'name']
  #        element 'iwnd' as ['indx', 'name']
+ #        element 'vwnd' as ['indx', 'name']
  #        element 'lwnd' as ['indx', 'name']
  #        element 'dwnd' as ['indx', 'name']
***************
*** 286,289 ****
--- 291,295 ----
  	'about_this_computer' : about_this_computer,
  	'desktop' : desktop,
+ 	'execution_state' : execution_state,
  	'Finder_preferences' : Finder_preferences,
  }
***************
*** 313,316 ****
--- 319,323 ----
  	'container_window' : Earlier_terms.container_window,
  	'information_window' : Earlier_terms.information_window,
+ 	'view_options_window' : Window_classes.view_options_window,
  	'clipping_window' : Window_classes.clipping_window,
  	'content_space' : Window_classes.content_space,
***************
*** 334,365 ****
  #
  _classdeclarations = {
- 	'spfl' : special_folders,
  	'capp' : application,
  }
  
  _propdeclarations = {
! 	'amnu' : apple_menu_items_folder,
! 	'extn' : extensions_folder,
! 	'pnam' : name,
! 	'fshr' : file_sharing,
! 	'pcli' : clipboard,
! 	'strt' : startup_items_folder,
! 	'pref' : preferences_folder,
! 	'pisf' : frontmost,
! 	'pins' : insertion_location,
! 	'pvis' : visible,
! 	'abbx' : about_this_computer,
! 	'temp' : temporary_items_folder,
! 	'font' : fonts_folder,
  	'pfrp' : Finder_preferences,
! 	'desk' : desktop,
! 	'fsup' : sharing_starting_up,
  	'mfre' : largest_free_block,
  	'ctrl' : control_panels_folder,
- 	'sele' : selection,
- 	'shdf' : shutdown_items_folder,
  	'macs' : system_folder,
! 	'ver2' : product_version,
! 	'vers' : version,
  }
  
--- 341,373 ----
  #
  _classdeclarations = {
  	'capp' : application,
+ 	'spfl' : special_folders,
  }
  
  _propdeclarations = {
! 	'vers' : version,
! 	'ver2' : product_version,
  	'pfrp' : Finder_preferences,
! 	'exec' : execution_state,
! 	'pins' : insertion_location,
  	'mfre' : largest_free_block,
+ 	'fsup' : sharing_starting_up,
+ 	'desk' : desktop,
  	'ctrl' : control_panels_folder,
  	'macs' : system_folder,
! 	'font' : fonts_folder,
! 	'abbx' : about_this_computer,
! 	'shdf' : shutdown_items_folder,
! 	'temp' : temporary_items_folder,
! 	'pvis' : visible,
! 	'sele' : selection,
! 	'pisf' : frontmost,
! 	'pref' : preferences_folder,
! 	'strt' : startup_items_folder,
! 	'pcli' : clipboard,
! 	'fshr' : file_sharing,
! 	'pnam' : name,
! 	'extn' : extensions_folder,
! 	'amnu' : apple_menu_items_folder,
  }