Regenerated (from resource files) with sorting version of gensuitemodule.

This is a first step towards regenerating the modules with newer, MacOSX,
versions of these programs, and using the programmatic interface to
get at the terminology in stead of poking in resource files.

Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py

@@ -43,36 +43,12 @@ class CodeWarrior_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	_argmap_export = {
+	def build(self, _no_object=None, _attributes={}, **_arguments):
-		'in_' : 'kfil',
+		"""build: build a project or target (equivalent of the Make menu command)
-	}
-
-	def export(self, _no_object=None, _attributes={}, **_arguments):
-		"""export: Export the project file as an XML file
-		Keyword argument in_: the XML file in which to export the project
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'CWIE'
-		_subcode = 'EXPT'
+		_subcode = 'MAKE'
-
-		aetools.keysubst(_arguments, self._argmap_export)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def update(self, _no_object=None, _attributes={}, **_arguments):
-		"""update: bring a project or target up to date
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'UP2D'
 
 		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
@@ -146,12 +122,36 @@ class CodeWarrior_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def build(self, _no_object=None, _attributes={}, **_arguments):
+	_argmap_export = {
-		"""build: build a project or target (equivalent of the Make menu command)
+		'in_' : 'kfil',
+	}
+
+	def export(self, _no_object=None, _attributes={}, **_arguments):
+		"""export: Export the project file as an XML file
+		Keyword argument in_: the XML file in which to export the project
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'CWIE'
-		_subcode = 'MAKE'
+		_subcode = 'EXPT'
+
+		aetools.keysubst(_arguments, self._argmap_export)
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def remove_object_code(self, _no_object=None, _attributes={}, **_arguments):
+		"""remove object code: remove object code from a project or target
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'CWIE'
+		_subcode = 'RMOB'
 
 		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
@@ -177,25 +177,6 @@ class CodeWarrior_suite_Events:
 		_arguments['----'] = _object
 
 
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def remove_object_code(self, _no_object=None, _attributes={}, **_arguments):
-		"""remove object code: remove object code from a project or target
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'RMOB'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):
@@ -243,14 +224,39 @@ class CodeWarrior_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
+	def update(self, _no_object=None, _attributes={}, **_arguments):
+		"""update: bring a project or target up to date
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'CWIE'
+		_subcode = 'UP2D'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+
+class ToolServer_worksheet(aetools.ComponentItem):
+	"""ToolServer worksheet - a ToolServer worksheet """
+	want = 'TOOL'
+class inherits(aetools.NProperty):
+	"""inherits - all properties and elements of the given class are inherited by this class. """
+	which = 'c@#^'
+	want = 'TXTD'
+
+ToolServer_worksheets = ToolServer_worksheet
 
 class build_progress_document(aetools.ComponentItem):
 	"""build progress document - a build progress document """
 	want = 'PRGS'
-class inherits(aetools.NProperty):
-	"""inherits - all properties and elements of the given class are inherited by this class. """
-	which = 'c@#^'
-	want = 'docu'
 
 build_progress_documents = build_progress_document
 
@@ -266,11 +272,11 @@ class class_browser(aetools.ComponentItem):
 
 class_browsers = class_browser
 
-class class_hierarchy(aetools.ComponentItem):
+class class_hierarchies(aetools.ComponentItem):
-	"""class hierarchy - a class hierarchy document """
+	"""class hierarchies - more than one class hierarchy document """
 	want = 'HIER'
 
-class_hierarchies = class_hierarchy
+class_hierarchy = class_hierarchies
 
 class editor_document(aetools.ComponentItem):
 	"""editor document - an editor document """
@@ -313,11 +319,11 @@ class single_class_browser(aetools.ComponentItem):
 
 single_class_browsers = single_class_browser
 
-class single_class_hierarchy(aetools.ComponentItem):
+class single_class_hierarchies(aetools.ComponentItem):
-	"""single class hierarchy - a single class hierarchy document """
+	"""single class hierarchies - more than one single class hierarchy document """
 	want = '1HIR'
 
-single_class_hierarchies = single_class_hierarchy
+single_class_hierarchy = single_class_hierarchies
 
 class subtarget(aetools.ComponentItem):
 	"""subtarget - a target that is prerequisite for another target """
@@ -353,8 +359,6 @@ class project_document(aetools.NProperty):
 #        element 'SRCF' as ['indx', 'test', 'rang']
 #        element 'SBTG' as ['indx', 'test', 'rang']
 
-targets = target
-
 class target_file(aetools.ComponentItem):
 	"""target file - a source or header file in a target """
 	want = 'SRCF'
@@ -425,6 +429,8 @@ class dependents(aetools.NProperty):
 
 target_files = target_file
 
+targets = target
+
 class text_document(aetools.ComponentItem):
 	"""text document - a document that contains text """
 	want = 'TXTD'
@@ -442,12 +448,12 @@ class selection(aetools.NProperty):
 #        element 'ctxt' as ['rang']
 
 text_documents = text_document
-
+ToolServer_worksheet._superclassnames = ['text_document']
-class ToolServer_worksheet(aetools.ComponentItem):
+ToolServer_worksheet._privpropdict = {
-	"""ToolServer worksheet - a ToolServer worksheet """
+	'inherits' : inherits,
-	want = 'TOOL'
+}
-
+ToolServer_worksheet._privelemdict = {
-ToolServer_worksheets = ToolServer_worksheet
+}
 import Standard_Suite
 build_progress_document._superclassnames = ['document']
 build_progress_document._privpropdict = {
@@ -467,11 +473,10 @@ class_browser._privpropdict = {
 }
 class_browser._privelemdict = {
 }
-class_hierarchy._superclassnames = ['document']
+class_hierarchies._superclassnames = []
-class_hierarchy._privpropdict = {
+class_hierarchies._privpropdict = {
-	'inherits' : inherits,
 }
-class_hierarchy._privelemdict = {
+class_hierarchies._privelemdict = {
 }
 editor_document._superclassnames = ['text_document']
 editor_document._privpropdict = {
@@ -511,11 +516,10 @@ single_class_browser._privpropdict = {
 }
 single_class_browser._privelemdict = {
 }
-single_class_hierarchy._superclassnames = ['document']
+single_class_hierarchies._superclassnames = []
-single_class_hierarchy._privpropdict = {
+single_class_hierarchies._privpropdict = {
-	'inherits' : inherits,
 }
-single_class_hierarchy._privelemdict = {
+single_class_hierarchies._privelemdict = {
 }
 subtarget._superclassnames = ['target']
 subtarget._privpropdict = {
@@ -573,19 +577,6 @@ text_document._privelemdict = {
 	'line' : Standard_Suite.line,
 	'text' : Standard_Suite.text,
 }
-ToolServer_worksheet._superclassnames = ['text_document']
-ToolServer_worksheet._privpropdict = {
-	'inherits' : inherits,
-}
-ToolServer_worksheet._privelemdict = {
-}
-_Enum_Inte = {
-	'never_interact' : 'eNvr',	# never allow user interactions
-	'interact_with_self' : 'eInS',	# allow user interaction only when an AppleEvent is sent from within CodeWarrior
-	'interact_with_local' : 'eInL',	# allow user interaction when AppleEvents are sent from applications on the same machine (default)
-	'interact_with_all' : 'eInA',	# allow user interaction from both local and remote AppleEvents
-}
-
 _Enum_DKND = {
 	'project' : 'PRJD',	# a project document
 	'editor_document' : 'EDIT',	# an editor document
@@ -610,6 +601,13 @@ _Enum_FTYP = {
 	'unknown_file' : 'UNKN',	# unknown file type
 }
 
+_Enum_Inte = {
+	'never_interact' : 'eNvr',	# never allow user interactions
+	'interact_with_self' : 'eInS',	# allow user interaction only when an AppleEvent is sent from within CodeWarrior
+	'interact_with_local' : 'eInL',	# allow user interaction when AppleEvents are sent from applications on the same machine (default)
+	'interact_with_all' : 'eInA',	# allow user interaction from both local and remote AppleEvents
+}
+
 _Enum_PERM = {
 	'read_write' : 'RdWr',	# the file is open with read/write permission
 	'read_only' : 'Read',	# the file is open with read/only permission
@@ -630,18 +628,18 @@ _classdeclarations = {
 	'SYMB' : symbol_browser,
 	'EDIT' : editor_document,
 	'COMP' : file_compare_document,
-	'BROW' : class_browser,
+	'TOOL' : ToolServer_worksheet,
 	'SBTG' : subtarget,
 	'MSSG' : message_document,
 	'INSP' : project_inspector,
 	'TXTD' : text_document,
 	'CTLG' : catalog_document,
-	'HIER' : class_hierarchy,
+	'HIER' : class_hierarchies,
 	'TRGT' : target,
 	'PRGS' : build_progress_document,
 	'SRCF' : target_file,
-	'TOOL' : ToolServer_worksheet,
+	'BROW' : class_browser,
-	'1HIR' : single_class_hierarchy,
+	'1HIR' : single_class_hierarchies,
 }
 
 _propdeclarations = {

Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py

@@ -286,6 +286,47 @@ class Metrowerks_Shell_Suite_Events:
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
 
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def Get_member_function_names(self, _object, _attributes={}, **_arguments):
+		"""Get member function names: Returns a list containing the names of all the member functions of a class object
+		Required argument: must be a class object
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: undocumented, typecode 'list'
+		"""
+		_code = 'MMPR'
+		_subcode = 'MbFN'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def Get_nonsimple_classes(self, _no_object=None, _attributes={}, **_arguments):
+		"""Get nonsimple classes: Returns an alphabetical list of classes with member functions, bases classes, or subclasses
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: undocumented, typecode 'list'
+		"""
+		_code = 'MMPR'
+		_subcode = 'NsCl'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):
@@ -372,6 +413,26 @@ class Metrowerks_Shell_Suite_Events:
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
 
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def Open_browser(self, _object, _attributes={}, **_arguments):
+		"""Open browser: Display a class, member function, or data member object in a single class browser window
+		Required argument: an AE object reference
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'MMPR'
+		_subcode = 'Brow'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):
@@ -720,67 +781,6 @@ class Metrowerks_Shell_Suite_Events:
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
 
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Open_browser(self, _object, _attributes={}, **_arguments):
-		"""Open browser: Display a class, member function, or data member object in a single class browser window
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'Brow'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_nonsimple_classes(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get nonsimple classes: Returns an alphabetical list of classes with member functions, bases classes, or subclasses
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'list'
-		"""
-		_code = 'MMPR'
-		_subcode = 'NsCl'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_member_function_names(self, _object, _attributes={}, **_arguments):
-		"""Get member function names: Returns a list containing the names of all the member functions of a class object
-		Required argument: must be a class object
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'list'
-		"""
-		_code = 'MMPR'
-		_subcode = 'MbFN'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):
@@ -1554,6 +1554,29 @@ class Local_Path(aetools.NProperty):
 	which = 'VC10'
 	want = 'RlPt'
 
+class base_class(aetools.ComponentItem):
+	"""base class - A base class or super class of a class """
+	want = 'BsCl'
+class class_(aetools.NProperty):
+	"""class - The class object corresponding to this base class """
+	which = 'Clas'
+	want = 'obj '
+class access(aetools.NProperty):
+	"""access -  """
+	which = 'Acce'
+	want = 'Acce'
+class virtual(aetools.NProperty):
+	"""virtual -  """
+	which = 'Virt'
+	want = 'bool'
+
+base_classes = base_class
+
+class browser_catalog(aetools.ComponentItem):
+	"""browser catalog - The browser symbol catalog for the current project """
+	want = 'Cata'
+#        element 'Clas' as ['indx', 'name']
+
 class class_(aetools.ComponentItem):
 	"""class - A class, struct, or record type in the current project. """
 	want = 'Clas'
@@ -1587,21 +1610,19 @@ class all_subclasses(aetools.NProperty):
 
 classes = class_
 
-class member_function(aetools.ComponentItem):
+class data_member(aetools.ComponentItem):
-	"""member function - A class member function or method. """
+	"""data member - A class data member or field """
-	want = 'MbFn'
+	want = 'DtMb'
-class access(aetools.NProperty):
-	"""access -  """
-	which = 'Acce'
-	want = 'Acce'
-class virtual(aetools.NProperty):
-	"""virtual -  """
-	which = 'Virt'
-	want = 'bool'
 class static(aetools.NProperty):
 	"""static -  """
 	which = 'Stat'
 	want = 'bool'
+
+data_members = data_member
+
+class member_function(aetools.ComponentItem):
+	"""member function - A class member function or method. """
+	want = 'MbFn'
 class implementation_file(aetools.NProperty):
 	"""implementation file - Source file containing the member function definition """
 	which = 'DfFl'
@@ -1616,27 +1637,6 @@ class implementation_end_offset(aetools.NProperty):
 	want = 'long'
 
 member_functions = member_function
-
-class data_member(aetools.ComponentItem):
-	"""data member - A class data member or field """
-	want = 'DtMb'
-
-data_members = data_member
-
-class base_class(aetools.ComponentItem):
-	"""base class - A base class or super class of a class """
-	want = 'BsCl'
-class class_(aetools.NProperty):
-	"""class - The class object corresponding to this base class """
-	which = 'Clas'
-	want = 'obj '
-
-base_classes = base_class
-
-class browser_catalog(aetools.ComponentItem):
-	"""browser catalog - The browser symbol catalog for the current project """
-	want = 'Cata'
-#        element 'Clas' as ['indx', 'name']
 Access_Paths._superclassnames = []
 Access_Paths._privpropdict = {
 	'User_Paths' : User_Paths,
@@ -1970,6 +1970,20 @@ VCS_Setup._privpropdict = {
 }
 VCS_Setup._privelemdict = {
 }
+base_class._superclassnames = []
+base_class._privpropdict = {
+	'class_' : class_,
+	'access' : access,
+	'virtual' : virtual,
+}
+base_class._privelemdict = {
+}
+browser_catalog._superclassnames = []
+browser_catalog._privpropdict = {
+}
+browser_catalog._privelemdict = {
+	'class_' : class_,
+}
 class_._superclassnames = []
 class_._privpropdict = {
 	'name' : name,
@@ -1985,6 +1999,16 @@ class_._privelemdict = {
 	'member_function' : member_function,
 	'data_member' : data_member,
 }
+data_member._superclassnames = []
+data_member._privpropdict = {
+	'name' : name,
+	'access' : access,
+	'static' : static,
+	'declaration_start_offset' : declaration_start_offset,
+	'declaration_end_offset' : declaration_end_offset,
+}
+data_member._privelemdict = {
+}
 member_function._superclassnames = []
 member_function._privpropdict = {
 	'name' : name,
@@ -2000,30 +2024,96 @@ member_function._privpropdict = {
 }
 member_function._privelemdict = {
 }
-data_member._superclassnames = []
+_Enum_Acce = {
-data_member._privpropdict = {
+	'public' : 'Publ',	# 
-	'name' : name,
+	'protected' : 'Prot',	# 
-	'access' : access,
+	'private' : 'Priv',	# 
-	'static' : static,
-	'declaration_start_offset' : declaration_start_offset,
-	'declaration_end_offset' : declaration_end_offset,
 }
-data_member._privelemdict = {
+
+_Enum_BXbr = {
+	'Always_Build' : 'BXb1',	# Always build the target before running.
+	'Ask_Build' : 'BXb2',	# Ask before building the target when running.
+	'Never_Build' : 'BXb3',	# Never before building the target before running.
 }
-base_class._superclassnames = []
+
-base_class._privpropdict = {
+_Enum_DbSA = {
-	'class_' : class_,
+	'No_Action' : 'DSA1',	# Don\xd5t do anything to non-debug windows
-	'access' : access,
+	'Hide_Windows' : 'DSA2',	# Hide non-debugging windows
-	'virtual' : virtual,
+	'Collapse_Windows' : 'DSA3',	# Collapse non-debugging windows
+	'Close_Windows' : 'DSA4',	# Close non-debugging windows
 }
-base_class._privelemdict = {
+
+_Enum_DgBL = {
+	'Always' : 'DgB0',	# Always build before debugging.
+	'Never' : 'DgB1',	# Never build before debugging.
+	'Ask' : 'DgB2',	# Ask about building before debugging.
 }
-browser_catalog._superclassnames = []
+
-browser_catalog._privpropdict = {
+_Enum_ErrT = {
+	'information' : 'ErIn',	# 
+	'compiler_warning' : 'ErCW',	# 
+	'compiler_error' : 'ErCE',	# 
+	'definition' : 'ErDf',	# 
+	'linker_warning' : 'ErLW',	# 
+	'linker_error' : 'ErLE',	# 
+	'find_result' : 'ErFn',	# 
+	'generic_error' : 'ErGn',	# 
 }
-browser_catalog._privelemdict = {
+
-	'class_' : class_,
+_Enum_Inte = {
+	'never_interact' : 'eNvr',	# Never allow user interactions
+	'interact_with_self' : 'eInS',	# Allow user interaction only when an AppleEvent is sent from within CodeWarrior
+	'interact_with_local' : 'eInL',	# Allow user interaction when AppleEvents are sent from applications on the same machine (default)
+	'interact_with_all' : 'eInA',	# Allow user interaction from both local and remote AppleEvents
 }
+
+_Enum_Lang = {
+	'C' : 'LC  ',	# 
+	'C_2b__2b_' : 'LC++',	# 
+	'Pascal' : 'LP  ',	# 
+	'Object_Pascal' : 'LP++',	# 
+	'Java' : 'LJav',	# 
+	'Assembler' : 'LAsm',	# 
+	'Unknown' : 'L?  ',	# 
+}
+
+_Enum_PPrm = {
+	'absolute' : 'Abso',	# An absolute path name, including volume name.
+	'project_relative' : 'PRel',	# A path relative to the current project\xd5s folder.
+	'shell_relative' : 'SRel',	# A path relative to the CodeWarrior\xaa folder.
+	'system_relative' : 'YRel',	# A path relative to the system folder
+	'root_relative' : 'RRel',	# 
+}
+
+_Enum_PXdg = {
+	'Diagnose_None' : 'PXd1',	# No Plugin Diagnostics.
+	'Diagnose_Errors' : 'PXd2',	# Plugin Diagnostics for errors only.
+	'Diagnose_All' : 'PXd3',	# Plugin Diagnostics for everything.
+}
+
+_Enum_PthF = {
+	'Generic_Path' : 'PFGn',	# 
+	'MacOS_Path' : 'PFMc',	# MacOS path using colon as separator
+	'Windows_Path' : 'PFWn',	# Windows path using backslash as separator
+	'Unix_Path' : 'PFUx',	# Unix path using slash as separator
+}
+
+_Enum_RefP = {
+	'Think_Reference' : 'DanR',	# 
+	'QuickView' : 'ALTV',	# 
+}
+
+_Enum_STKd = {
+	'Absolute_Path' : 'STK0',	# The \xd2path\xd3 property is an absolute path to the location of the source tree.
+	'Registry_Key' : 'STK1',	# The \xd2path\xd3 property is the name of a registry key that contains the path to the root.
+	'Environment_Variable' : 'STK2',	# The \xd2path\xd3 property is the name of an environment variable that contains the path to the root.
+}
+
+_Enum_SrcT = {
+	'source' : 'FTxt',	# A source file (.c, .cp, .p, etc).
+	'unknown' : 'FUnk',	# An unknown file type.
+}
+
 _Enum_TmpB = {
 	'User_Specified' : 'Usrs',	# Use user specified symbols when setting temporary breakpoints on program launch.
 	'Default' : 'Dflt',	# Use system default symbols when setting temporary breakpoints on program launch.
@@ -2041,96 +2131,6 @@ _Enum_savo = {
 	'ask' : 'ask ',	# Ask the user whether to save
 }
 
-_Enum_ErrT = {
-	'information' : 'ErIn',	# 
-	'compiler_warning' : 'ErCW',	# 
-	'compiler_error' : 'ErCE',	# 
-	'definition' : 'ErDf',	# 
-	'linker_warning' : 'ErLW',	# 
-	'linker_error' : 'ErLE',	# 
-	'find_result' : 'ErFn',	# 
-	'generic_error' : 'ErGn',	# 
-}
-
-_Enum_SrcT = {
-	'source' : 'FTxt',	# A source file (.c, .cp, .p, etc).
-	'unknown' : 'FUnk',	# An unknown file type.
-}
-
-_Enum_PPrm = {
-	'absolute' : 'Abso',	# An absolute path name, including volume name.
-	'project_relative' : 'PRel',	# A path relative to the current project\xd5s folder.
-	'shell_relative' : 'SRel',	# A path relative to the CodeWarrior\xaa folder.
-	'system_relative' : 'YRel',	# A path relative to the system folder
-	'root_relative' : 'RRel',	# 
-}
-
-_Enum_DbSA = {
-	'No_Action' : 'DSA1',	# Don\xd5t do anything to non-debug windows
-	'Hide_Windows' : 'DSA2',	# Hide non-debugging windows
-	'Collapse_Windows' : 'DSA3',	# Collapse non-debugging windows
-	'Close_Windows' : 'DSA4',	# Close non-debugging windows
-}
-
-_Enum_Lang = {
-	'C' : 'LC  ',	# 
-	'C_2b__2b_' : 'LC++',	# 
-	'Pascal' : 'LP  ',	# 
-	'Object_Pascal' : 'LP++',	# 
-	'Java' : 'LJav',	# 
-	'Assembler' : 'LAsm',	# 
-	'Unknown' : 'L?  ',	# 
-}
-
-_Enum_Acce = {
-	'public' : 'Publ',	# 
-	'protected' : 'Prot',	# 
-	'private' : 'Priv',	# 
-}
-
-_Enum_Inte = {
-	'never_interact' : 'eNvr',	# Never allow user interactions
-	'interact_with_self' : 'eInS',	# Allow user interaction only when an AppleEvent is sent from within CodeWarrior
-	'interact_with_local' : 'eInL',	# Allow user interaction when AppleEvents are sent from applications on the same machine (default)
-	'interact_with_all' : 'eInA',	# Allow user interaction from both local and remote AppleEvents
-}
-
-_Enum_DgBL = {
-	'Always' : 'DgB0',	# Always build before debugging.
-	'Never' : 'DgB1',	# Never build before debugging.
-	'Ask' : 'DgB2',	# Ask about building before debugging.
-}
-
-_Enum_RefP = {
-	'Think_Reference' : 'DanR',	# 
-	'QuickView' : 'ALTV',	# 
-}
-
-_Enum_PXdg = {
-	'Diagnose_None' : 'PXd1',	# No Plugin Diagnostics.
-	'Diagnose_Errors' : 'PXd2',	# Plugin Diagnostics for errors only.
-	'Diagnose_All' : 'PXd3',	# Plugin Diagnostics for everything.
-}
-
-_Enum_BXbr = {
-	'Always_Build' : 'BXb1',	# Always build the target before running.
-	'Ask_Build' : 'BXb2',	# Ask before building the target when running.
-	'Never_Build' : 'BXb3',	# Never before building the target before running.
-}
-
-_Enum_STKd = {
-	'Absolute_Path' : 'STK0',	# The \xd2path\xd3 property is an absolute path to the location of the source tree.
-	'Registry_Key' : 'STK1',	# The \xd2path\xd3 property is the name of a registry key that contains the path to the root.
-	'Environment_Variable' : 'STK2',	# The \xd2path\xd3 property is the name of an environment variable that contains the path to the root.
-}
-
-_Enum_PthF = {
-	'Generic_Path' : 'PFGn',	# 
-	'MacOS_Path' : 'PFMc',	# MacOS path using colon as separator
-	'Windows_Path' : 'PFWn',	# Windows path using backslash as separator
-	'Unix_Path' : 'PFUx',	# Unix path using slash as separator
-}
-
 
 #
 # Indices of types declared in this module
@@ -2354,17 +2354,17 @@ _compdeclarations = {
 }
 
 _enumdeclarations = {
-	'Lang' : _Enum_Lang,
 	'Inte' : _Enum_Inte,
-	'STKd' : _Enum_STKd,
 	'DgBL' : _Enum_DgBL,
+	'STKd' : _Enum_STKd,
 	'Acce' : _Enum_Acce,
 	'RefP' : _Enum_RefP,
 	'TxtF' : _Enum_TxtF,
-	'DbSA' : _Enum_DbSA,
-	'TmpB' : _Enum_TmpB,
-	'savo' : _Enum_savo,
 	'PthF' : _Enum_PthF,
+	'TmpB' : _Enum_TmpB,
+	'Lang' : _Enum_Lang,
+	'savo' : _Enum_savo,
+	'DbSA' : _Enum_DbSA,
 	'SrcT' : _Enum_SrcT,
 	'PXdg' : _Enum_PXdg,
 	'ErrT' : _Enum_ErrT,

Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py

@@ -4,32 +4,32 @@ Resource aete resid 0 AppleEvent Suites
 """
 import aetools
 Error = aetools.Error
-import Required
-import Standard_Suite
 import CodeWarrior_suite
+import Standard_Suite
 import Metrowerks_Shell_Suite
+import Required
 
 
 _code_to_module = {
-	'reqd' : Required,
-	'CoRe' : Standard_Suite,
 	'CWIE' : CodeWarrior_suite,
+	'CoRe' : Standard_Suite,
 	'MMPR' : Metrowerks_Shell_Suite,
+	'reqd' : Required,
 }
 
 
 
 _code_to_fullname = {
-	'reqd' : ('CodeWarrior.Required', 'Required'),
-	'CoRe' : ('CodeWarrior.Standard_Suite', 'Standard_Suite'),
 	'CWIE' : ('CodeWarrior.CodeWarrior_suite', 'CodeWarrior_suite'),
+	'CoRe' : ('CodeWarrior.Standard_Suite', 'Standard_Suite'),
 	'MMPR' : ('CodeWarrior.Metrowerks_Shell_Suite', 'Metrowerks_Shell_Suite'),
+	'reqd' : ('CodeWarrior.Required', 'Required'),
 }
 
-from Required import *
-from Standard_Suite import *
 from CodeWarrior_suite import *
+from Standard_Suite import *
 from Metrowerks_Shell_Suite import *
+from Required import *
 
 def getbaseclasses(v):
 	if not getattr(v, '_propdict', None):
@@ -48,32 +48,6 @@ import StdSuites
 #
 # Set property and element dictionaries now that all classes have been defined
 #
-getbaseclasses(character)
-getbaseclasses(text)
-getbaseclasses(window)
-getbaseclasses(file)
-getbaseclasses(line)
-getbaseclasses(selection_2d_object)
-getbaseclasses(application)
-getbaseclasses(insertion_point)
-getbaseclasses(document)
-getbaseclasses(single_class_browser)
-getbaseclasses(project_document)
-getbaseclasses(symbol_browser)
-getbaseclasses(editor_document)
-getbaseclasses(file_compare_document)
-getbaseclasses(class_browser)
-getbaseclasses(subtarget)
-getbaseclasses(message_document)
-getbaseclasses(project_inspector)
-getbaseclasses(text_document)
-getbaseclasses(catalog_document)
-getbaseclasses(class_hierarchy)
-getbaseclasses(target)
-getbaseclasses(build_progress_document)
-getbaseclasses(target_file)
-getbaseclasses(ToolServer_worksheet)
-getbaseclasses(single_class_hierarchy)
 getbaseclasses(File_Mapping)
 getbaseclasses(browser_catalog)
 getbaseclasses(Build_Settings)
@@ -110,37 +84,37 @@ getbaseclasses(Font)
 getbaseclasses(Target_Source_Trees)
 getbaseclasses(Debugger_Display)
 getbaseclasses(class_)
+getbaseclasses(character)
+getbaseclasses(text)
+getbaseclasses(window)
+getbaseclasses(file)
+getbaseclasses(line)
+getbaseclasses(selection_2d_object)
+getbaseclasses(application)
+getbaseclasses(insertion_point)
+getbaseclasses(document)
+getbaseclasses(single_class_browser)
+getbaseclasses(project_document)
+getbaseclasses(symbol_browser)
+getbaseclasses(editor_document)
+getbaseclasses(file_compare_document)
+getbaseclasses(class_browser)
+getbaseclasses(subtarget)
+getbaseclasses(message_document)
+getbaseclasses(project_inspector)
+getbaseclasses(text_document)
+getbaseclasses(catalog_document)
+getbaseclasses(class_hierarchy)
+getbaseclasses(target)
+getbaseclasses(build_progress_document)
+getbaseclasses(target_file)
+getbaseclasses(ToolServer_worksheet)
+getbaseclasses(single_class_hierarchy)
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cha ' : character,
-	'ctxt' : text,
-	'cwin' : window,
-	'file' : file,
-	'clin' : line,
-	'csel' : selection_2d_object,
-	'capp' : application,
-	'cins' : insertion_point,
-	'docu' : document,
-	'1BRW' : single_class_browser,
-	'PRJD' : project_document,
-	'SYMB' : symbol_browser,
-	'EDIT' : editor_document,
-	'COMP' : file_compare_document,
-	'BROW' : class_browser,
-	'SBTG' : subtarget,
-	'MSSG' : message_document,
-	'INSP' : project_inspector,
-	'TXTD' : text_document,
-	'CTLG' : catalog_document,
-	'HIER' : class_hierarchy,
-	'TRGT' : target,
-	'PRGS' : build_progress_document,
-	'SRCF' : target_file,
-	'TOOL' : ToolServer_worksheet,
-	'1HIR' : single_class_hierarchy,
 	'FMap' : File_Mapping,
 	'Cata' : browser_catalog,
 	'BSTG' : Build_Settings,
@@ -177,13 +151,39 @@ _classdeclarations = {
 	'TSTs' : Target_Source_Trees,
 	'DbDS' : Debugger_Display,
 	'Clas' : class_,
+	'cha ' : character,
+	'ctxt' : text,
+	'cwin' : window,
+	'file' : file,
+	'clin' : line,
+	'csel' : selection_2d_object,
+	'capp' : application,
+	'cins' : insertion_point,
+	'docu' : document,
+	'1BRW' : single_class_browser,
+	'PRJD' : project_document,
+	'SYMB' : symbol_browser,
+	'EDIT' : editor_document,
+	'COMP' : file_compare_document,
+	'BROW' : class_browser,
+	'SBTG' : subtarget,
+	'MSSG' : message_document,
+	'INSP' : project_inspector,
+	'TXTD' : text_document,
+	'CTLG' : catalog_document,
+	'HIER' : class_hierarchy,
+	'TRGT' : target,
+	'PRGS' : build_progress_document,
+	'SRCF' : target_file,
+	'TOOL' : ToolServer_worksheet,
+	'1HIR' : single_class_hierarchy,
 }
 
 
-class CodeWarrior(Required_Events,
+class CodeWarrior(CodeWarrior_suite_Events,
 		Standard_Suite_Events,
-		CodeWarrior_suite_Events,
 		Metrowerks_Shell_Suite_Events,
+		Required_Events,
 		aetools.TalkTo):
 	_signature = 'CWIE'
 

Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py

@@ -25,6 +25,26 @@ class Microsoft_Internet_Explorer_Events:
 		_arguments['----'] = _object
 
 
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def PrintBrowserWindow(self, _object=None, _attributes={}, **_arguments):
+		"""PrintBrowserWindow: Print contents of browser window (HTML)
+		Required argument: Window Identifier of the window to print. No value means print the frontmost browser window.
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'misc'
+		_subcode = 'pWND'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):
@@ -51,26 +71,6 @@ class Microsoft_Internet_Explorer_Events:
 		_arguments['----'] = _object
 
 
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def PrintBrowserWindow(self, _object=None, _attributes={}, **_arguments):
-		"""PrintBrowserWindow: Print contents of browser window (HTML)
-		Required argument: Window Identifier of the window to print. No value means print the frontmost browser window.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'misc'
-		_subcode = 'pWND'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):

Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py

@@ -13,25 +13,6 @@ _code = 'reqd'
 from StdSuites.Required_Suite import *
 class Required_Suite_Events(Required_Suite_Events):
 
-	def run(self, _no_object=None, _attributes={}, **_arguments):
-		"""run: 
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'oapp'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
 	def open(self, _object, _attributes={}, **_arguments):
 		"""open: Open documents
 		Required argument: undocumented, typecode 'alis'
@@ -83,6 +64,25 @@ class Required_Suite_Events(Required_Suite_Events):
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
 
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def run(self, _no_object=None, _attributes={}, **_arguments):
+		"""run: 
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'oapp'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):

Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py

@@ -12,57 +12,16 @@ _code = 'WWW!'
 
 class Web_Browser_Suite_Events:
 
-	_argmap_OpenURL = {
+	def Activate(self, _object=None, _attributes={}, **_arguments):
-		'to' : 'INTO',
+		"""Activate: Activate Internet Explorer and optionally select window designated by Window Identifier.
-		'toWindow' : 'WIND',
+		Required argument: Window Identifier
-		'Flags' : 'FLGS',
-		'FormData' : 'POST',
-		'MIME_Type' : 'MIME',
-	}
-
-	def OpenURL(self, _object, _attributes={}, **_arguments):
-		"""OpenURL: Retrieves URL off the Web.
-		Required argument: Fully-qualified URL
-		Keyword argument to: Target file for saving downloaded data
-		Keyword argument toWindow: Target window for resource at URL (-1 for top window, 0 for new window)
-		Keyword argument Flags: Valid Flags settings are: 1-Ignore the document cache; 2-Ignore the image cache; 4-Operate in background mode.
-		Keyword argument FormData: data to post
-		Keyword argument MIME_Type: MIME type of data being posted
 		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: Window Identifier of window to activate
 		"""
 		_code = 'WWW!'
-		_subcode = 'OURL'
+		_subcode = 'ACTV'
 
-		aetools.keysubst(_arguments, self._argmap_OpenURL)
+		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_ShowFile = {
-		'MIME_Type' : 'MIME',
-		'Window_Identifier' : 'WIND',
-		'URL' : 'URL ',
-	}
-
-	def ShowFile(self, _object, _attributes={}, **_arguments):
-		"""ShowFile: FileSpec containing data of specified MIME type to be rendered in window specified by Window Identifier.
-		Required argument: The file
-		Keyword argument MIME_Type: MIME type
-		Keyword argument Window_Identifier: Identifier of the target window for the URL. (Can use -1 for top window)
-		Keyword argument URL: URL that allows this document to be reloaded.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'SHWF'
-
-		aetools.keysubst(_arguments, self._argmap_ShowFile)
 		_arguments['----'] = _object
 
 
@@ -121,14 +80,14 @@ class Web_Browser_Suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def Activate(self, _object=None, _attributes={}, **_arguments):
+	def GetWindowInfo(self, _object, _attributes={}, **_arguments):
-		"""Activate: Activate Internet Explorer and optionally select window designated by Window Identifier.
+		"""GetWindowInfo: Returns a window info record (URL/Title) for the specified window.
-		Required argument: Window Identifier
+		Required argument: Window Identifier of the window
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Window Identifier of window to activate
+		Returns:   
 		"""
 		_code = 'WWW!'
-		_subcode = 'ACTV'
+		_subcode = 'WNFO'
 
 		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
@@ -162,16 +121,28 @@ class Web_Browser_Suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def GetWindowInfo(self, _object, _attributes={}, **_arguments):
+	_argmap_OpenURL = {
-		"""GetWindowInfo: Returns a window info record (URL/Title) for the specified window.
+		'to' : 'INTO',
-		Required argument: Window Identifier of the window
+		'toWindow' : 'WIND',
+		'Flags' : 'FLGS',
+		'FormData' : 'POST',
+		'MIME_Type' : 'MIME',
+	}
+
+	def OpenURL(self, _object, _attributes={}, **_arguments):
+		"""OpenURL: Retrieves URL off the Web.
+		Required argument: Fully-qualified URL
+		Keyword argument to: Target file for saving downloaded data
+		Keyword argument toWindow: Target window for resource at URL (-1 for top window, 0 for new window)
+		Keyword argument Flags: Valid Flags settings are: 1-Ignore the document cache; 2-Ignore the image cache; 4-Operate in background mode.
+		Keyword argument FormData: data to post
+		Keyword argument MIME_Type: MIME type of data being posted
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns:   
 		"""
 		_code = 'WWW!'
-		_subcode = 'WNFO'
+		_subcode = 'OURL'
 
-		if _arguments: raise TypeError, 'No optional args expected'
+		aetools.keysubst(_arguments, self._argmap_OpenURL)
 		_arguments['----'] = _object
 
 
@@ -201,6 +172,35 @@ class Web_Browser_Suite_Events:
 		_arguments['----'] = _object
 
 
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_ShowFile = {
+		'MIME_Type' : 'MIME',
+		'Window_Identifier' : 'WIND',
+		'URL' : 'URL ',
+	}
+
+	def ShowFile(self, _object, _attributes={}, **_arguments):
+		"""ShowFile: FileSpec containing data of specified MIME type to be rendered in window specified by Window Identifier.
+		Required argument: The file
+		Keyword argument MIME_Type: MIME type
+		Keyword argument Window_Identifier: Identifier of the target window for the URL. (Can use -1 for top window)
+		Keyword argument URL: URL that allows this document to be reloaded.
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'WWW!'
+		_subcode = 'SHWF'
+
+		aetools.keysubst(_arguments, self._argmap_ShowFile)
+		_arguments['----'] = _object
+
+
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):

Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py

@@ -4,40 +4,40 @@ Resource aete resid 0
 """
 import aetools
 Error = aetools.Error
-import Required_Suite
 import Standard_Suite
-import Web_Browser_Suite
 import URL_Suite
-import Microsoft_Internet_Explorer
 import Netscape_Suite
+import Microsoft_Internet_Explorer
+import Web_Browser_Suite
+import Required_Suite
 
 
 _code_to_module = {
-	'reqd' : Required_Suite,
 	'****' : Standard_Suite,
-	'WWW!' : Web_Browser_Suite,
 	'GURL' : URL_Suite,
-	'MSIE' : Microsoft_Internet_Explorer,
 	'MOSS' : Netscape_Suite,
+	'MSIE' : Microsoft_Internet_Explorer,
+	'WWW!' : Web_Browser_Suite,
+	'reqd' : Required_Suite,
 }
 
 
 
 _code_to_fullname = {
-	'reqd' : ('Explorer.Required_Suite', 'Required_Suite'),
 	'****' : ('Explorer.Standard_Suite', 'Standard_Suite'),
-	'WWW!' : ('Explorer.Web_Browser_Suite', 'Web_Browser_Suite'),
 	'GURL' : ('Explorer.URL_Suite', 'URL_Suite'),
-	'MSIE' : ('Explorer.Microsoft_Internet_Explorer', 'Microsoft_Internet_Explorer'),
 	'MOSS' : ('Explorer.Netscape_Suite', 'Netscape_Suite'),
+	'MSIE' : ('Explorer.Microsoft_Internet_Explorer', 'Microsoft_Internet_Explorer'),
+	'WWW!' : ('Explorer.Web_Browser_Suite', 'Web_Browser_Suite'),
+	'reqd' : ('Explorer.Required_Suite', 'Required_Suite'),
 }
 
-from Required_Suite import *
 from Standard_Suite import *
-from Web_Browser_Suite import *
 from URL_Suite import *
-from Microsoft_Internet_Explorer import *
 from Netscape_Suite import *
+from Microsoft_Internet_Explorer import *
+from Web_Browser_Suite import *
+from Required_Suite import *
 
 def getbaseclasses(v):
 	if not getattr(v, '_propdict', None):
@@ -66,12 +66,12 @@ _classdeclarations = {
 }
 
 
-class Explorer(Required_Suite_Events,
+class Explorer(Standard_Suite_Events,
-		Standard_Suite_Events,
-		Web_Browser_Suite_Events,
 		URL_Suite_Events,
-		Microsoft_Internet_Explorer_Events,
 		Netscape_Suite_Events,
+		Microsoft_Internet_Explorer_Events,
+		Web_Browser_Suite_Events,
+		Required_Suite_Events,
 		aetools.TalkTo):
 	_signature = 'MSIE'
 

Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py

@@ -70,6 +70,102 @@ class view_options_window(aetools.NProperty):
 
 containers = container
 
+class desktop_2d_object(aetools.ComponentItem):
+	"""desktop-object - Desktop-object is the class of the \xd2desktop\xd3 object """
+	want = 'cdsk'
+class startup_disk(aetools.NProperty):
+	"""startup disk - the startup disk """
+	which = 'sdsk'
+	want = 'cdis'
+class trash(aetools.NProperty):
+	"""trash - the trash """
+	which = 'trsh'
+	want = 'ctrs'
+#        element 'cobj' as ['indx', 'name']
+#        element 'ctnr' as ['indx', 'name']
+#        element 'sctr' as ['indx', 'name']
+#        element 'cdis' as ['indx', 'name']
+#        element 'cfol' as ['indx', 'name', 'ID  ']
+#        element 'file' as ['indx', 'name']
+#        element 'alia' as ['indx', 'name']
+#        element 'appf' as ['indx', 'name', 'ID  ']
+#        element 'docf' as ['indx', 'name']
+#        element 'fntf' as ['indx', 'name']
+#        element 'dafi' as ['indx', 'name']
+#        element 'inlf' as ['indx', 'name']
+#        element 'sndf' as ['indx', 'name']
+#        element 'clpf' as ['indx', 'name']
+#        element 'pack' as ['indx', 'name']
+#        element 'stcs' as ['indx', 'name']
+#        element 'fsut' as ['indx', 'name']
+#        element 'dsut' as ['indx', 'name']
+
+class disk(aetools.ComponentItem):
+	"""disk - A disk """
+	want = 'cdis'
+class capacity(aetools.NProperty):
+	"""capacity - the total number of bytes (free or used) on the disk """
+	which = 'capa'
+	want = 'long'
+class free_space(aetools.NProperty):
+	"""free space - the number of free bytes left on the disk """
+	which = 'frsp'
+	want = 'long'
+class ejectable(aetools.NProperty):
+	"""ejectable - Can the media be ejected (floppies, CD's, and so on)? """
+	which = 'isej'
+	want = 'bool'
+class local_volume(aetools.NProperty):
+	"""local volume - Is the media a local volume (as opposed to a file server)? """
+	which = 'isrv'
+	want = 'bool'
+class startup(aetools.NProperty):
+	"""startup - Is this disk the boot disk? """
+	which = 'istd'
+	want = 'bool'
+#        element 'cobj' as ['indx', 'name']
+#        element 'ctnr' as ['indx', 'name']
+#        element 'sctr' as ['indx', 'name']
+#        element 'cfol' as ['indx', 'name', 'ID  ']
+#        element 'file' as ['indx', 'name']
+#        element 'alia' as ['indx', 'name']
+#        element 'appf' as ['indx', 'name', 'ID  ']
+#        element 'docf' as ['indx', 'name']
+#        element 'fntf' as ['indx', 'name']
+#        element 'dafi' as ['indx', 'name']
+#        element 'inlf' as ['indx', 'name']
+#        element 'sndf' as ['indx', 'name']
+#        element 'clpf' as ['indx', 'name']
+#        element 'pack' as ['indx', 'name']
+#        element 'stcs' as ['indx', 'name']
+#        element 'fsut' as ['indx', 'name']
+#        element 'dsut' as ['indx', 'name']
+
+disks = disk
+
+class folder(aetools.ComponentItem):
+	"""folder - A folder """
+	want = 'cfol'
+#        element 'cobj' as ['indx', 'name']
+#        element 'ctnr' as ['indx', 'name']
+#        element 'sctr' as ['indx', 'name']
+#        element 'cfol' as ['indx', 'name', 'ID  ']
+#        element 'file' as ['indx', 'name']
+#        element 'alia' as ['indx', 'name']
+#        element 'appf' as ['indx', 'name', 'ID  ']
+#        element 'docf' as ['indx', 'name']
+#        element 'fntf' as ['indx', 'name']
+#        element 'dafi' as ['indx', 'name']
+#        element 'inlf' as ['indx', 'name']
+#        element 'sndf' as ['indx', 'name']
+#        element 'clpf' as ['indx', 'name']
+#        element 'pack' as ['indx', 'name']
+#        element 'stcs' as ['indx', 'name']
+#        element 'fsut' as ['indx', 'name']
+#        element 'dsut' as ['indx', 'name']
+
+folders = folder
+
 class sharable_container(aetools.ComponentItem):
 	"""sharable container - A container that may be shared (disks and folders) """
 	want = 'sctr'
@@ -149,102 +245,6 @@ class make_changes(aetools.NProperty):
 	which = 'prvw'
 	want = 'bool'
 
-class disk(aetools.ComponentItem):
-	"""disk - A disk """
-	want = 'cdis'
-class capacity(aetools.NProperty):
-	"""capacity - the total number of bytes (free or used) on the disk """
-	which = 'capa'
-	want = 'long'
-class free_space(aetools.NProperty):
-	"""free space - the number of free bytes left on the disk """
-	which = 'frsp'
-	want = 'long'
-class ejectable(aetools.NProperty):
-	"""ejectable - Can the media be ejected (floppies, CD's, and so on)? """
-	which = 'isej'
-	want = 'bool'
-class local_volume(aetools.NProperty):
-	"""local volume - Is the media a local volume (as opposed to a file server)? """
-	which = 'isrv'
-	want = 'bool'
-class startup(aetools.NProperty):
-	"""startup - Is this disk the boot disk? """
-	which = 'istd'
-	want = 'bool'
-#        element 'cobj' as ['indx', 'name']
-#        element 'ctnr' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'cfol' as ['indx', 'name', 'ID  ']
-#        element 'file' as ['indx', 'name']
-#        element 'alia' as ['indx', 'name']
-#        element 'appf' as ['indx', 'name', 'ID  ']
-#        element 'docf' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
-#        element 'inlf' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
-#        element 'clpf' as ['indx', 'name']
-#        element 'pack' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
-#        element 'dsut' as ['indx', 'name']
-
-disks = disk
-
-class folder(aetools.ComponentItem):
-	"""folder - A folder """
-	want = 'cfol'
-#        element 'cobj' as ['indx', 'name']
-#        element 'ctnr' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'cfol' as ['indx', 'name', 'ID  ']
-#        element 'file' as ['indx', 'name']
-#        element 'alia' as ['indx', 'name']
-#        element 'appf' as ['indx', 'name', 'ID  ']
-#        element 'docf' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
-#        element 'inlf' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
-#        element 'clpf' as ['indx', 'name']
-#        element 'pack' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
-#        element 'dsut' as ['indx', 'name']
-
-folders = folder
-
-class desktop_2d_object(aetools.ComponentItem):
-	"""desktop-object - Desktop-object is the class of the \xd2desktop\xd3 object """
-	want = 'cdsk'
-class startup_disk(aetools.NProperty):
-	"""startup disk - the startup disk """
-	which = 'sdsk'
-	want = 'cdis'
-class trash(aetools.NProperty):
-	"""trash - the trash """
-	which = 'trsh'
-	want = 'ctrs'
-#        element 'cobj' as ['indx', 'name']
-#        element 'ctnr' as ['indx', 'name']
-#        element 'sctr' as ['indx', 'name']
-#        element 'cdis' as ['indx', 'name']
-#        element 'cfol' as ['indx', 'name', 'ID  ']
-#        element 'file' as ['indx', 'name']
-#        element 'alia' as ['indx', 'name']
-#        element 'appf' as ['indx', 'name', 'ID  ']
-#        element 'docf' as ['indx', 'name']
-#        element 'fntf' as ['indx', 'name']
-#        element 'dafi' as ['indx', 'name']
-#        element 'inlf' as ['indx', 'name']
-#        element 'sndf' as ['indx', 'name']
-#        element 'clpf' as ['indx', 'name']
-#        element 'pack' as ['indx', 'name']
-#        element 'stcs' as ['indx', 'name']
-#        element 'fsut' as ['indx', 'name']
-#        element 'dsut' as ['indx', 'name']
-
 class trash_2d_object(aetools.ComponentItem):
 	"""trash-object - Trash-object is the class of the \xd2trash\xd3 object """
 	want = 'ctrs'
@@ -302,6 +302,83 @@ container._privelemdict = {
 	'font_suitcase' : Files_and_suitcases.font_suitcase,
 	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
 }
+desktop_2d_object._superclassnames = ['container']
+desktop_2d_object._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'startup_disk' : startup_disk,
+	'trash' : trash,
+}
+desktop_2d_object._privelemdict = {
+	'item' : Earlier_terms.item,
+	'container' : container,
+	'sharable_container' : sharable_container,
+	'disk' : disk,
+	'folder' : folder,
+	'file' : Files_and_suitcases.file,
+	'alias_file' : Files_and_suitcases.alias_file,
+	'application_file' : Earlier_terms.application_file,
+	'document_file' : Files_and_suitcases.document_file,
+	'font_file' : Files_and_suitcases.font_file,
+	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
+	'internet_location' : Earlier_terms.internet_location,
+	'sound_file' : Files_and_suitcases.sound_file,
+	'clipping' : Files_and_suitcases.clipping,
+	'package' : Files_and_suitcases.package,
+	'suitcase' : Files_and_suitcases.suitcase,
+	'font_suitcase' : Files_and_suitcases.font_suitcase,
+	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
+}
+disk._superclassnames = ['sharable_container']
+disk._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'capacity' : capacity,
+	'free_space' : free_space,
+	'ejectable' : ejectable,
+	'local_volume' : local_volume,
+	'startup' : startup,
+}
+disk._privelemdict = {
+	'item' : Earlier_terms.item,
+	'container' : container,
+	'sharable_container' : sharable_container,
+	'folder' : folder,
+	'file' : Files_and_suitcases.file,
+	'alias_file' : Files_and_suitcases.alias_file,
+	'application_file' : Earlier_terms.application_file,
+	'document_file' : Files_and_suitcases.document_file,
+	'font_file' : Files_and_suitcases.font_file,
+	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
+	'internet_location' : Earlier_terms.internet_location,
+	'sound_file' : Files_and_suitcases.sound_file,
+	'clipping' : Files_and_suitcases.clipping,
+	'package' : Files_and_suitcases.package,
+	'suitcase' : Files_and_suitcases.suitcase,
+	'font_suitcase' : Files_and_suitcases.font_suitcase,
+	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
+}
+folder._superclassnames = ['sharable_container']
+folder._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+}
+folder._privelemdict = {
+	'item' : Earlier_terms.item,
+	'container' : container,
+	'sharable_container' : sharable_container,
+	'folder' : folder,
+	'file' : Files_and_suitcases.file,
+	'alias_file' : Files_and_suitcases.alias_file,
+	'application_file' : Earlier_terms.application_file,
+	'document_file' : Files_and_suitcases.document_file,
+	'font_file' : Files_and_suitcases.font_file,
+	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
+	'internet_location' : Earlier_terms.internet_location,
+	'sound_file' : Files_and_suitcases.sound_file,
+	'clipping' : Files_and_suitcases.clipping,
+	'package' : Files_and_suitcases.package,
+	'suitcase' : Files_and_suitcases.suitcase,
+	'font_suitcase' : Files_and_suitcases.font_suitcase,
+	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
+}
 sharable_container._superclassnames = ['container']
 sharable_container._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
@@ -343,83 +420,6 @@ sharing_privileges._privpropdict = {
 }
 sharing_privileges._privelemdict = {
 }
-disk._superclassnames = ['sharable_container']
-disk._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'capacity' : capacity,
-	'free_space' : free_space,
-	'ejectable' : ejectable,
-	'local_volume' : local_volume,
-	'startup' : startup,
-}
-disk._privelemdict = {
-	'item' : Earlier_terms.item,
-	'container' : container,
-	'sharable_container' : sharable_container,
-	'folder' : folder,
-	'file' : Files_and_suitcases.file,
-	'alias_file' : Files_and_suitcases.alias_file,
-	'application_file' : Earlier_terms.application_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'font_file' : Files_and_suitcases.font_file,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'internet_location' : Earlier_terms.internet_location,
-	'sound_file' : Files_and_suitcases.sound_file,
-	'clipping' : Files_and_suitcases.clipping,
-	'package' : Files_and_suitcases.package,
-	'suitcase' : Files_and_suitcases.suitcase,
-	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
-}
-folder._superclassnames = ['sharable_container']
-folder._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-}
-folder._privelemdict = {
-	'item' : Earlier_terms.item,
-	'container' : container,
-	'sharable_container' : sharable_container,
-	'folder' : folder,
-	'file' : Files_and_suitcases.file,
-	'alias_file' : Files_and_suitcases.alias_file,
-	'application_file' : Earlier_terms.application_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'font_file' : Files_and_suitcases.font_file,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'internet_location' : Earlier_terms.internet_location,
-	'sound_file' : Files_and_suitcases.sound_file,
-	'clipping' : Files_and_suitcases.clipping,
-	'package' : Files_and_suitcases.package,
-	'suitcase' : Files_and_suitcases.suitcase,
-	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
-}
-desktop_2d_object._superclassnames = ['container']
-desktop_2d_object._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'startup_disk' : startup_disk,
-	'trash' : trash,
-}
-desktop_2d_object._privelemdict = {
-	'item' : Earlier_terms.item,
-	'container' : container,
-	'sharable_container' : sharable_container,
-	'disk' : disk,
-	'folder' : folder,
-	'file' : Files_and_suitcases.file,
-	'alias_file' : Files_and_suitcases.alias_file,
-	'application_file' : Earlier_terms.application_file,
-	'document_file' : Files_and_suitcases.document_file,
-	'font_file' : Files_and_suitcases.font_file,
-	'desk_accessory_file' : Files_and_suitcases.desk_accessory_file,
-	'internet_location' : Earlier_terms.internet_location,
-	'sound_file' : Files_and_suitcases.sound_file,
-	'clipping' : Files_and_suitcases.clipping,
-	'package' : Files_and_suitcases.package,
-	'suitcase' : Files_and_suitcases.suitcase,
-	'font_suitcase' : Files_and_suitcases.font_suitcase,
-	'accessory_suitcase' : Earlier_terms.accessory_suitcase,
-}
 trash_2d_object._superclassnames = ['container']
 trash_2d_object._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
@@ -452,21 +452,21 @@ _classdeclarations = {
 	'ctrs' : trash_2d_object,
 	'cdsk' : desktop_2d_object,
 	'sctr' : sharable_container,
-	'priv' : sharing_privileges,
 	'cdis' : disk,
-	'cfol' : folder,
 	'ctnr' : container,
+	'cfol' : folder,
+	'priv' : sharing_privileges,
 }
 
 _propdeclarations = {
 	'pexp' : expanded,
-	'gppr' : group_privileges,
+	'iprv' : privileges_inherited,
-	'prvr' : see_files,
+	'gstp' : guest_privileges,
 	'ects' : entire_contents,
 	'lvis' : icon_size,
-	'iprv' : privileges_inherited,
+	'gppr' : group_privileges,
 	'isrv' : local_volume,
-	'frsp' : free_space,
+	'prvs' : see_folders,
 	'pexa' : expandable,
 	'pexc' : completely_expanded,
 	'vwnd' : view_options_window,
@@ -479,13 +479,13 @@ _propdeclarations = {
 	'sexp' : exported,
 	'sdsk' : startup_disk,
 	'istd' : startup,
-	'gstp' : guest_privileges,
+	'prvr' : see_files,
-	'trsh' : trash,
+	'c@#^' : _3c_Inheritance_3e_,
 	'smou' : mounted,
 	'sele' : selection,
-	'prvs' : see_folders,
+	'trsh' : trash,
 	'sgrp' : group,
-	'c@#^' : _3c_Inheritance_3e_,
+	'frsp' : free_space,
 	'spro' : protected,
 	'ownr' : owner_privileges,
 }

Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py

@@ -16,6 +16,18 @@ class Earlier_terms_Events(Type_Names_Suite_Events):
 	pass
 
 
+class accessory_process(aetools.ComponentItem):
+	"""accessory process - A process launched from a desk accessory file """
+	want = 'pcda'
+
+accessory_processes = accessory_process
+
+class accessory_suitcase(aetools.ComponentItem):
+	"""accessory suitcase - A desk accessory suitcase """
+	want = 'dsut'
+
+accessory_suitcases = accessory_suitcase
+
 class application(aetools.ComponentItem):
 	"""application - The Finder """
 	want = 'capp'
@@ -176,24 +188,6 @@ class use_relative_dates(aetools.NProperty):
 	which = 'urdt'
 	want = 'bool'
 
-class accessory_process(aetools.ComponentItem):
-	"""accessory process - A process launched from a desk accessory file """
-	want = 'pcda'
-
-accessory_processes = accessory_process
-
-class accessory_suitcase(aetools.ComponentItem):
-	"""accessory suitcase - A desk accessory suitcase """
-	want = 'dsut'
-
-accessory_suitcases = accessory_suitcase
-
-class internet_location(aetools.ComponentItem):
-	"""internet location - An file containing an internet location """
-	want = 'inlf'
-
-internet_locations = internet_location
-
 class information_window(aetools.ComponentItem):
 	"""information window - An information window (opened by \xd2Get Info\xd3) """
 	want = 'iwnd'
@@ -234,6 +228,12 @@ class warn_before_emptying(aetools.NProperty):
 	which = 'warn'
 	want = 'bool'
 
+class internet_location(aetools.ComponentItem):
+	"""internet location - An file containing an internet location """
+	want = 'inlf'
+
+internet_locations = internet_location
+
 class item(aetools.ComponentItem):
 	"""item - An item """
 	want = 'cobj'
@@ -290,6 +290,26 @@ class information_window(aetools.NProperty):
 	which = 'iwnd'
 	want = 'obj '
 
+class preferences(aetools.ComponentItem):
+	"""preferences - The Finder Preferences """
+	want = 'cprf'
+class delay_before_springing(aetools.NProperty):
+	"""delay before springing - the delay before springing open a container in ticks (1/60th of a second) (12 is shortest delay, 60 is longest delay) """
+	which = 'dela'
+	want = 'shor'
+class spring_open_folders(aetools.NProperty):
+	"""spring open folders - Spring open folders after the specified delay? """
+	which = 'sprg'
+	want = 'bool'
+class use_simple_menus(aetools.NProperty):
+	"""use simple menus - Use simplified Finder menus? """
+	which = 'usme'
+	want = 'bool'
+class use_wide_grid(aetools.NProperty):
+	"""use wide grid - Space icons on a wide grid? """
+	which = 'uswg'
+	want = 'bool'
+
 class process(aetools.ComponentItem):
 	"""process - A process running on this computer """
 	want = 'prcs'
@@ -362,26 +382,6 @@ class trash_2d_object(aetools.ComponentItem):
 	"""trash-object - Trash-object is the class of the \xd2trash\xd3 object """
 	want = 'ctrs'
 
-class preferences(aetools.ComponentItem):
-	"""preferences - The Finder Preferences """
-	want = 'cprf'
-class delay_before_springing(aetools.NProperty):
-	"""delay before springing - the delay before springing open a container in ticks (1/60th of a second) (12 is shortest delay, 60 is longest delay) """
-	which = 'dela'
-	want = 'shor'
-class spring_open_folders(aetools.NProperty):
-	"""spring open folders - Spring open folders after the specified delay? """
-	which = 'sprg'
-	want = 'bool'
-class use_simple_menus(aetools.NProperty):
-	"""use simple menus - Use simplified Finder menus? """
-	which = 'usme'
-	want = 'bool'
-class use_wide_grid(aetools.NProperty):
-	"""use wide grid - Space icons on a wide grid? """
-	which = 'uswg'
-	want = 'bool'
-
 class window(aetools.ComponentItem):
 	"""window - A window """
 	want = 'cwin'
@@ -429,6 +429,16 @@ class collapsed(aetools.NProperty):
 	"""collapsed - Is the window collapsed (only applies to open non-pop-up windows)? """
 	which = 'wshd'
 	want = 'bool'
+accessory_process._superclassnames = []
+accessory_process._privpropdict = {
+}
+accessory_process._privelemdict = {
+}
+accessory_suitcase._superclassnames = []
+accessory_suitcase._privpropdict = {
+}
+accessory_suitcase._privelemdict = {
+}
 application._superclassnames = []
 application._privpropdict = {
 	'properties' : properties,
@@ -483,21 +493,6 @@ container_window._privpropdict = {
 }
 container_window._privelemdict = {
 }
-accessory_process._superclassnames = []
-accessory_process._privpropdict = {
-}
-accessory_process._privelemdict = {
-}
-accessory_suitcase._superclassnames = []
-accessory_suitcase._privpropdict = {
-}
-accessory_suitcase._privelemdict = {
-}
-internet_location._superclassnames = []
-internet_location._privpropdict = {
-}
-internet_location._privelemdict = {
-}
 information_window._superclassnames = ['window']
 information_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
@@ -519,6 +514,11 @@ information_window._privpropdict = {
 }
 information_window._privelemdict = {
 }
+internet_location._superclassnames = []
+internet_location._privpropdict = {
+}
+internet_location._privelemdict = {
+}
 item._superclassnames = []
 item._privpropdict = {
 	'properties' : properties,
@@ -546,6 +546,25 @@ item._privpropdict = {
 }
 item._privelemdict = {
 }
+preferences._superclassnames = []
+preferences._privpropdict = {
+	'window' : window,
+	'calculate_folder_sizes' : calculate_folder_sizes,
+	'delay_before_springing' : delay_before_springing,
+	'show_comments' : show_comments,
+	'show_creation_date' : show_creation_date,
+	'show_kind' : show_kind,
+	'show_label' : show_label,
+	'show_modification_date' : show_modification_date,
+	'show_size' : show_size,
+	'show_version' : show_version,
+	'spring_open_folders' : spring_open_folders,
+	'use_relative_dates' : use_relative_dates,
+	'use_simple_menus' : use_simple_menus,
+	'use_wide_grid' : use_wide_grid,
+}
+preferences._privelemdict = {
+}
 process._superclassnames = []
 process._privpropdict = {
 	'properties' : properties,
@@ -586,25 +605,6 @@ trash_2d_object._privpropdict = {
 }
 trash_2d_object._privelemdict = {
 }
-preferences._superclassnames = []
-preferences._privpropdict = {
-	'window' : window,
-	'calculate_folder_sizes' : calculate_folder_sizes,
-	'delay_before_springing' : delay_before_springing,
-	'show_comments' : show_comments,
-	'show_creation_date' : show_creation_date,
-	'show_kind' : show_kind,
-	'show_label' : show_label,
-	'show_modification_date' : show_modification_date,
-	'show_size' : show_size,
-	'show_version' : show_version,
-	'spring_open_folders' : spring_open_folders,
-	'use_relative_dates' : use_relative_dates,
-	'use_simple_menus' : use_simple_menus,
-	'use_wide_grid' : use_wide_grid,
-}
-preferences._privelemdict = {
-}
 window._superclassnames = []
 window._privpropdict = {
 	'properties' : properties,
@@ -632,11 +632,11 @@ window._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
+	'ctrs' : trash_2d_object,
 	'dsut' : accessory_suitcase,
 	'cprf' : preferences,
-	'sctr' : sharable_container,
 	'capp' : application,
-	'ctrs' : trash_2d_object,
+	'sctr' : sharable_container,
 	'pcda' : accessory_process,
 	'cwin' : window,
 	'iwnd' : information_window,

Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py

@@ -15,22 +15,6 @@ class Enumerations_Events(Type_Names_Suite_Events):
 
 	pass
 
-_Enum_ipnl = {
-	'General_Information_panel' : 'gpnl',	# 
-	'Sharing_panel' : 'spnl',	# 
-	'Memory_panel' : 'mpnl',	# 
-	'Status_and_Configuration_panel' : 'scnl',	# 
-	'Fonts_panel' : 'fpnl',	# 
-}
-
-_Enum_pple = {
-	'General_Preferences_panel' : 'pgnp',	# 
-	'Label_Preferences_panel' : 'plbp',	# 
-	'Icon_View_Preferences_panel' : 'pivp',	# 
-	'Button_View_Preferences_panel' : 'pbvp',	# 
-	'List_View_Preferences_panel' : 'plvp',	# 
-}
-
 _Enum_earr = {
 	'not_arranged' : 'narr',	# 
 	'snap_to_grid' : 'grda',	# 
@@ -42,9 +26,32 @@ _Enum_earr = {
 	'arranged_by_label' : 'laba',	# 
 }
 
-_Enum_sodr = {
+_Enum_ese0 = {
-	'normal' : 'snrm',	# 
+	'starting_up' : 'ese2',	# 
-	'reversed' : 'srvs',	# 
+	'running' : 'ese3',	# 
+	'rebuilding_desktop' : 'ese5',	# 
+	'copying' : 'ese4',	# 
+	'restarting' : 'ese6',	# 
+	'quitting' : 'ese7',	# 
+}
+
+_Enum_gsen = {
+	'CPU' : 'proc',	# 
+	'FPU' : 'fpu ',	# 
+	'MMU' : 'mmu ',	# 
+	'hardware' : 'hdwr',	# 
+	'operating_system' : 'os  ',	# 
+	'sound_system' : 'snd ',	# 
+	'memory_available' : 'lram',	# 
+	'memory_installed' : 'ram ',	# 
+}
+
+_Enum_ipnl = {
+	'General_Information_panel' : 'gpnl',	# 
+	'Sharing_panel' : 'spnl',	# 
+	'Memory_panel' : 'mpnl',	# 
+	'Status_and_Configuration_panel' : 'scnl',	# 
+	'Fonts_panel' : 'fpnl',	# 
 }
 
 _Enum_isiz = {
@@ -53,6 +60,19 @@ _Enum_isiz = {
 	'large' : 'lgic',	# 
 }
 
+_Enum_pple = {
+	'General_Preferences_panel' : 'pgnp',	# 
+	'Label_Preferences_panel' : 'plbp',	# 
+	'Icon_View_Preferences_panel' : 'pivp',	# 
+	'Button_View_Preferences_panel' : 'pbvp',	# 
+	'List_View_Preferences_panel' : 'plvp',	# 
+}
+
+_Enum_sodr = {
+	'normal' : 'snrm',	# 
+	'reversed' : 'srvs',	# 
+}
+
 _Enum_vwby = {
 	'conflicts' : 'cflc',	# 
 	'existing_items' : 'exsi',	# 
@@ -72,26 +92,6 @@ _Enum_vwby = {
 	'all' : 'kyal',	# 
 }
 
-_Enum_gsen = {
-	'CPU' : 'proc',	# 
-	'FPU' : 'fpu ',	# 
-	'MMU' : 'mmu ',	# 
-	'hardware' : 'hdwr',	# 
-	'operating_system' : 'os  ',	# 
-	'sound_system' : 'snd ',	# 
-	'memory_available' : 'lram',	# 
-	'memory_installed' : 'ram ',	# 
-}
-
-_Enum_ese0 = {
-	'starting_up' : 'ese2',	# 
-	'running' : 'ese3',	# 
-	'rebuilding_desktop' : 'ese5',	# 
-	'copying' : 'ese4',	# 
-	'restarting' : 'ese6',	# 
-	'quitting' : 'ese7',	# 
-}
-
 
 #
 # Indices of types declared in this module
@@ -106,12 +106,12 @@ _compdeclarations = {
 }
 
 _enumdeclarations = {
-	'sodr' : _Enum_sodr,
 	'ipnl' : _Enum_ipnl,
+	'sodr' : _Enum_sodr,
+	'pple' : _Enum_pple,
 	'ese0' : _Enum_ese0,
 	'vwby' : _Enum_vwby,
-	'gsen' : _Enum_gsen,
 	'isiz' : _Enum_isiz,
 	'earr' : _Enum_earr,
-	'pple' : _Enum_pple,
+	'gsen' : _Enum_gsen,
 }

Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py

@@ -15,43 +15,13 @@ class Files_and_suitcases_Events:
 	pass
 
 
-class file(aetools.ComponentItem):
-	"""file - A file """
-	want = 'file'
-class _3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - inherits some of its properties from the item class """
-	which = 'c@#^'
-	want = 'cobj'
-class file_type(aetools.NProperty):
-	"""file type - the OSType identifying the type of data contained in the item """
-	which = 'asty'
-	want = 'type'
-class creator_type(aetools.NProperty):
-	"""creator type - the OSType identifying the application that created the item """
-	which = 'fcrt'
-	want = 'type'
-class locked(aetools.NProperty):
-	"""locked - Is the file locked? """
-	which = 'aslk'
-	want = 'bool'
-class stationery(aetools.NProperty):
-	"""stationery - Is the file a stationery pad? """
-	which = 'pspd'
-	want = 'bool'
-class product_version(aetools.NProperty):
-	"""product version - the version of the product (visible at the top of the \xd2Get Info\xd3 window) """
-	which = 'ver2'
-	want = 'itxt'
-class version(aetools.NProperty):
-	"""version - the version of the file (visible at the bottom of the \xd2Get Info\xd3 window) """
-	which = 'vers'
-	want = 'itxt'
-
-files = file
-
 class alias_file(aetools.ComponentItem):
 	"""alias file - An alias file (created with \xd2Make Alias\xd3) """
 	want = 'alia'
+class _3c_Inheritance_3e_(aetools.NProperty):
+	"""<Inheritance> - inherits some of its properties from the file class """
+	which = 'c@#^'
+	want = 'file'
 class original_item(aetools.NProperty):
 	"""original item - the original item pointed to by the alias """
 	which = 'orig'
@@ -85,23 +55,73 @@ class has_scripting_terminology(aetools.NProperty):
 
 application_files = application_file
 
+class clipping(aetools.ComponentItem):
+	"""clipping - A clipping """
+	want = 'clpf'
+
+clippings = clipping
+
+class desk_accessory_file(aetools.ComponentItem):
+	"""desk accessory file - A desk accessory file """
+	want = 'dafi'
+
+desk_accessory_files = desk_accessory_file
+
+class desk_accessory_suitcase(aetools.ComponentItem):
+	"""desk accessory suitcase - A desk accessory suitcase """
+	want = 'dsut'
+#        element 'cobj' as ['indx', 'name']
+
+desk_accessory_suitcases = desk_accessory_suitcase
+
 class document_file(aetools.ComponentItem):
 	"""document file - A document file """
 	want = 'docf'
 
 document_files = document_file
 
+class file(aetools.ComponentItem):
+	"""file - A file """
+	want = 'file'
+class file_type(aetools.NProperty):
+	"""file type - the OSType identifying the type of data contained in the item """
+	which = 'asty'
+	want = 'type'
+class creator_type(aetools.NProperty):
+	"""creator type - the OSType identifying the application that created the item """
+	which = 'fcrt'
+	want = 'type'
+class locked(aetools.NProperty):
+	"""locked - Is the file locked? """
+	which = 'aslk'
+	want = 'bool'
+class stationery(aetools.NProperty):
+	"""stationery - Is the file a stationery pad? """
+	which = 'pspd'
+	want = 'bool'
+class product_version(aetools.NProperty):
+	"""product version - the version of the product (visible at the top of the \xd2Get Info\xd3 window) """
+	which = 'ver2'
+	want = 'itxt'
+class version(aetools.NProperty):
+	"""version - the version of the file (visible at the bottom of the \xd2Get Info\xd3 window) """
+	which = 'vers'
+	want = 'itxt'
+
+files = file
+
 class font_file(aetools.ComponentItem):
 	"""font file - A font file """
 	want = 'fntf'
 
 font_files = font_file
 
-class desk_accessory_file(aetools.ComponentItem):
+class font_suitcase(aetools.ComponentItem):
-	"""desk accessory file - A desk accessory file """
+	"""font suitcase - A font suitcase """
-	want = 'dafi'
+	want = 'fsut'
+#        element 'cobj' as ['indx', 'name']
 
-desk_accessory_files = desk_accessory_file
+font_suitcases = font_suitcase
 
 class internet_location_file(aetools.ComponentItem):
 	"""internet location file - An file containing an internet location """
@@ -113,6 +133,12 @@ class location(aetools.NProperty):
 
 internet_location_files = internet_location_file
 
+class package(aetools.ComponentItem):
+	"""package - A package """
+	want = 'pack'
+
+packages = package
+
 class sound_file(aetools.ComponentItem):
 	"""sound file - A sound file """
 	want = 'sndf'
@@ -123,51 +149,12 @@ class sound(aetools.NProperty):
 
 sound_files = sound_file
 
-class clipping(aetools.ComponentItem):
-	"""clipping - A clipping """
-	want = 'clpf'
-
-clippings = clipping
-
-class package(aetools.ComponentItem):
-	"""package - A package """
-	want = 'pack'
-
-packages = package
-
 class suitcase(aetools.ComponentItem):
 	"""suitcase - A font or desk accessory suitcase """
 	want = 'stcs'
 #        element 'cobj' as ['indx', 'name']
 
 suitcases = suitcase
-
-class font_suitcase(aetools.ComponentItem):
-	"""font suitcase - A font suitcase """
-	want = 'fsut'
-#        element 'cobj' as ['indx', 'name']
-
-font_suitcases = font_suitcase
-
-class desk_accessory_suitcase(aetools.ComponentItem):
-	"""desk accessory suitcase - A desk accessory suitcase """
-	want = 'dsut'
-#        element 'cobj' as ['indx', 'name']
-
-desk_accessory_suitcases = desk_accessory_suitcase
-import Earlier_terms
-file._superclassnames = ['item']
-file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'file_type' : file_type,
-	'creator_type' : creator_type,
-	'locked' : locked,
-	'stationery' : stationery,
-	'product_version' : product_version,
-	'version' : version,
-}
-file._privelemdict = {
-}
 alias_file._superclassnames = ['file']
 alias_file._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
@@ -186,17 +173,11 @@ application_file._privpropdict = {
 }
 application_file._privelemdict = {
 }
-document_file._superclassnames = ['file']
+clipping._superclassnames = ['file']
-document_file._privpropdict = {
+clipping._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-document_file._privelemdict = {
+clipping._privelemdict = {
-}
-font_file._superclassnames = ['file']
-font_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-}
-font_file._privelemdict = {
 }
 desk_accessory_file._superclassnames = ['file']
 desk_accessory_file._privpropdict = {
@@ -204,39 +185,38 @@ desk_accessory_file._privpropdict = {
 }
 desk_accessory_file._privelemdict = {
 }
-internet_location_file._superclassnames = ['file']
+desk_accessory_suitcase._superclassnames = ['suitcase']
-internet_location_file._privpropdict = {
+import Earlier_terms
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+desk_accessory_suitcase._privpropdict = {
-	'location' : location,
-}
-internet_location_file._privelemdict = {
-}
-sound_file._superclassnames = ['file']
-sound_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'sound' : sound,
-}
-sound_file._privelemdict = {
-}
-clipping._superclassnames = ['file']
-clipping._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-clipping._privelemdict = {
+desk_accessory_suitcase._privelemdict = {
-}
-package._superclassnames = ['item']
-package._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-}
-package._privelemdict = {
-}
-suitcase._superclassnames = ['file']
-suitcase._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-}
-suitcase._privelemdict = {
 	'item' : Earlier_terms.item,
 }
+document_file._superclassnames = ['file']
+document_file._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+}
+document_file._privelemdict = {
+}
+file._superclassnames = ['item']
+file._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'file_type' : file_type,
+	'creator_type' : creator_type,
+	'locked' : locked,
+	'stationery' : stationery,
+	'product_version' : product_version,
+	'version' : version,
+}
+file._privelemdict = {
+}
+font_file._superclassnames = ['file']
+font_file._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+}
+font_file._privelemdict = {
+}
 font_suitcase._superclassnames = ['suitcase']
 font_suitcase._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
@@ -244,11 +224,31 @@ font_suitcase._privpropdict = {
 font_suitcase._privelemdict = {
 	'item' : Earlier_terms.item,
 }
-desk_accessory_suitcase._superclassnames = ['suitcase']
+internet_location_file._superclassnames = ['file']
-desk_accessory_suitcase._privpropdict = {
+internet_location_file._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'location' : location,
+}
+internet_location_file._privelemdict = {
+}
+package._superclassnames = ['item']
+package._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 }
-desk_accessory_suitcase._privelemdict = {
+package._privelemdict = {
+}
+sound_file._superclassnames = ['file']
+sound_file._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'sound' : sound,
+}
+sound_file._privelemdict = {
+}
+suitcase._superclassnames = ['file']
+suitcase._privpropdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+}
+suitcase._privelemdict = {
 	'item' : Earlier_terms.item,
 }
 
@@ -258,24 +258,25 @@ desk_accessory_suitcase._privelemdict = {
 _classdeclarations = {
 	'sndf' : sound_file,
 	'fntf' : font_file,
-	'inlf' : internet_location_file,
+	'stcs' : suitcase,
 	'clpf' : clipping,
+	'dsut' : desk_accessory_suitcase,
 	'alia' : alias_file,
 	'dafi' : desk_accessory_file,
-	'dsut' : desk_accessory_suitcase,
 	'fsut' : font_suitcase,
 	'file' : file,
 	'appf' : application_file,
-	'stcs' : suitcase,
+	'inlf' : internet_location_file,
 	'docf' : document_file,
 	'pack' : package,
 }
 
 _propdeclarations = {
-	'vers' : version,
 	'ver2' : product_version,
-	'snd ' : sound,
+	'vers' : version,
 	'appt' : preferred_size,
+	'snd ' : sound,
+	'pspd' : stationery,
 	'sprt' : suggested_size,
 	'isab' : accepts_high_level_events,
 	'hscr' : has_scripting_terminology,
@@ -283,7 +284,6 @@ _propdeclarations = {
 	'c@#^' : _3c_Inheritance_3e_,
 	'fcrt' : creator_type,
 	'mprt' : minimum_size,
-	'pspd' : stationery,
 	'iloc' : location,
 	'aslk' : locked,
 	'orig' : original_item,

Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py

@@ -15,6 +15,30 @@ class Process_classes_Events:
 	pass
 
 
+class application_process(aetools.ComponentItem):
+	"""application process - A process launched from an application file """
+	want = 'pcap'
+class _3c_Inheritance_3e_(aetools.NProperty):
+	"""<Inheritance> - inherits some of its properties from the process class """
+	which = 'c@#^'
+	want = 'prcs'
+class application_file(aetools.NProperty):
+	"""application file - the application file from which this process was launched """
+	which = 'appf'
+	want = 'appf'
+
+application_processes = application_process
+
+class desk_accessory_process(aetools.ComponentItem):
+	"""desk accessory process - A process launched from a desk accessory file """
+	want = 'pcda'
+class desk_accessory_file(aetools.NProperty):
+	"""desk accessory file - the desk accessory file from which this process was launched """
+	which = 'dafi'
+	want = 'obj '
+
+desk_accessory_processes = desk_accessory_process
+
 class process(aetools.ComponentItem):
 	"""process - A process running on this computer """
 	want = 'prcs'
@@ -64,30 +88,20 @@ class partition_space_used(aetools.NProperty):
 	want = 'long'
 
 processes = process
-
+application_process._superclassnames = ['process']
-class application_process(aetools.ComponentItem):
+application_process._privpropdict = {
-	"""application process - A process launched from an application file """
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	want = 'pcap'
+	'application_file' : application_file,
-class _3c_Inheritance_3e_(aetools.NProperty):
+}
-	"""<Inheritance> - inherits some of its properties from the process class """
+application_process._privelemdict = {
-	which = 'c@#^'
+}
-	want = 'prcs'
+desk_accessory_process._superclassnames = ['process']
-class application_file(aetools.NProperty):
+desk_accessory_process._privpropdict = {
-	"""application file - the application file from which this process was launched """
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	which = 'appf'
+	'desk_accessory_file' : desk_accessory_file,
-	want = 'appf'
+}
-
+desk_accessory_process._privelemdict = {
-application_processes = application_process
+}
-
-class desk_accessory_process(aetools.ComponentItem):
-	"""desk accessory process - A process launched from a desk accessory file """
-	want = 'pcda'
-class desk_accessory_file(aetools.NProperty):
-	"""desk accessory file - the desk accessory file from which this process was launched """
-	which = 'dafi'
-	want = 'obj '
-
-desk_accessory_processes = desk_accessory_process
 process._superclassnames = []
 process._privpropdict = {
 	'name' : name,
@@ -104,20 +118,6 @@ process._privpropdict = {
 }
 process._privelemdict = {
 }
-application_process._superclassnames = ['process']
-application_process._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'application_file' : application_file,
-}
-application_process._privelemdict = {
-}
-desk_accessory_process._superclassnames = ['process']
-desk_accessory_process._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'desk_accessory_file' : desk_accessory_file,
-}
-desk_accessory_process._privelemdict = {
-}
 
 #
 # Indices of types declared in this module

Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py

@@ -13,77 +13,6 @@ _code = 'CoRe'
 from StdSuites.Standard_Suite import *
 class Standard_Suite_Events(Standard_Suite_Events):
 
-	_argmap_open = {
-		'using' : 'usin',
-		'with_properties' : 'prdt',
-	}
-
-	def open(self, _object, _attributes={}, **_arguments):
-		"""open: Open the specified object(s)
-		Required argument: list of objects to open
-		Keyword argument using: the application file to open the object with
-		Keyword argument with_properties: the initial values for the properties, to be included with the open command sent to the application that opens the direct object
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'odoc'
-
-		aetools.keysubst(_arguments, self._argmap_open)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_print_ = {
-		'with_properties' : 'prdt',
-	}
-
-	def print_(self, _object, _attributes={}, **_arguments):
-		"""print: Print the specified object(s)
-		Required argument: list of objects to print
-		Keyword argument with_properties: optional properties to be included with the print command sent to the application that prints the direct object
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'pdoc'
-
-		aetools.keysubst(_arguments, self._argmap_print_)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def quit(self, _no_object=None, _attributes={}, **_arguments):
-		"""quit: Quit the Finder
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'quit'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
 	def close(self, _object, _attributes={}, **_arguments):
 		"""close: Close an object
 		Required argument: the object to close
@@ -288,6 +217,77 @@ class Standard_Suite_Events(Standard_Suite_Events):
 		aetools.enumsubst(_arguments, 'mvpl', _Enum_list)
 		aetools.enumsubst(_arguments, 'rout', _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
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_open = {
+		'using' : 'usin',
+		'with_properties' : 'prdt',
+	}
+
+	def open(self, _object, _attributes={}, **_arguments):
+		"""open: Open the specified object(s)
+		Required argument: list of objects to open
+		Keyword argument using: the application file to open the object with
+		Keyword argument with_properties: the initial values for the properties, to be included with the open command sent to the application that opens the direct object
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'odoc'
+
+		aetools.keysubst(_arguments, self._argmap_open)
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_print_ = {
+		'with_properties' : 'prdt',
+	}
+
+	def print_(self, _object, _attributes={}, **_arguments):
+		"""print: Print the specified object(s)
+		Required argument: list of objects to print
+		Keyword argument with_properties: optional properties to be included with the print command sent to the application that prints the direct object
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'pdoc'
+
+		aetools.keysubst(_arguments, self._argmap_print_)
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def quit(self, _no_object=None, _attributes={}, **_arguments):
+		"""quit: Quit the Finder
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'quit'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):

Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py

@@ -15,6 +15,68 @@ class Type_Definitions_Events:
 	pass
 
 
+class alias_list(aetools.ComponentItem):
+	"""alias list - A list of aliases.  Use \xd4as alias list\xd5 when a list of aliases is needed (instead of a list of file system item references). """
+	want = 'alst'
+
+class icon_family(aetools.ComponentItem):
+	"""icon family - A family of icons """
+	want = 'ifam'
+class large_monochrome_icon_and_mask(aetools.NProperty):
+	"""large monochrome icon and mask - the large black-and-white icon and the mask for large icons """
+	which = 'ICN#'
+	want = 'ICN#'
+class large_8_bit_mask(aetools.NProperty):
+	"""large 8 bit mask - the large 8-bit mask for large 32-bit icons """
+	which = 'l8mk'
+	want = 'l8mk'
+class large_32_bit_icon(aetools.NProperty):
+	"""large 32 bit icon - the large 32-bit color icon """
+	which = 'il32'
+	want = 'il32'
+class large_8_bit_icon(aetools.NProperty):
+	"""large 8 bit icon - the large 8-bit color icon """
+	which = 'icl8'
+	want = 'icl8'
+class large_4_bit_icon(aetools.NProperty):
+	"""large 4 bit icon - the large 4-bit color icon """
+	which = 'icl4'
+	want = 'icl4'
+class small_monochrome_icon_and_mask(aetools.NProperty):
+	"""small monochrome icon and mask - the small black-and-white icon and the mask for small icons """
+	which = 'ics#'
+	want = 'ics#'
+class small_8_bit_mask(aetools.NProperty):
+	"""small 8 bit mask - the small 8-bit mask for small 32-bit icons """
+	which = 'ics8'
+	want = 's8mk'
+class small_32_bit_icon(aetools.NProperty):
+	"""small 32 bit icon - the small 32-bit color icon """
+	which = 'is32'
+	want = 'is32'
+
+small_8_bit_icon = small_8_bit_mask
+class small_4_bit_icon(aetools.NProperty):
+	"""small 4 bit icon - the small 4-bit color icon """
+	which = 'ics4'
+	want = 'ics4'
+
+class label(aetools.ComponentItem):
+	"""label - A Finder label (name and color) """
+	want = 'clbl'
+class name(aetools.NProperty):
+	"""name - the name associated with the label """
+	which = 'pnam'
+	want = 'itxt'
+class index(aetools.NProperty):
+	"""index - the index in the front-to-back ordering within its container """
+	which = 'pidx'
+	want = 'long'
+class color(aetools.NProperty):
+	"""color - the color associated with the label """
+	which = 'colr'
+	want = 'cRGB'
+
 class preferences(aetools.ComponentItem):
 	"""preferences - The Finder Preferences """
 	want = 'cprf'
@@ -103,68 +165,34 @@ class view_font_size(aetools.NProperty):
 	which = 'vfsz'
 	want = 'long'
 #        element 'clbl' as ['indx', 'name']
-
+alias_list._superclassnames = []
-class label(aetools.ComponentItem):
+alias_list._privpropdict = {
-	"""label - A Finder label (name and color) """
+}
-	want = 'clbl'
+alias_list._privelemdict = {
-class name(aetools.NProperty):
+}
-	"""name - the name associated with the label """
+icon_family._superclassnames = []
-	which = 'pnam'
+icon_family._privpropdict = {
-	want = 'itxt'
+	'large_monochrome_icon_and_mask' : large_monochrome_icon_and_mask,
-class index(aetools.NProperty):
+	'large_8_bit_mask' : large_8_bit_mask,
-	"""index - the index in the front-to-back ordering within its container """
+	'large_32_bit_icon' : large_32_bit_icon,
-	which = 'pidx'
+	'large_8_bit_icon' : large_8_bit_icon,
-	want = 'long'
+	'large_4_bit_icon' : large_4_bit_icon,
-class color(aetools.NProperty):
+	'small_monochrome_icon_and_mask' : small_monochrome_icon_and_mask,
-	"""color - the color associated with the label """
+	'small_8_bit_mask' : small_8_bit_mask,
-	which = 'colr'
+	'small_32_bit_icon' : small_32_bit_icon,
-	want = 'cRGB'
+	'small_8_bit_icon' : small_8_bit_icon,
-
+	'small_4_bit_icon' : small_4_bit_icon,
-class icon_family(aetools.ComponentItem):
+}
-	"""icon family - A family of icons """
+icon_family._privelemdict = {
-	want = 'ifam'
+}
-class large_monochrome_icon_and_mask(aetools.NProperty):
+label._superclassnames = []
-	"""large monochrome icon and mask - the large black-and-white icon and the mask for large icons """
+label._privpropdict = {
-	which = 'ICN#'
+	'name' : name,
-	want = 'ICN#'
+	'index' : index,
-class large_8_bit_mask(aetools.NProperty):
+	'color' : color,
-	"""large 8 bit mask - the large 8-bit mask for large 32-bit icons """
+}
-	which = 'l8mk'
+label._privelemdict = {
-	want = 'l8mk'
+}
-class large_32_bit_icon(aetools.NProperty):
-	"""large 32 bit icon - the large 32-bit color icon """
-	which = 'il32'
-	want = 'il32'
-class large_8_bit_icon(aetools.NProperty):
-	"""large 8 bit icon - the large 8-bit color icon """
-	which = 'icl8'
-	want = 'icl8'
-class large_4_bit_icon(aetools.NProperty):
-	"""large 4 bit icon - the large 4-bit color icon """
-	which = 'icl4'
-	want = 'icl4'
-class small_monochrome_icon_and_mask(aetools.NProperty):
-	"""small monochrome icon and mask - the small black-and-white icon and the mask for small icons """
-	which = 'ics#'
-	want = 'ics#'
-class small_8_bit_mask(aetools.NProperty):
-	"""small 8 bit mask - the small 8-bit mask for small 32-bit icons """
-	which = 'ics8'
-	want = 's8mk'
-class small_32_bit_icon(aetools.NProperty):
-	"""small 32 bit icon - the small 32-bit color icon """
-	which = 'is32'
-	want = 'is32'
-
-small_8_bit_icon = small_8_bit_mask
-class small_4_bit_icon(aetools.NProperty):
-	"""small 4 bit icon - the small 4-bit color icon """
-	which = 'ics4'
-	want = 'ics4'
-
-class alias_list(aetools.ComponentItem):
-	"""alias list - A list of aliases.  Use \xd4as alias list\xd5 when a list of aliases is needed (instead of a list of file system item references). """
-	want = 'alst'
 preferences._superclassnames = []
 preferences._privpropdict = {
 	'window' : window,
@@ -192,34 +220,6 @@ preferences._privpropdict = {
 preferences._privelemdict = {
 	'label' : label,
 }
-label._superclassnames = []
-label._privpropdict = {
-	'name' : name,
-	'index' : index,
-	'color' : color,
-}
-label._privelemdict = {
-}
-icon_family._superclassnames = []
-icon_family._privpropdict = {
-	'large_monochrome_icon_and_mask' : large_monochrome_icon_and_mask,
-	'large_8_bit_mask' : large_8_bit_mask,
-	'large_32_bit_icon' : large_32_bit_icon,
-	'large_8_bit_icon' : large_8_bit_icon,
-	'large_4_bit_icon' : large_4_bit_icon,
-	'small_monochrome_icon_and_mask' : small_monochrome_icon_and_mask,
-	'small_8_bit_mask' : small_8_bit_mask,
-	'small_32_bit_icon' : small_32_bit_icon,
-	'small_8_bit_icon' : small_8_bit_icon,
-	'small_4_bit_icon' : small_4_bit_icon,
-}
-icon_family._privelemdict = {
-}
-alias_list._superclassnames = []
-alias_list._privpropdict = {
-}
-alias_list._privelemdict = {
-}
 
 #
 # Indices of types declared in this module
@@ -236,25 +236,25 @@ _propdeclarations = {
 	'ics4' : small_4_bit_icon,
 	'iarr' : spatial_view_arrangement,
 	'barr' : button_view_arrangement,
-	'ics#' : small_monochrome_icon_and_mask,
+	'vfnt' : view_font,
 	'sknd' : shows_kind,
 	'svrs' : shows_version,
 	'colr' : color,
 	'ics8' : small_8_bit_mask,
 	'icl8' : large_8_bit_icon,
-	'sprg' : spring_open_folders,
+	'pidx' : index,
 	'vfsz' : view_font_size,
 	'sfsz' : calculates_folder_sizes,
-	'l8mk' : large_8_bit_mask,
+	'ics#' : small_monochrome_icon_and_mask,
-	'vfnt' : view_font,
 	'urdt' : uses_relative_dates,
+	'bisz' : button_view_icon_size,
 	'usme' : uses_simple_menus,
+	'sprg' : spring_open_folders,
 	'icl4' : large_4_bit_icon,
 	'slbl' : shows_label,
 	'lisz' : list_view_icon_size,
-	'scda' : shows_creation_date,
+	'ssiz' : shows_size,
-	'bisz' : button_view_icon_size,
+	'l8mk' : large_8_bit_mask,
-	'pidx' : index,
 	'scom' : shows_comments,
 	'iisz' : spatial_view_icon_size,
 	'sdat' : shows_modification_date,
@@ -264,7 +264,7 @@ _propdeclarations = {
 	'pnam' : name,
 	'il32' : large_32_bit_icon,
 	'uswg' : uses_wide_grid,
-	'ssiz' : shows_size,
+	'scda' : shows_creation_date,
 }
 
 _compdeclarations = {

Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py

@@ -15,83 +15,19 @@ class Window_classes_Events:
 	pass
 
 
-class window(aetools.ComponentItem):
+class clipping_window(aetools.ComponentItem):
-	"""window - A window """
+	"""clipping window - The window containing a clipping """
-	want = 'cwin'
+	want = 'lwnd'
-class position(aetools.NProperty):
-	"""position - the upper left position of the window """
-	which = 'posn'
-	want = 'QDpt'
-class bounds(aetools.NProperty):
-	"""bounds - the boundary rectangle for the window """
-	which = 'pbnd'
-	want = 'qdrt'
-class titled(aetools.NProperty):
-	"""titled - Does the window have a title bar? """
-	which = 'ptit'
-	want = 'bool'
-class name(aetools.NProperty):
-	"""name - the name of the window """
-	which = 'pnam'
-	want = 'itxt'
-class index(aetools.NProperty):
-	"""index - the number of the window in the front-to-back layer ordering """
-	which = 'pidx'
-	want = 'long'
-class closeable(aetools.NProperty):
-	"""closeable - Does the window have a close box? """
-	which = 'hclb'
-	want = 'bool'
-class floating(aetools.NProperty):
-	"""floating - Does the window have a title bar? """
-	which = 'isfl'
-	want = 'bool'
-class modal(aetools.NProperty):
-	"""modal - Is the window modal? """
-	which = 'pmod'
-	want = 'bool'
-class resizable(aetools.NProperty):
-	"""resizable - Is the window resizable? """
-	which = 'prsz'
-	want = 'bool'
-class zoomable(aetools.NProperty):
-	"""zoomable - Is the window zoomable? """
-	which = 'iszm'
-	want = 'bool'
-class zoomed(aetools.NProperty):
-	"""zoomed - Is the window zoomed? """
-	which = 'pzum'
-	want = 'bool'
-class zoomed_full_size(aetools.NProperty):
-	"""zoomed full size - Is the window zoomed to the full size of the screen? (can only be set, not read, and only applies to open non-pop-up windows) """
-	which = 'zumf'
-	want = 'bool'
-class visible(aetools.NProperty):
-	"""visible - Is the window visible (always true for open Finder windows)? """
-	which = 'pvis'
-	want = 'bool'
-class popup(aetools.NProperty):
-	"""popup - Is the window is a pop-up window? (only applies to open container windows in the Finder and can only be set when the Finder is the front application) """
-	which = 'drwr'
-	want = 'bool'
-class pulled_open(aetools.NProperty):
-	"""pulled open - Is the window pulled open (only applies to pop-up windows and can only be set when the Finder is the front application)? """
-	which = 'pull'
-	want = 'bool'
-class collapsed(aetools.NProperty):
-	"""collapsed - Is the window collapsed (only applies to open non-pop-up windows)? """
-	which = 'wshd'
-	want = 'bool'
-
-windows = window
-
-class container_window(aetools.ComponentItem):
-	"""container window - A window that contains items """
-	want = 'cwnd'
 class _3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - inherits some of its properties from the window class """
 	which = 'c@#^'
 	want = 'cwin'
+
+clipping_windows = clipping_window
+
+class container_window(aetools.ComponentItem):
+	"""container window - A window that contains items """
+	want = 'cwnd'
 class container(aetools.NProperty):
 	"""container - the container from which the window was opened """
 	which = 'ctnr'
@@ -163,6 +99,12 @@ class uses_relative_dates(aetools.NProperty):
 
 container_windows = container_window
 
+class content_space(aetools.ComponentItem):
+	"""content space - All windows, including the desktop window (\xd2Window\xd3 does not include the desktop window) """
+	want = 'dwnd'
+
+content_spaces = content_space
+
 class information_window(aetools.ComponentItem):
 	"""information window - An information window (opened by \xd2Get Info\xd3) """
 	want = 'iwnd'
@@ -229,47 +171,90 @@ class version(aetools.NProperty):
 
 information_windows = information_window
 
+class preferences_window(aetools.ComponentItem):
+	"""preferences window - The Finder Preferences window """
+	want = 'pwnd'
+
 class view_options_window(aetools.ComponentItem):
 	"""view options window - A View Options window """
 	want = 'vwnd'
 
 view_options_windows = view_options_window
 
-class preferences_window(aetools.ComponentItem):
+class window(aetools.ComponentItem):
-	"""preferences window - The Finder Preferences window """
+	"""window - A window """
-	want = 'pwnd'
+	want = 'cwin'
+class position(aetools.NProperty):
+	"""position - the upper left position of the window """
+	which = 'posn'
+	want = 'QDpt'
+class bounds(aetools.NProperty):
+	"""bounds - the boundary rectangle for the window """
+	which = 'pbnd'
+	want = 'qdrt'
+class titled(aetools.NProperty):
+	"""titled - Does the window have a title bar? """
+	which = 'ptit'
+	want = 'bool'
+class name(aetools.NProperty):
+	"""name - the name of the window """
+	which = 'pnam'
+	want = 'itxt'
+class index(aetools.NProperty):
+	"""index - the number of the window in the front-to-back layer ordering """
+	which = 'pidx'
+	want = 'long'
+class closeable(aetools.NProperty):
+	"""closeable - Does the window have a close box? """
+	which = 'hclb'
+	want = 'bool'
+class floating(aetools.NProperty):
+	"""floating - Does the window have a title bar? """
+	which = 'isfl'
+	want = 'bool'
+class modal(aetools.NProperty):
+	"""modal - Is the window modal? """
+	which = 'pmod'
+	want = 'bool'
+class resizable(aetools.NProperty):
+	"""resizable - Is the window resizable? """
+	which = 'prsz'
+	want = 'bool'
+class zoomable(aetools.NProperty):
+	"""zoomable - Is the window zoomable? """
+	which = 'iszm'
+	want = 'bool'
+class zoomed(aetools.NProperty):
+	"""zoomed - Is the window zoomed? """
+	which = 'pzum'
+	want = 'bool'
+class zoomed_full_size(aetools.NProperty):
+	"""zoomed full size - Is the window zoomed to the full size of the screen? (can only be set, not read, and only applies to open non-pop-up windows) """
+	which = 'zumf'
+	want = 'bool'
+class visible(aetools.NProperty):
+	"""visible - Is the window visible (always true for open Finder windows)? """
+	which = 'pvis'
+	want = 'bool'
+class popup(aetools.NProperty):
+	"""popup - Is the window is a pop-up window? (only applies to open container windows in the Finder and can only be set when the Finder is the front application) """
+	which = 'drwr'
+	want = 'bool'
+class pulled_open(aetools.NProperty):
+	"""pulled open - Is the window pulled open (only applies to pop-up windows and can only be set when the Finder is the front application)? """
+	which = 'pull'
+	want = 'bool'
+class collapsed(aetools.NProperty):
+	"""collapsed - Is the window collapsed (only applies to open non-pop-up windows)? """
+	which = 'wshd'
+	want = 'bool'
 
-class clipping_window(aetools.ComponentItem):
+windows = window
-	"""clipping window - The window containing a clipping """
+clipping_window._superclassnames = ['window']
-	want = 'lwnd'
+clipping_window._privpropdict = {
-
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-clipping_windows = clipping_window
-
-class content_space(aetools.ComponentItem):
-	"""content space - All windows, including the desktop window (\xd2Window\xd3 does not include the desktop window) """
-	want = 'dwnd'
-
-content_spaces = content_space
-window._superclassnames = []
-window._privpropdict = {
-	'position' : position,
-	'bounds' : bounds,
-	'titled' : titled,
-	'name' : name,
-	'index' : index,
-	'closeable' : closeable,
-	'floating' : floating,
-	'modal' : modal,
-	'resizable' : resizable,
-	'zoomable' : zoomable,
-	'zoomed' : zoomed,
-	'zoomed_full_size' : zoomed_full_size,
-	'visible' : visible,
-	'popup' : popup,
-	'pulled_open' : pulled_open,
-	'collapsed' : collapsed,
 }
-window._privelemdict = {
+clipping_window._privelemdict = {
 }
 container_window._superclassnames = ['window']
 container_window._privpropdict = {
@@ -294,6 +279,11 @@ container_window._privpropdict = {
 }
 container_window._privelemdict = {
 }
+content_space._superclassnames = []
+content_space._privpropdict = {
+}
+content_space._privelemdict = {
+}
 information_window._superclassnames = ['window']
 information_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
@@ -316,13 +306,6 @@ information_window._privpropdict = {
 }
 information_window._privelemdict = {
 }
-view_options_window._superclassnames = ['window']
-view_options_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'item' : item,
-}
-view_options_window._privelemdict = {
-}
 preferences_window._superclassnames = ['window']
 preferences_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
@@ -330,16 +313,33 @@ preferences_window._privpropdict = {
 }
 preferences_window._privelemdict = {
 }
-clipping_window._superclassnames = ['window']
+view_options_window._superclassnames = ['window']
-clipping_window._privpropdict = {
+view_options_window._privpropdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'item' : item,
 }
-clipping_window._privelemdict = {
+view_options_window._privelemdict = {
 }
-content_space._superclassnames = []
+window._superclassnames = []
-content_space._privpropdict = {
+window._privpropdict = {
+	'position' : position,
+	'bounds' : bounds,
+	'titled' : titled,
+	'name' : name,
+	'index' : index,
+	'closeable' : closeable,
+	'floating' : floating,
+	'modal' : modal,
+	'resizable' : resizable,
+	'zoomable' : zoomable,
+	'zoomed' : zoomed,
+	'zoomed_full_size' : zoomed_full_size,
+	'visible' : visible,
+	'popup' : popup,
+	'pulled_open' : pulled_open,
+	'collapsed' : collapsed,
 }
-content_space._privelemdict = {
+window._privelemdict = {
 }
 
 #
@@ -347,33 +347,33 @@ content_space._privelemdict = {
 #
 _classdeclarations = {
 	'pwnd' : preferences_window,
-	'vwnd' : view_options_window,
 	'cwin' : window,
+	'vwnd' : view_options_window,
+	'lwnd' : clipping_window,
 	'cwnd' : container_window,
 	'dwnd' : content_space,
 	'iwnd' : information_window,
-	'lwnd' : clipping_window,
 }
 
 _propdeclarations = {
 	'prsz' : resizable,
 	'barr' : button_view_arrangement,
-	'pzum' : zoomed,
+	'pbnd' : bounds,
+	'appt' : preferred_size,
 	'iarr' : spatial_view_arrangement,
 	'hclb' : closeable,
 	'c@#^' : _3c_Inheritance_3e_,
 	'ver2' : product_version,
-	'sfsz' : calculates_folder_sizes,
+	'cuss' : has_custom_view_settings,
 	'sprt' : suggested_size,
 	'zumf' : zoomed_full_size,
 	'urdt' : uses_relative_dates,
 	'panl' : current_panel,
 	'pmod' : modal,
-	'pspd' : stationery,
 	'scom' : shows_comments,
-	'appt' : preferred_size,
+	'pspd' : stationery,
 	'aslk' : locked,
-	'pbnd' : bounds,
+	'pzum' : zoomed,
 	'iimg' : icon,
 	'mprt' : minimum_size,
 	'pnam' : name,
@@ -382,8 +382,9 @@ _propdeclarations = {
 	'cobj' : item,
 	'ptit' : titled,
 	'posn' : position,
-	'cuss' : has_custom_view_settings,
+	'vers' : version,
 	'phys' : physical_size,
+	'pull' : pulled_open,
 	'sknd' : shows_kind,
 	'svrs' : shows_version,
 	'svew' : previous_list_view,
@@ -394,17 +395,16 @@ _propdeclarations = {
 	'ctnr' : container,
 	'wshd' : collapsed,
 	'slbl' : shows_label,
-	'pull' : pulled_open,
+	'warn' : warns_before_emptying,
 	'ptsz' : size,
 	'pvis' : visible,
 	'pidx' : index,
 	'isfl' : floating,
-	'warn' : warns_before_emptying,
 	'drwr' : popup,
 	'sdat' : shows_modification_date,
 	'pvew' : view,
+	'sfsz' : calculates_folder_sizes,
 	'scda' : shows_creation_date,
-	'vers' : version,
 }
 
 _compdeclarations = {

Lib/plat-mac/lib-scriptpackages/Finder/__init__.py

@@ -5,28 +5,28 @@ Resource aete resid 0
 import aetools
 Error = aetools.Error
 import Standard_Suite
-import Earlier_terms
-import Finder_Basics
-import Finder_items
 import Containers_and_folders
 import Files_and_suitcases
-import Window_classes
+import Finder_Basics
+import Finder_items
 import Process_classes
+import Window_classes
 import Type_Definitions
+import Earlier_terms
 import Enumerations
 import Obsolete_terms
 
 
 _code_to_module = {
 	'CoRe' : Standard_Suite,
-	'tpnm' : Earlier_terms,
-	'fndr' : Finder_Basics,
-	'fndr' : Finder_items,
 	'fndr' : Containers_and_folders,
 	'fndr' : Files_and_suitcases,
-	'fndr' : Window_classes,
+	'fndr' : Finder_Basics,
+	'fndr' : Finder_items,
 	'fndr' : Process_classes,
+	'fndr' : Window_classes,
 	'tpdf' : Type_Definitions,
+	'tpnm' : Earlier_terms,
 	'tpnm' : Enumerations,
 	'tpnm' : Obsolete_terms,
 }
@@ -35,27 +35,27 @@ _code_to_module = {
 
 _code_to_fullname = {
 	'CoRe' : ('Finder.Standard_Suite', 'Standard_Suite'),
-	'tpnm' : ('Finder.Earlier_terms', 'Earlier_terms'),
-	'fndr' : ('Finder.Finder_Basics', 'Finder_Basics'),
-	'fndr' : ('Finder.Finder_items', 'Finder_items'),
 	'fndr' : ('Finder.Containers_and_folders', 'Containers_and_folders'),
 	'fndr' : ('Finder.Files_and_suitcases', 'Files_and_suitcases'),
-	'fndr' : ('Finder.Window_classes', 'Window_classes'),
+	'fndr' : ('Finder.Finder_Basics', 'Finder_Basics'),
+	'fndr' : ('Finder.Finder_items', 'Finder_items'),
 	'fndr' : ('Finder.Process_classes', 'Process_classes'),
+	'fndr' : ('Finder.Window_classes', 'Window_classes'),
 	'tpdf' : ('Finder.Type_Definitions', 'Type_Definitions'),
+	'tpnm' : ('Finder.Earlier_terms', 'Earlier_terms'),
 	'tpnm' : ('Finder.Enumerations', 'Enumerations'),
 	'tpnm' : ('Finder.Obsolete_terms', 'Obsolete_terms'),
 }
 
 from Standard_Suite import *
-from Earlier_terms import *
-from Finder_Basics import *
-from Finder_items import *
 from Containers_and_folders import *
 from Files_and_suitcases import *
-from Window_classes import *
+from Finder_Basics import *
+from Finder_items import *
 from Process_classes import *
+from Window_classes import *
 from Type_Definitions import *
+from Earlier_terms import *
 from Enumerations import *
 from Obsolete_terms import *
 
@@ -129,9 +129,6 @@ getbaseclasses(StdSuites.Type_Names_Suite.null)
 getbaseclasses(StdSuites.Type_Names_Suite.target_id)
 getbaseclasses(StdSuites.Type_Names_Suite.point)
 getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
-getbaseclasses(application)
-getbaseclasses(special_folders)
-getbaseclasses(item)
 getbaseclasses(trash_2d_object)
 getbaseclasses(desktop_2d_object)
 getbaseclasses(sharable_container)
@@ -139,6 +136,9 @@ getbaseclasses(sharing_privileges)
 getbaseclasses(disk)
 getbaseclasses(folder)
 getbaseclasses(container)
+getbaseclasses(application)
+getbaseclasses(special_folders)
+getbaseclasses(item)
 getbaseclasses(sound_file)
 getbaseclasses(font_file)
 getbaseclasses(internet_location_file)
@@ -206,17 +206,6 @@ getbaseclasses(StdSuites.Type_Names_Suite.null)
 getbaseclasses(StdSuites.Type_Names_Suite.target_id)
 getbaseclasses(StdSuites.Type_Names_Suite.point)
 getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
-getbaseclasses(status_window)
-getbaseclasses(application)
-getbaseclasses(sharing_window)
-getbaseclasses(control_panel)
-getbaseclasses(process)
-getbaseclasses(item)
-getbaseclasses(file)
-getbaseclasses(sharable_container)
-getbaseclasses(container_window)
-getbaseclasses(container)
-getbaseclasses(information_window)
 getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
 getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
 getbaseclasses(StdSuites.Type_Names_Suite.system_dictionary)
@@ -257,6 +246,17 @@ getbaseclasses(StdSuites.Type_Names_Suite.null)
 getbaseclasses(StdSuites.Type_Names_Suite.target_id)
 getbaseclasses(StdSuites.Type_Names_Suite.point)
 getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
+getbaseclasses(status_window)
+getbaseclasses(application)
+getbaseclasses(sharing_window)
+getbaseclasses(control_panel)
+getbaseclasses(process)
+getbaseclasses(item)
+getbaseclasses(file)
+getbaseclasses(sharable_container)
+getbaseclasses(container_window)
+getbaseclasses(container)
+getbaseclasses(information_window)
 
 #
 # Indices of types declared in this module
@@ -315,9 +315,6 @@ _classdeclarations = {
 	'targ' : StdSuites.Type_Names_Suite.target_id,
 	'QDpt' : StdSuites.Type_Names_Suite.point,
 	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
-	'capp' : application,
-	'spfl' : special_folders,
-	'cobj' : item,
 	'ctrs' : trash_2d_object,
 	'cdsk' : desktop_2d_object,
 	'sctr' : sharable_container,
@@ -325,6 +322,9 @@ _classdeclarations = {
 	'cdis' : disk,
 	'cfol' : folder,
 	'ctnr' : container,
+	'capp' : application,
+	'spfl' : special_folders,
+	'cobj' : item,
 	'sndf' : sound_file,
 	'fntf' : font_file,
 	'inlf' : internet_location_file,
@@ -392,17 +392,6 @@ _classdeclarations = {
 	'targ' : StdSuites.Type_Names_Suite.target_id,
 	'QDpt' : StdSuites.Type_Names_Suite.point,
 	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
-	'qwnd' : status_window,
-	'capp' : application,
-	'swnd' : sharing_window,
-	'ccdv' : control_panel,
-	'prcs' : process,
-	'cobj' : item,
-	'file' : file,
-	'sctr' : sharable_container,
-	'cwnd' : container_window,
-	'ctnr' : container,
-	'iwnd' : information_window,
 	'shor' : StdSuites.Type_Names_Suite.small_integer,
 	'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
 	'aeut' : StdSuites.Type_Names_Suite.system_dictionary,
@@ -443,18 +432,29 @@ _classdeclarations = {
 	'targ' : StdSuites.Type_Names_Suite.target_id,
 	'QDpt' : StdSuites.Type_Names_Suite.point,
 	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
+	'qwnd' : status_window,
+	'capp' : application,
+	'swnd' : sharing_window,
+	'ccdv' : control_panel,
+	'prcs' : process,
+	'cobj' : item,
+	'file' : file,
+	'sctr' : sharable_container,
+	'cwnd' : container_window,
+	'ctnr' : container,
+	'iwnd' : information_window,
 }
 
 
 class Finder(Standard_Suite_Events,
-		Earlier_terms_Events,
-		Finder_Basics_Events,
-		Finder_items_Events,
 		Containers_and_folders_Events,
 		Files_and_suitcases_Events,
-		Window_classes_Events,
+		Finder_Basics_Events,
+		Finder_items_Events,
 		Process_classes_Events,
+		Window_classes_Events,
 		Type_Definitions_Events,
+		Earlier_terms_Events,
 		Enumerations_Events,
 		Obsolete_terms_Events,
 		aetools.TalkTo):

Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py

@@ -12,23 +12,16 @@ _code = 'MOSS'
 
 class Mozilla_suite_Events:
 
-	_argmap_Read_help_file = {
+	def Get_Import_Data(self, _no_object=None, _attributes={}, **_arguments):
-		'with_index' : 'idid',
+		"""Get Import Data: Returns a structure containing information that is of use to an external module in importing data from an external mail application into Communicator.
-		'search_text' : 'sear',
-	}
-
-	def Read_help_file(self, _object, _attributes={}, **_arguments):
-		"""Read help file: Reads in the help file (file should be in the help file format)
-		Required argument: undocumented, typecode 'alis'
-		Keyword argument with_index: Index to the help file. Defaults to  \xd4DEFAULT\xd5)
-		Keyword argument search_text: Optional text to search for
 		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: vRefNum and dirID of profile folder (2+4 bytes), vRefNum and DirID of the local mail folder (2+4 bytes), window type of front window (0 if none, \xd4Brwz\xd5 browser, \xd4Addr\xd5 addressbook, \xd4Mesg\xd5 messenger, etc., 4 bytes)
 		"""
 		_code = 'MOSS'
-		_subcode = 'help'
+		_subcode = 'Impt'
 
-		aetools.keysubst(_arguments, self._argmap_Read_help_file)
+		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
+		if _no_object != None: raise TypeError, 'No direct arg expected'
 
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
@@ -39,16 +32,36 @@ class Mozilla_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def Open_bookmark(self, _object=None, _attributes={}, **_arguments):
+	def Get_Profile_Name(self, _no_object=None, _attributes={}, **_arguments):
-		"""Open bookmark: Reads in a bookmark file
+		"""Get Profile Name: Get the current User Profile
-		Required argument: If not available, reloads the current bookmark file
 		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: Name of the current profile, like \xd2Joe Bloggs\xd3. This is the name of the profile folder in the Netscape Users folder.
 		"""
 		_code = 'MOSS'
-		_subcode = 'book'
+		_subcode = 'upro'
 
 		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def Get_workingURL(self, _no_object=None, _attributes={}, **_arguments):
+		"""Get workingURL: Get the path to the running application in URL format.  This will allow a script to construct a relative URL
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: Will return text of the from \xd2FILE://foo/applicationname\xd3
+		"""
+		_code = 'MOSS'
+		_subcode = 'wurl'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
 
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
@@ -85,75 +98,16 @@ class Mozilla_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def Get_workingURL(self, _no_object=None, _attributes={}, **_arguments):
+	def Handle_command(self, _object, _attributes={}, **_arguments):
-		"""Get workingURL: Get the path to the running application in URL format.  This will allow a script to construct a relative URL
+		"""Handle command: Handle a command
-		Keyword argument _attributes: AppleEvent attribute dictionary
+		Required argument: The command to handle
-		Returns: Will return text of the from \xd2FILE://foo/applicationname\xd3
-		"""
-		_code = 'MOSS'
-		_subcode = 'wurl'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Open_Profile_Manager(self, _no_object=None, _attributes={}, **_arguments):
-		"""Open Profile Manager: Open the user profile manager (obsolete)
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'MOSS'
-		_subcode = 'prfl'
+		_subcode = 'hcmd'
 
 		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
+		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_Import_Data(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get Import Data: Returns a structure containing information that is of use to an external module in importing data from an external mail application into Communicator.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: vRefNum and dirID of profile folder (2+4 bytes), vRefNum and DirID of the local mail folder (2+4 bytes), window type of front window (0 if none, \xd4Brwz\xd5 browser, \xd4Addr\xd5 addressbook, \xd4Mesg\xd5 messenger, etc., 4 bytes)
-		"""
-		_code = 'MOSS'
-		_subcode = 'Impt'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_Profile_Name(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get Profile Name: Get the current User Profile
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Name of the current profile, like \xd2Joe Bloggs\xd3. This is the name of the profile folder in the Netscape Users folder.
-		"""
-		_code = 'MOSS'
-		_subcode = 'upro'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
 
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
@@ -203,13 +157,32 @@ class Mozilla_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def Handle_command(self, _object, _attributes={}, **_arguments):
+	def Open_Profile_Manager(self, _no_object=None, _attributes={}, **_arguments):
-		"""Handle command: Handle a command
+		"""Open Profile Manager: Open the user profile manager (obsolete)
-		Required argument: The command to handle
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'MOSS'
-		_subcode = 'hcmd'
+		_subcode = 'prfl'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def Open_bookmark(self, _object=None, _attributes={}, **_arguments):
+		"""Open bookmark: Reads in a bookmark file
+		Required argument: If not available, reloads the current bookmark file
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'MOSS'
+		_subcode = 'book'
 
 		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
@@ -223,12 +196,32 @@ class Mozilla_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-_Enum_dire = {
+	_argmap_Read_help_file = {
-	'again' : 'agai',	# Again (reload)
+		'with_index' : 'idid',
-	'home' : 'home',	# Home
+		'search_text' : 'sear',
-	'backward' : 'prev',	# Previous page
+	}
-	'forward' : 'next',	# Next page
+
-}
+	def Read_help_file(self, _object, _attributes={}, **_arguments):
+		"""Read help file: Reads in the help file (file should be in the help file format)
+		Required argument: undocumented, typecode 'alis'
+		Keyword argument with_index: Index to the help file. Defaults to  \xd4DEFAULT\xd5)
+		Keyword argument search_text: Optional text to search for
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'MOSS'
+		_subcode = 'help'
+
+		aetools.keysubst(_arguments, self._argmap_Read_help_file)
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
 
 _Enum_comp = {
 	'Navigator' : 'navg',	# The Navigator component
@@ -239,6 +232,13 @@ _Enum_comp = {
 	'Calendar' : 'cald',	# The Calendar Component
 }
 
+_Enum_dire = {
+	'again' : 'agai',	# Again (reload)
+	'home' : 'home',	# Home
+	'backward' : 'prev',	# Previous page
+	'forward' : 'next',	# Next page
+}
+
 _Enum_ncmd = {
 	'Get_new_mail' : '\x00\x00\x04W',	# 
 	'Send_queued_messages' : '\x00\x00\x04X',	# 

Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py

@@ -12,6 +12,30 @@ _code = 'ppnt'
 
 class PowerPlant_Events:
 
+	_argmap_SwitchTellTarget = {
+		'to' : 'data',
+	}
+
+	def SwitchTellTarget(self, _no_object=None, _attributes={}, **_arguments):
+		"""SwitchTellTarget: Makes an object the \xd2focus\xd3 of AppleEvents
+		Keyword argument to: reference to new focus of AppleEvents
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'ppnt'
+		_subcode = 'sttg'
+
+		aetools.keysubst(_arguments, self._argmap_SwitchTellTarget)
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
 	_argmap_select = {
 		'data' : 'data',
 	}
@@ -29,30 +53,6 @@ class PowerPlant_Events:
 		_arguments['----'] = _object
 
 
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_SwitchTellTarget = {
-		'to' : 'data',
-	}
-
-	def SwitchTellTarget(self, _no_object=None, _attributes={}, **_arguments):
-		"""SwitchTellTarget: Makes an object the \xd2focus\xd3 of AppleEvents
-		Keyword argument to: reference to new focus of AppleEvents
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'ppnt'
-		_subcode = 'sttg'
-
-		aetools.keysubst(_arguments, self._argmap_SwitchTellTarget)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):

Lib/plat-mac/lib-scriptpackages/Netscape/Text.py

@@ -16,31 +16,6 @@ class Text_Events(Text_Suite_Events):
 	pass
 
 
-class text(aetools.ComponentItem):
-	"""text - independent text view objects """
-	want = 'ctxt'
-class updateLevel(aetools.NProperty):
-	"""updateLevel - updating level.  Can only be incremented or decremented.  Do so only in a try block -- if the level is greater than zero, visual text updating will cease. """
-	which = 'pUpL'
-	want = 'long'
-class beginning(aetools.NProperty):
-	"""beginning - Beginning of element """
-	which = 'bgng'
-	want = 'obj '
-class end(aetools.NProperty):
-	"""end - Ending of element """
-	which = 'end '
-	want = 'obj '
-class infront(aetools.NProperty):
-	"""infront - Immediately before element """
-	which = 'pBef'
-	want = 'obj '
-class justbehind(aetools.NProperty):
-	"""justbehind - Immediately after element """
-	which = 'pAft'
-	want = 'obj '
-#        element 'stys' as ['indx', 'name']
-
 class styleset(aetools.ComponentItem):
 	"""styleset - A style \xd2set\xd3 that may be used repeatedly in text objects. """
 	want = 'stys'
@@ -70,17 +45,31 @@ class style(aetools.NProperty):
 	want = 'tsty'
 
 stylesets = styleset
-text._superclassnames = []
+
-text._privpropdict = {
+class text(aetools.ComponentItem):
-	'updateLevel' : updateLevel,
+	"""text - independent text view objects """
-	'beginning' : beginning,
+	want = 'ctxt'
-	'end' : end,
+class updateLevel(aetools.NProperty):
-	'infront' : infront,
+	"""updateLevel - updating level.  Can only be incremented or decremented.  Do so only in a try block -- if the level is greater than zero, visual text updating will cease. """
-	'justbehind' : justbehind,
+	which = 'pUpL'
-}
+	want = 'long'
-text._privelemdict = {
+class beginning(aetools.NProperty):
-	'styleset' : styleset,
+	"""beginning - Beginning of element """
-}
+	which = 'bgng'
+	want = 'obj '
+class end(aetools.NProperty):
+	"""end - Ending of element """
+	which = 'end '
+	want = 'obj '
+class infront(aetools.NProperty):
+	"""infront - Immediately before element """
+	which = 'pBef'
+	want = 'obj '
+class justbehind(aetools.NProperty):
+	"""justbehind - Immediately after element """
+	which = 'pAft'
+	want = 'obj '
+#        element 'stys' as ['indx', 'name']
 styleset._superclassnames = []
 styleset._privpropdict = {
 	'name' : name,
@@ -92,27 +81,38 @@ styleset._privpropdict = {
 }
 styleset._privelemdict = {
 }
+text._superclassnames = []
+text._privpropdict = {
+	'updateLevel' : updateLevel,
+	'beginning' : beginning,
+	'end' : end,
+	'infront' : infront,
+	'justbehind' : justbehind,
+}
+text._privelemdict = {
+	'styleset' : styleset,
+}
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'ctxt' : text,
 	'stys' : styleset,
+	'ctxt' : text,
 }
 
 _propdeclarations = {
-	'pBef' : infront,
+	'ptsz' : size,
 	'bgng' : beginning,
 	'colr' : color,
 	'txst' : style,
 	'psct' : writing_code,
 	'pAft' : justbehind,
+	'font' : font,
 	'end ' : end,
-	'ptsz' : size,
 	'pUpL' : updateLevel,
 	'pnam' : name,
-	'font' : font,
+	'pBef' : infront,
 }
 
 _compdeclarations = {

Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py

@@ -70,32 +70,6 @@ class WorldWideWeb_suite_Events:
 		_arguments['----'] = _object
 
 
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_parse_anchor = {
-		'relative_to' : 'RELA',
-	}
-
-	def parse_anchor(self, _object, _attributes={}, **_arguments):
-		"""parse anchor: Resolves the relative URL
-		Required argument: Main URL
-		Keyword argument relative_to: Relative URL
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Parsed  URL
-		"""
-		_code = 'WWW!'
-		_subcode = 'PRSA'
-
-		aetools.keysubst(_arguments, self._argmap_parse_anchor)
-		_arguments['----'] = _object
-
-
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):
@@ -150,13 +124,14 @@ class WorldWideWeb_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def webActivate(self, _object=None, _attributes={}, **_arguments):
+	def get_window_info(self, _object=None, _attributes={}, **_arguments):
-		"""webActivate: Makes Netscape the frontmost application, and selects a given window. This event is here for suite completeness/ cross-platform compatibility only, you should use standard AppleEvents instead.
+		"""get window info: Returns the information about the window as a list. Currently the list contains the window title and the URL. You can get the same information using standard Apple Event GetProperty.
-		Required argument: window to bring to front
+		Required argument: window ID
 		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: undocumented, typecode 'list'
 		"""
 		_code = 'WWW!'
-		_subcode = 'ACTV'
+		_subcode = 'WNFO'
 
 		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
@@ -190,16 +165,21 @@ class WorldWideWeb_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def get_window_info(self, _object=None, _attributes={}, **_arguments):
+	_argmap_parse_anchor = {
-		"""get window info: Returns the information about the window as a list. Currently the list contains the window title and the URL. You can get the same information using standard Apple Event GetProperty.
+		'relative_to' : 'RELA',
-		Required argument: window ID
+	}
+
+	def parse_anchor(self, _object, _attributes={}, **_arguments):
+		"""parse anchor: Resolves the relative URL
+		Required argument: Main URL
+		Keyword argument relative_to: Relative URL
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'list'
+		Returns: Parsed  URL
 		"""
 		_code = 'WWW!'
-		_subcode = 'WNFO'
+		_subcode = 'PRSA'
 
-		if _arguments: raise TypeError, 'No optional args expected'
+		aetools.keysubst(_arguments, self._argmap_parse_anchor)
 		_arguments['----'] = _object
 
 
@@ -231,15 +211,21 @@ class WorldWideWeb_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def unregister_URL_echo(self, _object, _attributes={}, **_arguments):
+	_argmap_register_protocol = {
-		"""unregister URL echo: cancels URL echo
+		'for_protocol' : 'PROT',
-		Required argument: application signature
+	}
+
+	def register_protocol(self, _object=None, _attributes={}, **_arguments):
+		"""register protocol: Registers application as a \xd2handler\xd3 for this protocol with a given prefix. The handler will receive \xd2OpenURL\xd3, or if that fails, \xd2GetURL\xd3 event.
+		Required argument: Application sig
+		Keyword argument for_protocol: protocol prefix: \xd2finger:\xd3, \xd2file\xd3,
 		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: TRUE if registration has been successful
 		"""
 		_code = 'WWW!'
-		_subcode = 'UNRU'
+		_subcode = 'RGPR'
 
-		if _arguments: raise TypeError, 'No optional args expected'
+		aetools.keysubst(_arguments, self._argmap_register_protocol)
 		_arguments['----'] = _object
 
 
@@ -279,21 +265,21 @@ class WorldWideWeb_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	_argmap_unregister_viewer = {
+	_argmap_register_window_close = {
-		'MIME_type' : 'MIME',
+		'for_window' : 'WIND',
 	}
 
-	def unregister_viewer(self, _object, _attributes={}, **_arguments):
+	def register_window_close(self, _object=None, _attributes={}, **_arguments):
-		"""unregister viewer: Revert to the old way of handling this MIME type
+		"""register window close: Netscape will notify registered application when this window closes
-		Required argument: Application sig
+		Required argument: Application signature
-		Keyword argument MIME_type: MIME type to be unregistered
+		Keyword argument for_window: window ID
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: TRUE if the event was successful
+		Returns: true if successful
 		"""
 		_code = 'WWW!'
-		_subcode = 'UNRV'
+		_subcode = 'RGWC'
 
-		aetools.keysubst(_arguments, self._argmap_unregister_viewer)
+		aetools.keysubst(_arguments, self._argmap_register_window_close)
 		_arguments['----'] = _object
 
 
@@ -305,21 +291,15 @@ class WorldWideWeb_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	_argmap_register_protocol = {
+	def unregister_URL_echo(self, _object, _attributes={}, **_arguments):
-		'for_protocol' : 'PROT',
+		"""unregister URL echo: cancels URL echo
-	}
+		Required argument: application signature
-
-	def register_protocol(self, _object=None, _attributes={}, **_arguments):
-		"""register protocol: Registers application as a \xd2handler\xd3 for this protocol with a given prefix. The handler will receive \xd2OpenURL\xd3, or if that fails, \xd2GetURL\xd3 event.
-		Required argument: Application sig
-		Keyword argument for_protocol: protocol prefix: \xd2finger:\xd3, \xd2file\xd3,
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: TRUE if registration has been successful
 		"""
 		_code = 'WWW!'
-		_subcode = 'RGPR'
+		_subcode = 'UNRU'
 
-		aetools.keysubst(_arguments, self._argmap_register_protocol)
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
 
@@ -357,21 +337,21 @@ class WorldWideWeb_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	_argmap_register_window_close = {
+	_argmap_unregister_viewer = {
-		'for_window' : 'WIND',
+		'MIME_type' : 'MIME',
 	}
 
-	def register_window_close(self, _object=None, _attributes={}, **_arguments):
+	def unregister_viewer(self, _object, _attributes={}, **_arguments):
-		"""register window close: Netscape will notify registered application when this window closes
+		"""unregister viewer: Revert to the old way of handling this MIME type
-		Required argument: Application signature
+		Required argument: Application sig
-		Keyword argument for_window: window ID
+		Keyword argument MIME_type: MIME type to be unregistered
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: true if successful
+		Returns: TRUE if the event was successful
 		"""
 		_code = 'WWW!'
-		_subcode = 'RGWC'
+		_subcode = 'UNRV'
 
-		aetools.keysubst(_arguments, self._argmap_register_window_close)
+		aetools.keysubst(_arguments, self._argmap_unregister_viewer)
 		_arguments['----'] = _object
 
 
@@ -401,6 +381,26 @@ class WorldWideWeb_suite_Events:
 		_arguments['----'] = _object
 
 
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def webActivate(self, _object=None, _attributes={}, **_arguments):
+		"""webActivate: Makes Netscape the frontmost application, and selects a given window. This event is here for suite completeness/ cross-platform compatibility only, you should use standard AppleEvents instead.
+		Required argument: window to bring to front
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'WWW!'
+		_subcode = 'ACTV'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):

Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py

@@ -4,44 +4,44 @@ Resource aete resid 0
 """
 import aetools
 Error = aetools.Error
-import Required_suite
 import Standard_Suite
 import Standard_URL_suite
-import WorldWideWeb_suite
 import Mozilla_suite
-import PowerPlant
 import Text
+import WorldWideWeb_suite
+import PowerPlant
+import Required_suite
 
 
 _code_to_module = {
-	'reqd' : Required_suite,
 	'CoRe' : Standard_Suite,
 	'GURL' : Standard_URL_suite,
-	'WWW!' : WorldWideWeb_suite,
 	'MOSS' : Mozilla_suite,
-	'ppnt' : PowerPlant,
 	'TEXT' : Text,
+	'WWW!' : WorldWideWeb_suite,
+	'ppnt' : PowerPlant,
+	'reqd' : Required_suite,
 }
 
 
 
 _code_to_fullname = {
-	'reqd' : ('Netscape.Required_suite', 'Required_suite'),
 	'CoRe' : ('Netscape.Standard_Suite', 'Standard_Suite'),
 	'GURL' : ('Netscape.Standard_URL_suite', 'Standard_URL_suite'),
-	'WWW!' : ('Netscape.WorldWideWeb_suite', 'WorldWideWeb_suite'),
 	'MOSS' : ('Netscape.Mozilla_suite', 'Mozilla_suite'),
-	'ppnt' : ('Netscape.PowerPlant', 'PowerPlant'),
 	'TEXT' : ('Netscape.Text', 'Text'),
+	'WWW!' : ('Netscape.WorldWideWeb_suite', 'WorldWideWeb_suite'),
+	'ppnt' : ('Netscape.PowerPlant', 'PowerPlant'),
+	'reqd' : ('Netscape.Required_suite', 'Required_suite'),
 }
 
-from Required_suite import *
 from Standard_Suite import *
 from Standard_URL_suite import *
-from WorldWideWeb_suite import *
 from Mozilla_suite import *
-from PowerPlant import *
 from Text import *
+from WorldWideWeb_suite import *
+from PowerPlant import *
+from Required_suite import *
 
 def getbaseclasses(v):
 	if not getattr(v, '_propdict', None):
@@ -62,8 +62,6 @@ import StdSuites
 #
 getbaseclasses(window)
 getbaseclasses(application)
-getbaseclasses(text)
-getbaseclasses(styleset)
 getbaseclasses(StdSuites.Text_Suite.paragraph)
 getbaseclasses(StdSuites.Text_Suite.character)
 getbaseclasses(StdSuites.Text_Suite.text_style_info)
@@ -71,6 +69,8 @@ getbaseclasses(StdSuites.Text_Suite.word)
 getbaseclasses(StdSuites.Text_Suite.text_flow)
 getbaseclasses(StdSuites.Text_Suite.line)
 getbaseclasses(StdSuites.Text_Suite.text)
+getbaseclasses(text)
+getbaseclasses(styleset)
 
 #
 # Indices of types declared in this module
@@ -78,8 +78,6 @@ getbaseclasses(StdSuites.Text_Suite.text)
 _classdeclarations = {
 	'cwin' : window,
 	'capp' : application,
-	'ctxt' : text,
-	'stys' : styleset,
 	'cpar' : StdSuites.Text_Suite.paragraph,
 	'cha ' : StdSuites.Text_Suite.character,
 	'tsty' : StdSuites.Text_Suite.text_style_info,
@@ -87,16 +85,18 @@ _classdeclarations = {
 	'cflo' : StdSuites.Text_Suite.text_flow,
 	'clin' : StdSuites.Text_Suite.line,
 	'ctxt' : StdSuites.Text_Suite.text,
+	'ctxt' : text,
+	'stys' : styleset,
 }
 
 
-class Netscape(Required_suite_Events,
+class Netscape(Standard_Suite_Events,
-		Standard_Suite_Events,
 		Standard_URL_suite_Events,
-		WorldWideWeb_suite_Events,
 		Mozilla_suite_Events,
-		PowerPlant_Events,
 		Text_Events,
+		WorldWideWeb_suite_Events,
+		PowerPlant_Events,
+		Required_suite_Events,
 		aetools.TalkTo):
 	_signature = 'MOSS'
 

Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py

@@ -15,38 +15,6 @@ class Macintosh_Connectivity_Clas_Events:
 	pass
 
 
-class device_specification(aetools.ComponentItem):
-	"""device specification - A device connected to a computer """
-	want = 'cdev'
-class properties(aetools.NProperty):
-	"""properties - property that allows getting and setting of multiple properties """
-	which = 'pALL'
-	want = 'reco'
-class device_type(aetools.NProperty):
-	"""device type - the kind of device """
-	which = 'pdvt'
-	want = 'edvt'
-class device_address(aetools.NProperty):
-	"""device address - the address of the device """
-	which = 'pdva'
-	want = 'cadr'
-
-device_specifications = device_specification
-
-class address_specification(aetools.ComponentItem):
-	"""address specification - Unique designation of a device or service connected to this computer """
-	want = 'cadr'
-class conduit(aetools.NProperty):
-	"""conduit - How the addressee is physically connected """
-	which = 'pcon'
-	want = 'econ'
-class protocol(aetools.NProperty):
-	"""protocol - How to talk to this addressee """
-	which = 'pprt'
-	want = 'epro'
-
-address_specifications = address_specification
-
 class ADB_address(aetools.ComponentItem):
 	"""ADB address - Addresses a device connected via Apple Desktop Bus """
 	want = 'cadb'
@@ -79,12 +47,6 @@ class AppleTalk_type(aetools.NProperty):
 
 AppleTalk_addresses = AppleTalk_address
 
-class bus_slot(aetools.ComponentItem):
-	"""bus slot - Addresses a PC, PCI, or NuBus card """
-	want = 'cbus'
-
-bus_slots = bus_slot
-
 class Ethernet_address(aetools.ComponentItem):
 	"""Ethernet address - Addresses a device by its Ethernet address """
 	want = 'cen '
@@ -149,31 +111,53 @@ class Token_Ring_address(aetools.ComponentItem):
 
 Token_Ring_addresses = Token_Ring_address
 
-class USB_address(aetools.ComponentItem):
+class USB_Addresses(aetools.ComponentItem):
-	"""USB address - Addresses a device on the Universal Serial Bus """
+	"""USB Addresses -  """
 	want = 'cusb'
+
+USB_address = USB_Addresses
 class name(aetools.NProperty):
 	"""name - the USB device name """
 	which = 'pnam'
 	want = 'TEXT'
 
-USB_Addresses = USB_address
+class address_specification(aetools.ComponentItem):
-device_specification._superclassnames = []
+	"""address specification - Unique designation of a device or service connected to this computer """
-device_specification._privpropdict = {
+	want = 'cadr'
-	'properties' : properties,
+class properties(aetools.NProperty):
-	'device_type' : device_type,
+	"""properties - property that allows getting and setting of multiple properties """
-	'device_address' : device_address,
+	which = 'pALL'
-}
+	want = 'reco'
-device_specification._privelemdict = {
+class conduit(aetools.NProperty):
-}
+	"""conduit - How the addressee is physically connected """
-address_specification._superclassnames = []
+	which = 'pcon'
-address_specification._privpropdict = {
+	want = 'econ'
-	'properties' : properties,
+class protocol(aetools.NProperty):
-	'conduit' : conduit,
+	"""protocol - How to talk to this addressee """
-	'protocol' : protocol,
+	which = 'pprt'
-}
+	want = 'epro'
-address_specification._privelemdict = {
+
-}
+address_specifications = address_specification
+
+class bus_slot(aetools.ComponentItem):
+	"""bus slot - Addresses a PC, PCI, or NuBus card """
+	want = 'cbus'
+
+bus_slots = bus_slot
+
+class device_specification(aetools.ComponentItem):
+	"""device specification - A device connected to a computer """
+	want = 'cdev'
+class device_type(aetools.NProperty):
+	"""device type - the kind of device """
+	which = 'pdvt'
+	want = 'edvt'
+class device_address(aetools.NProperty):
+	"""device address - the address of the device """
+	which = 'pdva'
+	want = 'cadr'
+
+device_specifications = device_specification
 ADB_address._superclassnames = ['address_specification']
 ADB_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
@@ -190,13 +174,6 @@ AppleTalk_address._privpropdict = {
 }
 AppleTalk_address._privelemdict = {
 }
-bus_slot._superclassnames = ['address_specification']
-bus_slot._privpropdict = {
-	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
-	'ID' : ID,
-}
-bus_slot._privelemdict = {
-}
 Ethernet_address._superclassnames = ['address_specification']
 Ethernet_address._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
@@ -245,36 +222,34 @@ Token_Ring_address._privpropdict = {
 }
 Token_Ring_address._privelemdict = {
 }
-USB_address._superclassnames = ['address_specification']
+USB_Addresses._superclassnames = []
-USB_address._privpropdict = {
+USB_Addresses._privpropdict = {
+}
+USB_Addresses._privelemdict = {
+}
+address_specification._superclassnames = []
+address_specification._privpropdict = {
+	'properties' : properties,
+	'conduit' : conduit,
+	'protocol' : protocol,
+}
+address_specification._privelemdict = {
+}
+bus_slot._superclassnames = ['address_specification']
+bus_slot._privpropdict = {
 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
-	'name' : name,
+	'ID' : ID,
 }
-USB_address._privelemdict = {
+bus_slot._privelemdict = {
 }
-_Enum_edvt = {
+device_specification._superclassnames = []
-	'hard_disk_drive' : 'ehd ',	# 
+device_specification._privpropdict = {
-	'floppy_disk_drive' : 'efd ',	# 
+	'properties' : properties,
-	'CD_ROM_drive' : 'ecd ',	# 
+	'device_type' : device_type,
-	'DVD_drive' : 'edvd',	# 
+	'device_address' : device_address,
-	'storage_device' : 'edst',	# 
+}
-	'keyboard' : 'ekbd',	# 
+device_specification._privelemdict = {
-	'mouse' : 'emou',	# 
-	'trackball' : 'etrk',	# 
-	'trackpad' : 'edtp',	# 
-	'pointing_device' : 'edpd',	# 
-	'video_monitor' : 'edvm',	# 
-	'LCD_display' : 'edlc',	# 
-	'display' : 'edds',	# 
-	'modem' : 'edmm',	# 
-	'PC_card' : 'ecpc',	# 
-	'PCI_card' : 'edpi',	# 
-	'NuBus_card' : 'ednb',	# 
-	'printer' : 'edpr',	# 
-	'speakers' : 'edsp',	# 
-	'microphone' : 'ecmi',	# 
 }
-
 _Enum_econ = {
 	'ADB' : 'eadb',	# 
 	'printer_port' : 'ecpp',	# 
@@ -301,6 +276,29 @@ _Enum_econ = {
 	'microphone' : 'ecmi',	# 
 }
 
+_Enum_edvt = {
+	'hard_disk_drive' : 'ehd ',	# 
+	'floppy_disk_drive' : 'efd ',	# 
+	'CD_ROM_drive' : 'ecd ',	# 
+	'DVD_drive' : 'edvd',	# 
+	'storage_device' : 'edst',	# 
+	'keyboard' : 'ekbd',	# 
+	'mouse' : 'emou',	# 
+	'trackball' : 'etrk',	# 
+	'trackpad' : 'edtp',	# 
+	'pointing_device' : 'edpd',	# 
+	'video_monitor' : 'edvm',	# 
+	'LCD_display' : 'edlc',	# 
+	'display' : 'edds',	# 
+	'modem' : 'edmm',	# 
+	'PC_card' : 'ecpc',	# 
+	'PCI_card' : 'edpi',	# 
+	'NuBus_card' : 'ednb',	# 
+	'printer' : 'edpr',	# 
+	'speakers' : 'edsp',	# 
+	'microphone' : 'ecmi',	# 
+}
+
 _Enum_epro = {
 	'serial' : 'epsr',	# 
 	'AppleTalk' : 'epat',	# 
@@ -335,16 +333,16 @@ _classdeclarations = {
 	'cbus' : bus_slot,
 	'cscs' : SCSI_address,
 	'cadb' : ADB_address,
-	'cusb' : USB_address,
+	'cusb' : USB_Addresses,
-	'cdev' : device_specification,
-	'clt ' : LocalTalk_address,
 	'cip ' : IP_address,
+	'clt ' : LocalTalk_address,
+	'cdev' : device_specification,
 	'cen ' : Ethernet_address,
 }
 
 _propdeclarations = {
 	'pdns' : DNS_form,
-	'ppor' : port,
+	'pdva' : device_address,
 	'patt' : AppleTalk_type,
 	'pprt' : protocol,
 	'pcon' : conduit,
@@ -355,10 +353,10 @@ _propdeclarations = {
 	'c@#^' : _3c_inheritance_3e_,
 	'ID  ' : ID,
 	'pALL' : properties,
-	'pscb' : SCSI_bus,
-	'pdva' : device_address,
-	'patm' : AppleTalk_machine,
 	'psoc' : socket,
+	'pscb' : SCSI_bus,
+	'ppor' : port,
+	'patm' : AppleTalk_machine,
 	'pslu' : LUN,
 	'pnod' : node,
 }

Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py

@@ -119,6 +119,12 @@ class update_on_change(aetools.NProperty):
 
 drawing_areas = drawing_area
 
+class graphic_group(aetools.ComponentItem):
+	"""graphic group - Group of graphics """
+	want = 'cpic'
+
+graphic_groups = graphic_group
+
 class graphic_line(aetools.ComponentItem):
 	"""graphic line - A graphic line """
 	want = 'glin'
@@ -173,12 +179,6 @@ class uniform_styles(aetools.NProperty):
 	which = 'ustl'
 	want = 'tsty'
 
-class graphic_group(aetools.ComponentItem):
-	"""graphic group - Group of graphics """
-	want = 'cpic'
-
-graphic_groups = graphic_group
-
 class oval(aetools.ComponentItem):
 	"""oval - An oval """
 	want = 'covl'
@@ -189,14 +189,14 @@ class pixel(aetools.ComponentItem):
 	"""pixel - A pixel """
 	want = 'cpxl'
 
-pixels = pixel
-
 class pixel_map(aetools.ComponentItem):
 	"""pixel map - A pixel map """
 	want = 'cpix'
 
 pixel_maps = pixel_map
 
+pixels = pixel
+
 class polygon(aetools.ComponentItem):
 	"""polygon - A polygon """
 	want = 'cpgn'
@@ -259,6 +259,11 @@ drawing_area._privpropdict = {
 }
 drawing_area._privelemdict = {
 }
+graphic_group._superclassnames = []
+graphic_group._privpropdict = {
+}
+graphic_group._privelemdict = {
+}
 graphic_line._superclassnames = []
 graphic_line._privpropdict = {
 	'start_point' : start_point,
@@ -287,11 +292,6 @@ graphic_text._privpropdict = {
 }
 graphic_text._privelemdict = {
 }
-graphic_group._superclassnames = []
-graphic_group._privpropdict = {
-}
-graphic_group._privelemdict = {
-}
 oval._superclassnames = []
 oval._privpropdict = {
 }
@@ -326,6 +326,13 @@ rounded_rectangle._privpropdict = {
 }
 rounded_rectangle._privelemdict = {
 }
+_Enum_arro = {
+	'no_arrow' : 'arno',	# No arrow on line
+	'arrow_at_start' : 'arst',	# Arrow at start of line
+	'arrow_at_end' : 'aren',	# Arrow at end of line
+	'arrow_at_both_ends' : 'arbo',	# Arrow at both the start and the end of the line
+}
+
 _Enum_tran = {
 	'copy_pixels' : 'cpy ',	# 
 	'not_copy_pixels' : 'ncpy',	# 
@@ -344,13 +351,6 @@ _Enum_tran = {
 	'blend_pixels' : 'blnd',	# 
 }
 
-_Enum_arro = {
-	'no_arrow' : 'arno',	# No arrow on line
-	'arrow_at_start' : 'arst',	# Arrow at start of line
-	'arrow_at_end' : 'aren',	# Arrow at end of line
-	'arrow_at_both_ends' : 'arbo',	# Arrow at both the start and the end of the line
-}
-
 
 #
 # Indices of types declared in this module

Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py

@@ -13,100 +13,23 @@ _code = 'core'
 from _builtinSuites.builtin_Suite import *
 class Standard_Suite_Events(builtin_Suite_Events):
 
-	def open(self, _object, _attributes={}, **_arguments):
+	_argmap_class_info = {
-		"""open: Open the specified object(s)
+		'in_' : 'wrcd',
-		Required argument: list of objects to open
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'odoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def run(self, _no_object=None, _attributes={}, **_arguments):
-		"""run: Run an application.  Most applications will open an empty, untitled window.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'oapp'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def reopen(self, _no_object=None, _attributes={}, **_arguments):
-		"""reopen: Reactivate a running application.  Some applications will open a new untitled window if no window is open.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'rapp'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def print_(self, _object, _attributes={}, **_arguments):
-		"""print: Print the specified object(s)
-		Required argument: list of objects to print
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'pdoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_quit = {
-		'saving' : 'savo',
 	}
 
-	def quit(self, _no_object=None, _attributes={}, **_arguments):
+	def class_info(self, _object=None, _attributes={}, **_arguments):
-		"""quit: Quit an application
+		"""class info: (optional) Get information about an object class
-		Keyword argument saving: specifies whether to save currently open documents
+		Required argument: the object class about which information is requested
+		Keyword argument in_: the human language and script system in which to return information
 		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: a record containing the object\xd5s properties and elements
 		"""
-		_code = 'aevt'
+		_code = 'core'
-		_subcode = 'quit'
+		_subcode = 'qobj'
 
-		aetools.keysubst(_arguments, self._argmap_quit)
+		aetools.keysubst(_arguments, self._argmap_class_info)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
+		_arguments['----'] = _object
 
-		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
@@ -162,6 +85,32 @@ class Standard_Suite_Events(builtin_Suite_Events):
 		_arguments['----'] = _object
 
 
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_data_size = {
+		'as' : 'rtyp',
+	}
+
+	def data_size(self, _object, _attributes={}, **_arguments):
+		"""data size: (optional) Return the size in bytes of an object
+		Required argument: the object whose data size is to be returned
+		Keyword argument as: the data type for which the size is calculated
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: the size of the object in bytes
+		"""
+		_code = 'core'
+		_subcode = 'dsiz'
+
+		aetools.keysubst(_arguments, self._argmap_data_size)
+		_arguments['----'] = _object
+
+
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):
@@ -210,6 +159,32 @@ class Standard_Suite_Events(builtin_Suite_Events):
 		_arguments['----'] = _object
 
 
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_event_info = {
+		'in_' : 'wrcd',
+	}
+
+	def event_info(self, _object, _attributes={}, **_arguments):
+		"""event info: (optional) Get information about the Apple events in a suite
+		Required argument: the event class of the Apple events for which to return information
+		Keyword argument in_: the human language and script system in which to return information
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: a record containing the events and their parameters
+		"""
+		_code = 'core'
+		_subcode = 'gtei'
+
+		aetools.keysubst(_arguments, self._argmap_event_info)
+		_arguments['----'] = _object
+
+
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):
@@ -288,6 +263,109 @@ class Standard_Suite_Events(builtin_Suite_Events):
 		_arguments['----'] = _object
 
 
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def open(self, _object, _attributes={}, **_arguments):
+		"""open: Open the specified object(s)
+		Required argument: list of objects to open
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'odoc'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def print_(self, _object, _attributes={}, **_arguments):
+		"""print: Print the specified object(s)
+		Required argument: list of objects to print
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'pdoc'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	_argmap_quit = {
+		'saving' : 'savo',
+	}
+
+	def quit(self, _no_object=None, _attributes={}, **_arguments):
+		"""quit: Quit an application
+		Keyword argument saving: specifies whether to save currently open documents
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'quit'
+
+		aetools.keysubst(_arguments, self._argmap_quit)
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def reopen(self, _no_object=None, _attributes={}, **_arguments):
+		"""reopen: Reactivate a running application.  Some applications will open a new untitled window if no window is open.
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'rapp'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def run(self, _no_object=None, _attributes={}, **_arguments):
+		"""run: Run an application.  Most applications will open an empty, untitled window.
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'oapp'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):
@@ -335,32 +413,6 @@ class Standard_Suite_Events(builtin_Suite_Events):
 		_arguments['----'] = _object
 
 
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_data_size = {
-		'as' : 'rtyp',
-	}
-
-	def data_size(self, _object, _attributes={}, **_arguments):
-		"""data size: (optional) Return the size in bytes of an object
-		Required argument: the object whose data size is to be returned
-		Keyword argument as: the data type for which the size is calculated
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the size of the object in bytes
-		"""
-		_code = 'core'
-		_subcode = 'dsiz'
-
-		aetools.keysubst(_arguments, self._argmap_data_size)
-		_arguments['----'] = _object
-
-
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):
@@ -395,58 +447,12 @@ class Standard_Suite_Events(builtin_Suite_Events):
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	_argmap_event_info = {
-		'in_' : 'wrcd',
-	}
 
-	def event_info(self, _object, _attributes={}, **_arguments):
+class alias(aetools.ComponentItem):
-		"""event info: (optional) Get information about the Apple events in a suite
+	"""alias - a file on a disk or server.  The file must exist when you check the syntax of your script. """
-		Required argument: the event class of the Apple events for which to return information
+	want = 'alis'
-		Keyword argument in_: the human language and script system in which to return information
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: a record containing the events and their parameters
-		"""
-		_code = 'core'
-		_subcode = 'gtei'
-
-		aetools.keysubst(_arguments, self._argmap_event_info)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_class_info = {
-		'in_' : 'wrcd',
-	}
-
-	def class_info(self, _object=None, _attributes={}, **_arguments):
-		"""class info: (optional) Get information about an object class
-		Required argument: the object class about which information is requested
-		Keyword argument in_: the human language and script system in which to return information
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: a record containing the object\xd5s properties and elements
-		"""
-		_code = 'core'
-		_subcode = 'qobj'
-
-		aetools.keysubst(_arguments, self._argmap_class_info)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
 
+aliases = alias
 
 class application(aetools.ComponentItem):
 	"""application - An application program """
@@ -494,11 +500,11 @@ class stationery(aetools.NProperty):
 
 files = file
 
-class alias(aetools.ComponentItem):
+class insertion_point(aetools.ComponentItem):
-	"""alias - a file on a disk or server.  The file must exist when you check the syntax of your script. """
+	"""insertion point - An insertion location between two objects """
-	want = 'alis'
+	want = 'cins'
 
-aliases = alias
+insertion_points = insertion_point
 
 class selection_2d_object(aetools.ComponentItem):
 	"""selection-object - A way to refer to the state of the current of the selection.  Use the \xd4select\xd5 command to make a new selection. """
@@ -553,12 +559,11 @@ class visible(aetools.NProperty):
 	want = 'bool'
 
 windows = window
-
+alias._superclassnames = []
-class insertion_point(aetools.ComponentItem):
+alias._privpropdict = {
-	"""insertion point - An insertion location between two objects """
+}
-	want = 'cins'
+alias._privelemdict = {
-
+}
-insertion_points = insertion_point
 application._superclassnames = []
 application._privpropdict = {
 	'name' : name,
@@ -581,10 +586,10 @@ file._privpropdict = {
 }
 file._privelemdict = {
 }
-alias._superclassnames = []
+insertion_point._superclassnames = []
-alias._privpropdict = {
+insertion_point._privpropdict = {
 }
-alias._privelemdict = {
+insertion_point._privelemdict = {
 }
 selection_2d_object._superclassnames = []
 selection_2d_object._privpropdict = {
@@ -607,39 +612,34 @@ window._privpropdict = {
 }
 window._privelemdict = {
 }
-insertion_point._superclassnames = []
+class _3c_(aetools.NComparison):
-insertion_point._privpropdict = {
+	"""< - Less than """
-}
-insertion_point._privelemdict = {
-}
-class starts_with(aetools.NComparison):
-	"""starts with - Starts with """
-class contains(aetools.NComparison):
-	"""contains - Contains """
-class ends_with(aetools.NComparison):
-	"""ends with - Ends with """
 class _3d_(aetools.NComparison):
 	"""= - Equal """
 class _3e_(aetools.NComparison):
 	"""> - Greater than """
-class _b3_(aetools.NComparison):
+class contains(aetools.NComparison):
-	"""\xb3 - Greater than or equal to """
+	"""contains - Contains """
-class _3c_(aetools.NComparison):
+class ends_with(aetools.NComparison):
-	"""< - Less than """
+	"""ends with - Ends with """
+class starts_with(aetools.NComparison):
+	"""starts with - Starts with """
 class _b2_(aetools.NComparison):
 	"""\xb2 - Less than or equal to """
-_Enum_savo = {
+class _b3_(aetools.NComparison):
-	'yes' : 'yes ',	# Save objects now
+	"""\xb3 - Greater than or equal to """
-	'no' : 'no  ',	# Do not save objects
-	'ask' : 'ask ',	# Ask the user whether to save
-}
-
 _Enum_kfrm = {
 	'index' : 'indx',	# keyform designating indexed access
 	'named' : 'name',	# keyform designating named access
 	'id' : 'ID  ',	# keyform designating access by unique identifier
 }
 
+_Enum_savo = {
+	'yes' : 'yes ',	# Save objects now
+	'no' : 'no  ',	# Do not save objects
+	'ask' : 'ask ',	# Ask the user whether to save
+}
+
 _Enum_styl = {
 	'plain' : 'plan',	# Plain
 	'bold' : 'bold',	# Bold

Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py

@@ -15,42 +15,30 @@ class Type_Names_Suite_Events:
 	pass
 
 
-class type_class_info(aetools.ComponentItem):
+class PostScript_picture(aetools.ComponentItem):
-	"""type class info - information about properties and elements of a class """
+	"""PostScript picture -  """
-	want = 'gcli'
+	want = 'EPS '
 
-class type_event_info(aetools.ComponentItem):
+class RGB16_color(aetools.ComponentItem):
-	"""type event info - information about an event """
+	"""RGB16 color -  """
-	want = 'evin'
+	want = 'tr16'
 
-class plain_text(aetools.ComponentItem):
+class RGB96_color(aetools.ComponentItem):
-	"""plain text -  """
+	"""RGB96 color -  """
-	want = 'TEXT'
+	want = 'tr96'
 
-plain_text = plain_text
+class TIFF_picture(aetools.ComponentItem):
-
+	"""TIFF picture -  """
-string = plain_text
+	want = 'TIFF'
-
-class bounding_rectangle(aetools.ComponentItem):
-	"""bounding rectangle - bounding rectangle """
-	want = 'qdrt'
-
-class point(aetools.ComponentItem):
-	"""point - point coordinates """
-	want = 'QDpt'
-
-class fixed(aetools.ComponentItem):
-	"""fixed - a real number """
-	want = 'fixd'
-
-class location_reference(aetools.ComponentItem):
-	"""location reference -  """
-	want = 'insl'
 
 class application_dictionary(aetools.ComponentItem):
 	"""application dictionary -  """
 	want = 'aete'
 
+class bounding_rectangle(aetools.ComponentItem):
+	"""bounding rectangle - bounding rectangle """
+	want = 'qdrt'
+
 class color_table(aetools.ComponentItem):
 	"""color table -  """
 	want = 'clrt'
@@ -67,6 +55,10 @@ class extended_real(aetools.ComponentItem):
 	"""extended real -  """
 	want = 'exte'
 
+class fixed(aetools.ComponentItem):
+	"""fixed - a real number """
+	want = 'fixd'
+
 class fixed_point(aetools.ComponentItem):
 	"""fixed point -  """
 	want = 'fpnt'
@@ -75,6 +67,10 @@ class fixed_rectangle(aetools.ComponentItem):
 	"""fixed rectangle -  """
 	want = 'frct'
 
+class location_reference(aetools.ComponentItem):
+	"""location reference -  """
+	want = 'insl'
+
 class long_fixed(aetools.ComponentItem):
 	"""long fixed -  """
 	want = 'lfxd'
@@ -115,29 +111,15 @@ class pixel_map_record(aetools.ComponentItem):
 	"""pixel map record -  """
 	want = 'tpmm'
 
-class PostScript_picture(aetools.ComponentItem):
+class plain_text(aetools.ComponentItem):
-	"""PostScript picture -  """
+	"""plain text -  """
-	want = 'EPS '
+	want = 'TEXT'
 
-class RGB16_color(aetools.ComponentItem):
+plain_text = plain_text
-	"""RGB16 color -  """
-	want = 'tr16'
 
-class RGB96_color(aetools.ComponentItem):
+class point(aetools.ComponentItem):
-	"""RGB96 color -  """
+	"""point - point coordinates """
-	want = 'tr96'
+	want = 'QDpt'
-
-class small_integer(aetools.ComponentItem):
-	"""small integer -  """
-	want = 'shor'
-
-class small_real(aetools.ComponentItem):
-	"""small real -  """
-	want = 'sing'
-
-class system_dictionary(aetools.ComponentItem):
-	"""system dictionary -  """
-	want = 'aeut'
 
 class rotation(aetools.ComponentItem):
 	"""rotation -  """
@@ -147,82 +129,85 @@ class scrap_styles(aetools.ComponentItem):
 	"""scrap styles -  """
 	want = 'styl'
 
-class TIFF_picture(aetools.ComponentItem):
+class small_integer(aetools.ComponentItem):
-	"""TIFF picture -  """
+	"""small integer -  """
-	want = 'TIFF'
+	want = 'shor'
 
-class version(aetools.ComponentItem):
+class small_real(aetools.ComponentItem):
-	"""version -  """
+	"""small real -  """
-	want = 'vers'
+	want = 'sing'
 
-class unsigned_integer(aetools.ComponentItem):
+string = plain_text
-	"""unsigned integer -  """
-	want = 'magn'
 
-class type_property_info(aetools.ComponentItem):
+class system_dictionary(aetools.ComponentItem):
-	"""type property info -  """
+	"""system dictionary -  """
-	want = 'pinf'
+	want = 'aeut'
+
+class target_id(aetools.ComponentItem):
+	"""target id -  """
+	want = 'targ'
+
+class type_class_info(aetools.ComponentItem):
+	"""type class info - information about properties and elements of a class """
+	want = 'gcli'
 
 class type_element_info(aetools.ComponentItem):
 	"""type element info -  """
 	want = 'elin'
 
+class type_event_info(aetools.ComponentItem):
+	"""type event info - information about an event """
+	want = 'evin'
+
 class type_parameter_info(aetools.ComponentItem):
 	"""type parameter info -  """
 	want = 'pmin'
 
+class type_property_info(aetools.ComponentItem):
+	"""type property info -  """
+	want = 'pinf'
+
 class type_suite_info(aetools.ComponentItem):
 	"""type suite info -  """
 	want = 'suin'
 
-class target_id(aetools.ComponentItem):
+class unsigned_integer(aetools.ComponentItem):
-	"""target id -  """
+	"""unsigned integer -  """
-	want = 'targ'
+	want = 'magn'
-type_class_info._superclassnames = []
+
-type_class_info._privpropdict = {
+class version(aetools.ComponentItem):
+	"""version -  """
+	want = 'vers'
+PostScript_picture._superclassnames = []
+PostScript_picture._privpropdict = {
 }
-type_class_info._privelemdict = {
+PostScript_picture._privelemdict = {
 }
-type_event_info._superclassnames = []
+RGB16_color._superclassnames = []
-type_event_info._privpropdict = {
+RGB16_color._privpropdict = {
 }
-type_event_info._privelemdict = {
+RGB16_color._privelemdict = {
 }
-plain_text._superclassnames = []
+RGB96_color._superclassnames = []
-plain_text._privpropdict = {
+RGB96_color._privpropdict = {
 }
-plain_text._privelemdict = {
+RGB96_color._privelemdict = {
 }
-plain_text._superclassnames = []
+TIFF_picture._superclassnames = []
-plain_text._privpropdict = {
+TIFF_picture._privpropdict = {
 }
-plain_text._privelemdict = {
+TIFF_picture._privelemdict = {
-}
-bounding_rectangle._superclassnames = []
-bounding_rectangle._privpropdict = {
-}
-bounding_rectangle._privelemdict = {
-}
-point._superclassnames = []
-point._privpropdict = {
-}
-point._privelemdict = {
-}
-fixed._superclassnames = []
-fixed._privpropdict = {
-}
-fixed._privelemdict = {
-}
-location_reference._superclassnames = []
-location_reference._privpropdict = {
-}
-location_reference._privelemdict = {
 }
 application_dictionary._superclassnames = []
 application_dictionary._privpropdict = {
 }
 application_dictionary._privelemdict = {
 }
+bounding_rectangle._superclassnames = []
+bounding_rectangle._privpropdict = {
+}
+bounding_rectangle._privelemdict = {
+}
 color_table._superclassnames = []
 color_table._privpropdict = {
 }
@@ -243,6 +228,11 @@ extended_real._privpropdict = {
 }
 extended_real._privelemdict = {
 }
+fixed._superclassnames = []
+fixed._privpropdict = {
+}
+fixed._privelemdict = {
+}
 fixed_point._superclassnames = []
 fixed_point._privpropdict = {
 }
@@ -253,6 +243,11 @@ fixed_rectangle._privpropdict = {
 }
 fixed_rectangle._privelemdict = {
 }
+location_reference._superclassnames = []
+location_reference._privpropdict = {
+}
+location_reference._privelemdict = {
+}
 long_fixed._superclassnames = []
 long_fixed._privpropdict = {
 }
@@ -303,20 +298,30 @@ pixel_map_record._privpropdict = {
 }
 pixel_map_record._privelemdict = {
 }
-PostScript_picture._superclassnames = []
+plain_text._superclassnames = []
-PostScript_picture._privpropdict = {
+plain_text._privpropdict = {
 }
-PostScript_picture._privelemdict = {
+plain_text._privelemdict = {
 }
-RGB16_color._superclassnames = []
+plain_text._superclassnames = []
-RGB16_color._privpropdict = {
+plain_text._privpropdict = {
 }
-RGB16_color._privelemdict = {
+plain_text._privelemdict = {
 }
-RGB96_color._superclassnames = []
+point._superclassnames = []
-RGB96_color._privpropdict = {
+point._privpropdict = {
 }
-RGB96_color._privelemdict = {
+point._privelemdict = {
+}
+rotation._superclassnames = []
+rotation._privpropdict = {
+}
+rotation._privelemdict = {
+}
+scrap_styles._superclassnames = []
+scrap_styles._privpropdict = {
+}
+scrap_styles._privelemdict = {
 }
 small_integer._superclassnames = []
 small_integer._privpropdict = {
@@ -333,55 +338,50 @@ system_dictionary._privpropdict = {
 }
 system_dictionary._privelemdict = {
 }
-rotation._superclassnames = []
+target_id._superclassnames = []
-rotation._privpropdict = {
+target_id._privpropdict = {
 }
-rotation._privelemdict = {
+target_id._privelemdict = {
 }
-scrap_styles._superclassnames = []
+type_class_info._superclassnames = []
-scrap_styles._privpropdict = {
+type_class_info._privpropdict = {
 }
-scrap_styles._privelemdict = {
+type_class_info._privelemdict = {
-}
-TIFF_picture._superclassnames = []
-TIFF_picture._privpropdict = {
-}
-TIFF_picture._privelemdict = {
-}
-version._superclassnames = []
-version._privpropdict = {
-}
-version._privelemdict = {
-}
-unsigned_integer._superclassnames = []
-unsigned_integer._privpropdict = {
-}
-unsigned_integer._privelemdict = {
-}
-type_property_info._superclassnames = []
-type_property_info._privpropdict = {
-}
-type_property_info._privelemdict = {
 }
 type_element_info._superclassnames = []
 type_element_info._privpropdict = {
 }
 type_element_info._privelemdict = {
 }
+type_event_info._superclassnames = []
+type_event_info._privpropdict = {
+}
+type_event_info._privelemdict = {
+}
 type_parameter_info._superclassnames = []
 type_parameter_info._privpropdict = {
 }
 type_parameter_info._privelemdict = {
 }
+type_property_info._superclassnames = []
+type_property_info._privpropdict = {
+}
+type_property_info._privelemdict = {
+}
 type_suite_info._superclassnames = []
 type_suite_info._privpropdict = {
 }
 type_suite_info._privelemdict = {
 }
-target_id._superclassnames = []
+unsigned_integer._superclassnames = []
-target_id._privpropdict = {
+unsigned_integer._privpropdict = {
 }
-target_id._privelemdict = {
+unsigned_integer._privelemdict = {
+}
+version._superclassnames = []
+version._privpropdict = {
+}
+version._privelemdict = {
 }
 
 #
@@ -394,7 +394,7 @@ _classdeclarations = {
 	'aeut' : system_dictionary,
 	'clrt' : color_table,
 	'fpnt' : fixed_point,
-	'TEXT' : plain_text,
+	'TIFF' : TIFF_picture,
 	'elin' : type_element_info,
 	'insl' : location_reference,
 	'mLoc' : machine_location,
@@ -403,24 +403,24 @@ _classdeclarations = {
 	'cmen' : menu_item,
 	'tpmm' : pixel_map_record,
 	'aete' : application_dictionary,
+	'TEXT' : plain_text,
 	'magn' : unsigned_integer,
 	'cmnu' : menu,
 	'frct' : fixed_rectangle,
+	'pinf' : type_property_info,
 	'lfrc' : long_fixed_rectangle,
 	'evin' : type_event_info,
 	'sing' : small_real,
 	'suin' : type_suite_info,
 	'trot' : rotation,
-	'pmin' : type_parameter_info,
 	'fixd' : fixed,
 	'styl' : scrap_styles,
 	'lpnt' : long_point,
 	'gcli' : type_class_info,
-	'TIFF' : TIFF_picture,
 	'tr96' : RGB96_color,
 	'tdas' : dash_style,
 	'exte' : extended_real,
-	'pinf' : type_property_info,
+	'pmin' : type_parameter_info,
 	'lfpt' : long_fixed_point,
 	'lrct' : long_rectangle,
 	'qdrt' : bounding_rectangle,

Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py

@@ -4,51 +4,51 @@ Resource aeut resid 0 Standard Event Suites for English
 """
 import aetools
 Error = aetools.Error
-import AppleScript_Suite
-import Required_Suite
-import Standard_Suite
 import Text_Suite
+import AppleScript_Suite
+import Standard_Suite
+import Macintosh_Connectivity_Clas
 import QuickDraw_Graphics_Suite
 import QuickDraw_Graphics_Suppleme
+import Required_Suite
 import Table_Suite
-import Macintosh_Connectivity_Clas
 import Type_Names_Suite
 
 
 _code_to_module = {
-	'ascr' : AppleScript_Suite,
-	'reqd' : Required_Suite,
-	'core' : Standard_Suite,
 	'TEXT' : Text_Suite,
+	'ascr' : AppleScript_Suite,
+	'core' : Standard_Suite,
+	'macc' : Macintosh_Connectivity_Clas,
 	'qdrw' : QuickDraw_Graphics_Suite,
 	'qdsp' : QuickDraw_Graphics_Suppleme,
+	'reqd' : Required_Suite,
 	'tbls' : Table_Suite,
-	'macc' : Macintosh_Connectivity_Clas,
 	'tpnm' : Type_Names_Suite,
 }
 
 
 
 _code_to_fullname = {
-	'ascr' : ('StdSuites.AppleScript_Suite', 'AppleScript_Suite'),
-	'reqd' : ('StdSuites.Required_Suite', 'Required_Suite'),
-	'core' : ('StdSuites.Standard_Suite', 'Standard_Suite'),
 	'TEXT' : ('StdSuites.Text_Suite', 'Text_Suite'),
+	'ascr' : ('StdSuites.AppleScript_Suite', 'AppleScript_Suite'),
+	'core' : ('StdSuites.Standard_Suite', 'Standard_Suite'),
+	'macc' : ('StdSuites.Macintosh_Connectivity_Clas', 'Macintosh_Connectivity_Clas'),
 	'qdrw' : ('StdSuites.QuickDraw_Graphics_Suite', 'QuickDraw_Graphics_Suite'),
 	'qdsp' : ('StdSuites.QuickDraw_Graphics_Suppleme', 'QuickDraw_Graphics_Suppleme'),
+	'reqd' : ('StdSuites.Required_Suite', 'Required_Suite'),
 	'tbls' : ('StdSuites.Table_Suite', 'Table_Suite'),
-	'macc' : ('StdSuites.Macintosh_Connectivity_Clas', 'Macintosh_Connectivity_Clas'),
 	'tpnm' : ('StdSuites.Type_Names_Suite', 'Type_Names_Suite'),
 }
 
-from AppleScript_Suite import *
-from Required_Suite import *
-from Standard_Suite import *
 from Text_Suite import *
+from AppleScript_Suite import *
+from Standard_Suite import *
+from Macintosh_Connectivity_Clas import *
 from QuickDraw_Graphics_Suite import *
 from QuickDraw_Graphics_Suppleme import *
+from Required_Suite import *
 from Table_Suite import *
-from Macintosh_Connectivity_Clas import *
 from Type_Names_Suite import *
 
 def getbaseclasses(v):
@@ -68,6 +68,91 @@ import StdSuites
 #
 # Set property and element dictionaries now that all classes have been defined
 #
+getbaseclasses(window)
+getbaseclasses(file)
+getbaseclasses(selection_2d_object)
+getbaseclasses(alias)
+getbaseclasses(application)
+getbaseclasses(insertion_point)
+getbaseclasses(document)
+getbaseclasses(small_integer)
+getbaseclasses(RGB16_color)
+getbaseclasses(version)
+getbaseclasses(system_dictionary)
+getbaseclasses(color_table)
+getbaseclasses(fixed_point)
+getbaseclasses(plain_text)
+getbaseclasses(type_element_info)
+getbaseclasses(location_reference)
+getbaseclasses(machine_location)
+getbaseclasses(PostScript_picture)
+getbaseclasses(point)
+getbaseclasses(menu_item)
+getbaseclasses(pixel_map_record)
+getbaseclasses(application_dictionary)
+getbaseclasses(unsigned_integer)
+getbaseclasses(menu)
+getbaseclasses(fixed_rectangle)
+getbaseclasses(long_fixed_rectangle)
+getbaseclasses(type_event_info)
+getbaseclasses(small_real)
+getbaseclasses(type_suite_info)
+getbaseclasses(rotation)
+getbaseclasses(type_parameter_info)
+getbaseclasses(fixed)
+getbaseclasses(scrap_styles)
+getbaseclasses(long_point)
+getbaseclasses(type_class_info)
+getbaseclasses(TIFF_picture)
+getbaseclasses(RGB96_color)
+getbaseclasses(dash_style)
+getbaseclasses(extended_real)
+getbaseclasses(type_property_info)
+getbaseclasses(long_fixed_point)
+getbaseclasses(long_rectangle)
+getbaseclasses(bounding_rectangle)
+getbaseclasses(double_integer)
+getbaseclasses(long_fixed)
+getbaseclasses(null)
+getbaseclasses(target_id)
+getbaseclasses(paragraph)
+getbaseclasses(character)
+getbaseclasses(text_flow)
+getbaseclasses(text_style_info)
+getbaseclasses(line)
+getbaseclasses(word)
+getbaseclasses(text)
+getbaseclasses(graphic_group)
+getbaseclasses(oval)
+getbaseclasses(graphic_text)
+getbaseclasses(graphic_shape)
+getbaseclasses(graphic_line)
+getbaseclasses(graphic_object)
+getbaseclasses(drawing_area)
+getbaseclasses(polygon)
+getbaseclasses(pixel)
+getbaseclasses(rounded_rectangle)
+getbaseclasses(arc)
+getbaseclasses(pixel_map)
+getbaseclasses(rectangle)
+getbaseclasses(graphic_group)
+getbaseclasses(drawing_area)
+getbaseclasses(cell)
+getbaseclasses(column)
+getbaseclasses(table)
+getbaseclasses(row)
+getbaseclasses(AppleTalk_address)
+getbaseclasses(address_specification)
+getbaseclasses(Token_Ring_address)
+getbaseclasses(FireWire_address)
+getbaseclasses(bus_slot)
+getbaseclasses(SCSI_address)
+getbaseclasses(ADB_address)
+getbaseclasses(USB_address)
+getbaseclasses(device_specification)
+getbaseclasses(LocalTalk_address)
+getbaseclasses(IP_address)
+getbaseclasses(Ethernet_address)
 getbaseclasses(July)
 getbaseclasses(May)
 getbaseclasses(string)
@@ -173,96 +258,96 @@ getbaseclasses(Saturday)
 getbaseclasses(September)
 getbaseclasses(file_specification)
 getbaseclasses(text)
-getbaseclasses(window)
-getbaseclasses(file)
-getbaseclasses(selection_2d_object)
-getbaseclasses(alias)
-getbaseclasses(application)
-getbaseclasses(insertion_point)
-getbaseclasses(document)
-getbaseclasses(paragraph)
-getbaseclasses(character)
-getbaseclasses(text_flow)
-getbaseclasses(text_style_info)
-getbaseclasses(line)
-getbaseclasses(word)
-getbaseclasses(text)
-getbaseclasses(graphic_group)
-getbaseclasses(oval)
-getbaseclasses(graphic_text)
-getbaseclasses(graphic_shape)
-getbaseclasses(graphic_line)
-getbaseclasses(graphic_object)
-getbaseclasses(drawing_area)
-getbaseclasses(polygon)
-getbaseclasses(pixel)
-getbaseclasses(rounded_rectangle)
-getbaseclasses(arc)
-getbaseclasses(pixel_map)
-getbaseclasses(rectangle)
-getbaseclasses(graphic_group)
-getbaseclasses(drawing_area)
-getbaseclasses(cell)
-getbaseclasses(column)
-getbaseclasses(table)
-getbaseclasses(row)
-getbaseclasses(AppleTalk_address)
-getbaseclasses(address_specification)
-getbaseclasses(Token_Ring_address)
-getbaseclasses(FireWire_address)
-getbaseclasses(bus_slot)
-getbaseclasses(SCSI_address)
-getbaseclasses(ADB_address)
-getbaseclasses(USB_address)
-getbaseclasses(device_specification)
-getbaseclasses(LocalTalk_address)
-getbaseclasses(IP_address)
-getbaseclasses(Ethernet_address)
-getbaseclasses(small_integer)
-getbaseclasses(RGB16_color)
-getbaseclasses(version)
-getbaseclasses(system_dictionary)
-getbaseclasses(color_table)
-getbaseclasses(fixed_point)
-getbaseclasses(plain_text)
-getbaseclasses(type_element_info)
-getbaseclasses(location_reference)
-getbaseclasses(machine_location)
-getbaseclasses(PostScript_picture)
-getbaseclasses(point)
-getbaseclasses(menu_item)
-getbaseclasses(pixel_map_record)
-getbaseclasses(application_dictionary)
-getbaseclasses(unsigned_integer)
-getbaseclasses(menu)
-getbaseclasses(fixed_rectangle)
-getbaseclasses(long_fixed_rectangle)
-getbaseclasses(type_event_info)
-getbaseclasses(small_real)
-getbaseclasses(type_suite_info)
-getbaseclasses(rotation)
-getbaseclasses(type_parameter_info)
-getbaseclasses(fixed)
-getbaseclasses(scrap_styles)
-getbaseclasses(long_point)
-getbaseclasses(type_class_info)
-getbaseclasses(TIFF_picture)
-getbaseclasses(RGB96_color)
-getbaseclasses(dash_style)
-getbaseclasses(extended_real)
-getbaseclasses(type_property_info)
-getbaseclasses(long_fixed_point)
-getbaseclasses(long_rectangle)
-getbaseclasses(bounding_rectangle)
-getbaseclasses(double_integer)
-getbaseclasses(long_fixed)
-getbaseclasses(null)
-getbaseclasses(target_id)
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
+	'cwin' : window,
+	'file' : file,
+	'csel' : selection_2d_object,
+	'alis' : alias,
+	'capp' : application,
+	'cins' : insertion_point,
+	'docu' : document,
+	'shor' : small_integer,
+	'tr16' : RGB16_color,
+	'vers' : version,
+	'aeut' : system_dictionary,
+	'clrt' : color_table,
+	'fpnt' : fixed_point,
+	'TEXT' : plain_text,
+	'elin' : type_element_info,
+	'insl' : location_reference,
+	'mLoc' : machine_location,
+	'EPS ' : PostScript_picture,
+	'QDpt' : point,
+	'cmen' : menu_item,
+	'tpmm' : pixel_map_record,
+	'aete' : application_dictionary,
+	'magn' : unsigned_integer,
+	'cmnu' : menu,
+	'frct' : fixed_rectangle,
+	'lfrc' : long_fixed_rectangle,
+	'evin' : type_event_info,
+	'sing' : small_real,
+	'suin' : type_suite_info,
+	'trot' : rotation,
+	'pmin' : type_parameter_info,
+	'fixd' : fixed,
+	'styl' : scrap_styles,
+	'lpnt' : long_point,
+	'gcli' : type_class_info,
+	'TIFF' : TIFF_picture,
+	'tr96' : RGB96_color,
+	'tdas' : dash_style,
+	'exte' : extended_real,
+	'pinf' : type_property_info,
+	'lfpt' : long_fixed_point,
+	'lrct' : long_rectangle,
+	'qdrt' : bounding_rectangle,
+	'comp' : double_integer,
+	'lfxd' : long_fixed,
+	'null' : null,
+	'targ' : target_id,
+	'cpar' : paragraph,
+	'cha ' : character,
+	'cflo' : text_flow,
+	'tsty' : text_style_info,
+	'clin' : line,
+	'cwor' : word,
+	'ctxt' : text,
+	'cpic' : graphic_group,
+	'covl' : oval,
+	'cgtx' : graphic_text,
+	'cgsh' : graphic_shape,
+	'glin' : graphic_line,
+	'cgob' : graphic_object,
+	'cdrw' : drawing_area,
+	'cpgn' : polygon,
+	'cpxl' : pixel,
+	'crrc' : rounded_rectangle,
+	'carc' : arc,
+	'cpix' : pixel_map,
+	'crec' : rectangle,
+	'cpic' : graphic_group,
+	'cdrw' : drawing_area,
+	'ccel' : cell,
+	'ccol' : column,
+	'ctbl' : table,
+	'crow' : row,
+	'cat ' : AppleTalk_address,
+	'cadr' : address_specification,
+	'ctok' : Token_Ring_address,
+	'cfw ' : FireWire_address,
+	'cbus' : bus_slot,
+	'cscs' : SCSI_address,
+	'cadb' : ADB_address,
+	'cusb' : USB_address,
+	'cdev' : device_specification,
+	'clt ' : LocalTalk_address,
+	'cip ' : IP_address,
+	'cen ' : Ethernet_address,
 	'jul ' : July,
 	'may ' : May,
 	'TEXT' : string,
@@ -368,102 +453,17 @@ _classdeclarations = {
 	'sep ' : September,
 	'fss ' : file_specification,
 	'ctxt' : text,
-	'cwin' : window,
-	'file' : file,
-	'csel' : selection_2d_object,
-	'alis' : alias,
-	'capp' : application,
-	'cins' : insertion_point,
-	'docu' : document,
-	'cpar' : paragraph,
-	'cha ' : character,
-	'cflo' : text_flow,
-	'tsty' : text_style_info,
-	'clin' : line,
-	'cwor' : word,
-	'ctxt' : text,
-	'cpic' : graphic_group,
-	'covl' : oval,
-	'cgtx' : graphic_text,
-	'cgsh' : graphic_shape,
-	'glin' : graphic_line,
-	'cgob' : graphic_object,
-	'cdrw' : drawing_area,
-	'cpgn' : polygon,
-	'cpxl' : pixel,
-	'crrc' : rounded_rectangle,
-	'carc' : arc,
-	'cpix' : pixel_map,
-	'crec' : rectangle,
-	'cpic' : graphic_group,
-	'cdrw' : drawing_area,
-	'ccel' : cell,
-	'ccol' : column,
-	'ctbl' : table,
-	'crow' : row,
-	'cat ' : AppleTalk_address,
-	'cadr' : address_specification,
-	'ctok' : Token_Ring_address,
-	'cfw ' : FireWire_address,
-	'cbus' : bus_slot,
-	'cscs' : SCSI_address,
-	'cadb' : ADB_address,
-	'cusb' : USB_address,
-	'cdev' : device_specification,
-	'clt ' : LocalTalk_address,
-	'cip ' : IP_address,
-	'cen ' : Ethernet_address,
-	'shor' : small_integer,
-	'tr16' : RGB16_color,
-	'vers' : version,
-	'aeut' : system_dictionary,
-	'clrt' : color_table,
-	'fpnt' : fixed_point,
-	'TEXT' : plain_text,
-	'elin' : type_element_info,
-	'insl' : location_reference,
-	'mLoc' : machine_location,
-	'EPS ' : PostScript_picture,
-	'QDpt' : point,
-	'cmen' : menu_item,
-	'tpmm' : pixel_map_record,
-	'aete' : application_dictionary,
-	'magn' : unsigned_integer,
-	'cmnu' : menu,
-	'frct' : fixed_rectangle,
-	'lfrc' : long_fixed_rectangle,
-	'evin' : type_event_info,
-	'sing' : small_real,
-	'suin' : type_suite_info,
-	'trot' : rotation,
-	'pmin' : type_parameter_info,
-	'fixd' : fixed,
-	'styl' : scrap_styles,
-	'lpnt' : long_point,
-	'gcli' : type_class_info,
-	'TIFF' : TIFF_picture,
-	'tr96' : RGB96_color,
-	'tdas' : dash_style,
-	'exte' : extended_real,
-	'pinf' : type_property_info,
-	'lfpt' : long_fixed_point,
-	'lrct' : long_rectangle,
-	'qdrt' : bounding_rectangle,
-	'comp' : double_integer,
-	'lfxd' : long_fixed,
-	'null' : null,
-	'targ' : target_id,
 }
 
 
-class StdSuites(AppleScript_Suite_Events,
+class StdSuites(Text_Suite_Events,
-		Required_Suite_Events,
+		AppleScript_Suite_Events,
 		Standard_Suite_Events,
-		Text_Suite_Events,
+		Macintosh_Connectivity_Clas_Events,
 		QuickDraw_Graphics_Suite_Events,
 		QuickDraw_Graphics_Suppleme_Events,
+		Required_Suite_Events,
 		Table_Suite_Events,
-		Macintosh_Connectivity_Clas_Events,
 		Type_Names_Suite_Events,
 		aetools.TalkTo):
 	_signature = 'ascr'

Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py

@@ -12,44 +12,6 @@ _code = 'trmx'
 
 class Terminal_Suite_Events:
 
-	def run(self, _no_object=None, _attributes={}, **_arguments):
-		"""run: Run the Terminal application
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'oapp'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def quit(self, _no_object=None, _attributes={}, **_arguments):
-		"""quit: Quit the Terminal application
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'quit'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
 	def count(self, _object=None, _attributes={}, **_arguments):
 		"""count: Return the number of elements of a particular class within an object
 		Required argument: a reference to the objects to be counted
@@ -90,6 +52,44 @@ class Terminal_Suite_Events:
 		_arguments['----'] = _object
 
 
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def quit(self, _no_object=None, _attributes={}, **_arguments):
+		"""quit: Quit the Terminal application
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'quit'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def run(self, _no_object=None, _attributes={}, **_arguments):
+		"""run: Run the Terminal application
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'aevt'
+		_subcode = 'oapp'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
 		if _arguments.get('errn', 0):

Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py

@@ -4,24 +4,24 @@ Resource aete resid 0 Terminal Terminology
 """
 import aetools
 Error = aetools.Error
-import Terminal_Suite
 import Invisible_Suite
+import Terminal_Suite
 
 
 _code_to_module = {
-	'trmx' : Terminal_Suite,
 	'tpnm' : Invisible_Suite,
+	'trmx' : Terminal_Suite,
 }
 
 
 
 _code_to_fullname = {
-	'trmx' : ('Terminal.Terminal_Suite', 'Terminal_Suite'),
 	'tpnm' : ('Terminal.Invisible_Suite', 'Invisible_Suite'),
+	'trmx' : ('Terminal.Terminal_Suite', 'Terminal_Suite'),
 }
 
-from Terminal_Suite import *
 from Invisible_Suite import *
+from Terminal_Suite import *
 
 def getbaseclasses(v):
 	if not getattr(v, '_propdict', None):
@@ -42,7 +42,6 @@ import StdSuites
 #
 getbaseclasses(window)
 getbaseclasses(application)
-getbaseclasses(application)
 getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
 getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
 getbaseclasses(StdSuites.Type_Names_Suite.system_dictionary)
@@ -83,6 +82,7 @@ getbaseclasses(StdSuites.Type_Names_Suite.null)
 getbaseclasses(StdSuites.Type_Names_Suite.target_id)
 getbaseclasses(StdSuites.Type_Names_Suite.point)
 getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
+getbaseclasses(application)
 
 #
 # Indices of types declared in this module
@@ -90,7 +90,6 @@ getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
 _classdeclarations = {
 	'cwin' : window,
 	'capp' : application,
-	'capp' : application,
 	'shor' : StdSuites.Type_Names_Suite.small_integer,
 	'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
 	'aeut' : StdSuites.Type_Names_Suite.system_dictionary,
@@ -131,11 +130,12 @@ _classdeclarations = {
 	'targ' : StdSuites.Type_Names_Suite.target_id,
 	'QDpt' : StdSuites.Type_Names_Suite.point,
 	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
+	'capp' : application,
 }
 
 
-class Terminal(Terminal_Suite_Events,
+class Terminal(Invisible_Suite_Events,
-		Invisible_Suite_Events,
+		Terminal_Suite_Events,
 		aetools.TalkTo):
 	_signature = 'trmx'