[Python-checkins] python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites AppleScript_Suite.py,1.2,1.3 Macintosh_Connectivity_Clas.py,1.2,1.3 QuickDraw_Graphics_Suite.py,1.2,1.3 Standard_Suite.py,1.2,1.3 Type_Names_Suite.py,1.2,1.3 __init__.py,1.2,1.3

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Fri, 28 Mar 2003 14:07:24 -0800


Update of /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites
In directory sc8-pr-cvs1:/tmp/cvs-serv21742/StdSuites

Modified Files:
	AppleScript_Suite.py Macintosh_Connectivity_Clas.py 
	QuickDraw_Graphics_Suite.py Standard_Suite.py 
	Type_Names_Suite.py __init__.py 
Log Message:
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.


Index: AppleScript_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AppleScript_Suite.py	23 Mar 2003 22:07:28 -0000	1.2
--- AppleScript_Suite.py	28 Mar 2003 22:07:20 -0000	1.3
***************
*** 13,42 ****
  class AppleScript_Suite_Events:
  
! 	def activate(self, _no_object=None, _attributes={}, **_arguments):
! 		"""activate: Bring the targeted application program to the front
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'misc'
! 		_subcode = 'actv'
! 
! 		if _arguments: raise TypeError, 'No optional args expected'
[...3617 lines suppressed...]
  	'wkdy' : weekday,
***************
*** 2155,2162 ****
  	'tab ' : tab,
  	'tstr' : time_string,
- 	'pi  ' : pi,
- 	'ret ' : return_,
  	'plcd' : language_code,
  	'kMsg' : key,
  	'spac' : space,
  	'days' : days,
--- 2155,2162 ----
  	'tab ' : tab,
  	'tstr' : time_string,
  	'plcd' : language_code,
+ 	'ret ' : return_,
  	'kMsg' : key,
+ 	'hour' : hours,
  	'spac' : space,
  	'days' : days,

Index: Macintosh_Connectivity_Clas.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Macintosh_Connectivity_Clas.py	23 Mar 2003 22:07:28 -0000	1.2
--- Macintosh_Connectivity_Clas.py	28 Mar 2003 22:07:21 -0000	1.3
***************
*** 16,51 ****
  
  
- 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 """
--- 16,19 ----
***************
*** 80,89 ****
  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 """
--- 48,51 ----
***************
*** 150,156 ****
  Token_Ring_addresses = Token_Ring_address
  
! class USB_address(aetools.ComponentItem):
! 	"""USB address - Addresses a device on the Universal Serial Bus """
  	want = 'cusb'
  class name(aetools.NProperty):
  	"""name - the USB device name """
--- 112,120 ----
  Token_Ring_addresses = Token_Ring_address
  
! class USB_Addresses(aetools.ComponentItem):
! 	"""USB Addresses -  """
  	want = 'cusb'
+ 
+ USB_address = USB_Addresses
  class name(aetools.NProperty):
  	"""name - the USB device name """
***************
*** 158,178 ****
  	want = 'TEXT'
  
! USB_Addresses = USB_address
! device_specification._superclassnames = []
! device_specification._privpropdict = {
! 	'properties' : properties,
! 	'device_type' : device_type,
! 	'device_address' : device_address,
! }
! device_specification._privelemdict = {
! }
! address_specification._superclassnames = []
! address_specification._privpropdict = {
! 	'properties' : properties,
! 	'conduit' : conduit,
! 	'protocol' : protocol,
! }
! address_specification._privelemdict = {
! }
  ADB_address._superclassnames = ['address_specification']
  ADB_address._privpropdict = {
--- 122,162 ----
  	want = 'TEXT'
  
! class address_specification(aetools.ComponentItem):
! 	"""address specification - Unique designation of a device or service connected to this computer """
! 	want = 'cadr'
! class properties(aetools.NProperty):
! 	"""properties - property that allows getting and setting of multiple properties """
! 	which = 'pALL'
! 	want = 'reco'
! 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 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 = {
***************
*** 191,201 ****
  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 = {
--- 175,178 ----
***************
*** 246,279 ****
  Token_Ring_address._privelemdict = {
  }
! USB_address._superclassnames = ['address_specification']
! USB_address._privpropdict = {
  	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
! 	'name' : name,
  }
! USB_address._privelemdict = {
  }
! _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_econ = {
  	'ADB' : 'eadb',	# 
--- 223,254 ----
  Token_Ring_address._privelemdict = {
  }
! USB_Addresses._superclassnames = []
! 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_,
! 	'ID' : ID,
  }
! bus_slot._privelemdict = {
  }
! device_specification._superclassnames = []
! device_specification._privpropdict = {
! 	'properties' : properties,
! 	'device_type' : device_type,
! 	'device_address' : device_address,
! }
! device_specification._privelemdict = {
  }
  _Enum_econ = {
  	'ADB' : 'eadb',	# 
***************
*** 302,305 ****
--- 277,303 ----
  }
  
+ _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',	# 
***************
*** 336,343 ****
  	'cscs' : SCSI_address,
  	'cadb' : ADB_address,
! 	'cusb' : USB_address,
! 	'cdev' : device_specification,
! 	'clt ' : LocalTalk_address,
  	'cip ' : IP_address,
  	'cen ' : Ethernet_address,
  }
--- 334,341 ----
  	'cscs' : SCSI_address,
  	'cadb' : ADB_address,
! 	'cusb' : USB_Addresses,
  	'cip ' : IP_address,
+ 	'clt ' : LocalTalk_address,
+ 	'cdev' : device_specification,
  	'cen ' : Ethernet_address,
  }
***************
*** 345,349 ****
  _propdeclarations = {
  	'pdns' : DNS_form,
! 	'ppor' : port,
  	'patt' : AppleTalk_type,
  	'pprt' : protocol,
--- 343,347 ----
  _propdeclarations = {
  	'pdns' : DNS_form,
! 	'pdva' : device_address,
  	'patt' : AppleTalk_type,
  	'pprt' : protocol,
***************
*** 356,363 ****
  	'ID  ' : ID,
  	'pALL' : properties,
  	'pscb' : SCSI_bus,
! 	'pdva' : device_address,
  	'patm' : AppleTalk_machine,
- 	'psoc' : socket,
  	'pslu' : LUN,
  	'pnod' : node,
--- 354,361 ----
  	'ID  ' : ID,
  	'pALL' : properties,
+ 	'psoc' : socket,
  	'pscb' : SCSI_bus,
! 	'ppor' : port,
  	'patm' : AppleTalk_machine,
  	'pslu' : LUN,
  	'pnod' : node,

Index: QuickDraw_Graphics_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QuickDraw_Graphics_Suite.py	23 Mar 2003 22:07:28 -0000	1.2
--- QuickDraw_Graphics_Suite.py	28 Mar 2003 22:07:21 -0000	1.3
***************
*** 120,123 ****
--- 120,129 ----
  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 """
***************
*** 174,183 ****
  	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 """
--- 180,183 ----
***************
*** 190,195 ****
  	want = 'cpxl'
  
- pixels = pixel
- 
  class pixel_map(aetools.ComponentItem):
  	"""pixel map - A pixel map """
--- 190,193 ----
***************
*** 198,201 ****
--- 196,201 ----
  pixel_maps = pixel_map
  
+ pixels = pixel
+ 
  class polygon(aetools.ComponentItem):
  	"""polygon - A polygon """
***************
*** 260,263 ****
--- 260,268 ----
  drawing_area._privelemdict = {
  }
+ graphic_group._superclassnames = []
+ graphic_group._privpropdict = {
+ }
+ graphic_group._privelemdict = {
+ }
  graphic_line._superclassnames = []
  graphic_line._privpropdict = {
***************
*** 288,296 ****
  graphic_text._privelemdict = {
  }
- graphic_group._superclassnames = []
- graphic_group._privpropdict = {
- }
- graphic_group._privelemdict = {
- }
  oval._superclassnames = []
  oval._privpropdict = {
--- 293,296 ----
***************
*** 327,330 ****
--- 327,337 ----
  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 ',	# 
***************
*** 343,353 ****
  	'ad_min_pixels' : 'admn',	# 
  	'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
  }
  
--- 350,353 ----

Index: Standard_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Standard_Suite.py	23 Mar 2003 22:07:28 -0000	1.2
--- Standard_Suite.py	28 Mar 2003 22:07:21 -0000	1.3
***************
*** 14,111 ****
  class Standard_Suite_Events(builtin_Suite_Events):
  
! 	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 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):
! 		"""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,
--- 14,34 ----
  class Standard_Suite_Events(builtin_Suite_Events):
  
! 	_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,
***************
*** 171,174 ****
--- 94,123 ----
  			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):
+ 			raise aetools.Error, aetools.decodeerror(_arguments)
+ 		# XXXX Optionally decode result
+ 		if _arguments.has_key('----'):
+ 			return _arguments['----']
+ 
  	def delete(self, _object, _attributes={}, **_arguments):
  		"""delete: Delete an object from its container. Note this does not work on script variables, only on elements of application classes.
***************
*** 219,222 ****
--- 168,197 ----
  			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):
+ 			raise aetools.Error, aetools.decodeerror(_arguments)
+ 		# XXXX Optionally decode result
+ 		if _arguments.has_key('----'):
+ 			return _arguments['----']
+ 
  	def exists(self, _object, _attributes={}, **_arguments):
  		"""exists: Verify if an object exists
***************
*** 297,316 ****
  			return _arguments['----']
  
! 	_argmap_save = {
! 		'in_' : 'kfil',
! 		'as' : 'fltp',
! 	}
! 
! 	def save(self, _object, _attributes={}, **_arguments):
! 		"""save: Save an object
! 		Required argument: the object to save, usually a document or window
! 		Keyword argument in_: the file or alias in which to save the object
! 		Keyword argument as: the file type of the document in which to save the data
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		"""
! 		_code = 'core'
! 		_subcode = 'save'
  
! 		aetools.keysubst(_arguments, self._argmap_save)
  		_arguments['----'] = _object
  
--- 272,284 ----
  			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
  
***************
*** 324,334 ****
  			return _arguments['----']
  
! 	def select(self, _object, _attributes={}, **_arguments):
! 		"""select: Make a selection
! 		Required argument: the object to select
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		"""
! 		_code = 'misc'
! 		_subcode = 'slct'
  
  		if _arguments: raise TypeError, 'No optional args expected'
--- 292,302 ----
  			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'
***************
*** 344,364 ****
  			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,
--- 312,331 ----
  			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,
***************
*** 370,389 ****
  			return _arguments['----']
  
! 	_argmap_suite_info = {
! 		'in_' : 'wrcd',
! 	}
  
! 	def suite_info(self, _object, _attributes={}, **_arguments):
! 		"""suite info: (optional) Get information about event suite(s)
! 		Required argument: the suite 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 suites and their versions
  		"""
! 		_code = 'core'
! 		_subcode = 'gtsi'
  
! 		aetools.keysubst(_arguments, self._argmap_suite_info)
! 		_arguments['----'] = _object
  
  
--- 337,368 ----
  			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'
  
  
***************
*** 396,414 ****
  			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
  
--- 375,394 ----
  			return _arguments['----']
  
! 	_argmap_save = {
! 		'in_' : 'kfil',
! 		'as' : 'fltp',
  	}
  
! 	def save(self, _object, _attributes={}, **_arguments):
! 		"""save: Save an object
! 		Required argument: the object to save, usually a document or window
! 		Keyword argument in_: the file or alias in which to save the object
! 		Keyword argument as: the file type of the document in which to save the data
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		"""
  		_code = 'core'
! 		_subcode = 'save'
  
! 		aetools.keysubst(_arguments, self._argmap_save)
  		_arguments['----'] = _object
  
***************
*** 422,440 ****
  			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
  
--- 402,440 ----
  			return _arguments['----']
  
! 	def select(self, _object, _attributes={}, **_arguments):
! 		"""select: Make a selection
! 		Required argument: the object to select
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'misc'
! 		_subcode = 'slct'
! 
! 		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_suite_info = {
  		'in_' : 'wrcd',
  	}
  
! 	def suite_info(self, _object, _attributes={}, **_arguments):
! 		"""suite info: (optional) Get information about event suite(s)
! 		Required argument: the suite 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 suites and their versions
  		"""
  		_code = 'core'
! 		_subcode = 'gtsi'
  
! 		aetools.keysubst(_arguments, self._argmap_suite_info)
  		_arguments['----'] = _object
  
***************
*** 449,452 ****
--- 449,458 ----
  
  
+ class alias(aetools.ComponentItem):
+ 	"""alias - a file on a disk or server.  The file must exist when you check the syntax of your script. """
+ 	want = 'alis'
+ 
+ aliases = alias
+ 
  class application(aetools.ComponentItem):
  	"""application - An application program """
***************
*** 495,503 ****
  files = file
  
! class alias(aetools.ComponentItem):
! 	"""alias - a file on a disk or server.  The file must exist when you check the syntax of your script. """
! 	want = 'alis'
  
! aliases = alias
  
  class selection_2d_object(aetools.ComponentItem):
--- 501,509 ----
  files = file
  
! class insertion_point(aetools.ComponentItem):
! 	"""insertion point - An insertion location between two objects """
! 	want = 'cins'
  
! insertion_points = insertion_point
  
  class selection_2d_object(aetools.ComponentItem):
***************
*** 554,563 ****
  
  windows = window
! 
! class insertion_point(aetools.ComponentItem):
! 	"""insertion point - An insertion location between two objects """
! 	want = 'cins'
! 
! insertion_points = insertion_point
  application._superclassnames = []
  application._privpropdict = {
--- 560,568 ----
  
  windows = window
! alias._superclassnames = []
! alias._privpropdict = {
! }
! alias._privelemdict = {
! }
  application._superclassnames = []
  application._privpropdict = {
***************
*** 582,589 ****
  file._privelemdict = {
  }
! alias._superclassnames = []
! alias._privpropdict = {
  }
! alias._privelemdict = {
  }
  selection_2d_object._superclassnames = []
--- 587,594 ----
  file._privelemdict = {
  }
! insertion_point._superclassnames = []
! insertion_point._privpropdict = {
  }
! insertion_point._privelemdict = {
  }
  selection_2d_object._superclassnames = []
***************
*** 608,642 ****
  window._privelemdict = {
  }
! insertion_point._superclassnames = []
! insertion_point._privpropdict = {
! }
! 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):
! 	"""\xb3 - Greater than or equal to """
! class _3c_(aetools.NComparison):
! 	"""< - Less than """
  class _b2_(aetools.NComparison):
  	"""\xb2 - Less than or equal to """
! _Enum_savo = {
! 	'yes' : 'yes ',	# Save objects now
! 	'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
  }
  
--- 613,642 ----
  window._privelemdict = {
  }
! class _3c_(aetools.NComparison):
! 	"""< - Less than """
  class _3d_(aetools.NComparison):
  	"""= - Equal """
  class _3e_(aetools.NComparison):
  	"""> - Greater than """
! class contains(aetools.NComparison):
! 	"""contains - Contains """
! class ends_with(aetools.NComparison):
! 	"""ends with - Ends with """
! class starts_with(aetools.NComparison):
! 	"""starts with - Starts with """
  class _b2_(aetools.NComparison):
  	"""\xb2 - Less than or equal to """
! class _b3_(aetools.NComparison):
! 	"""\xb3 - Greater than or equal to """
  _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
  }
  

Index: Type_Names_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Type_Names_Suite.py	23 Mar 2003 22:07:28 -0000	1.2
--- Type_Names_Suite.py	28 Mar 2003 22:07:21 -0000	1.3
***************
*** 16,34 ****
  
  
! class type_class_info(aetools.ComponentItem):
! 	"""type class info - information about properties and elements of a class """
! 	want = 'gcli'
  
! class type_event_info(aetools.ComponentItem):
! 	"""type event info - information about an event """
! 	want = 'evin'
  
! class plain_text(aetools.ComponentItem):
! 	"""plain text -  """
! 	want = 'TEXT'
  
! plain_text = plain_text
  
! string = plain_text
  
  class bounding_rectangle(aetools.ComponentItem):
--- 16,38 ----
  
  
! class PostScript_picture(aetools.ComponentItem):
! 	"""PostScript picture -  """
! 	want = 'EPS '
  
! class RGB16_color(aetools.ComponentItem):
! 	"""RGB16 color -  """
! 	want = 'tr16'
  
! class RGB96_color(aetools.ComponentItem):
! 	"""RGB96 color -  """
! 	want = 'tr96'
  
! class TIFF_picture(aetools.ComponentItem):
! 	"""TIFF picture -  """
! 	want = 'TIFF'
  
! class application_dictionary(aetools.ComponentItem):
! 	"""application dictionary -  """
! 	want = 'aete'
  
  class bounding_rectangle(aetools.ComponentItem):
***************
*** 36,55 ****
  	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 color_table(aetools.ComponentItem):
  	"""color table -  """
--- 40,43 ----
***************
*** 68,71 ****
--- 56,63 ----
  	want = 'exte'
  
+ class fixed(aetools.ComponentItem):
+ 	"""fixed - a real number """
+ 	want = 'fixd'
+ 
  class fixed_point(aetools.ComponentItem):
  	"""fixed point -  """
***************
*** 76,79 ****
--- 68,75 ----
  	want = 'frct'
  
+ class location_reference(aetools.ComponentItem):
+ 	"""location reference -  """
+ 	want = 'insl'
+ 
  class long_fixed(aetools.ComponentItem):
  	"""long fixed -  """
***************
*** 116,130 ****
  	want = 'tpmm'
  
! class PostScript_picture(aetools.ComponentItem):
! 	"""PostScript picture -  """
! 	want = 'EPS '
  
! class RGB16_color(aetools.ComponentItem):
! 	"""RGB16 color -  """
! 	want = 'tr16'
  
! class RGB96_color(aetools.ComponentItem):
! 	"""RGB96 color -  """
! 	want = 'tr96'
  
  class small_integer(aetools.ComponentItem):
--- 112,132 ----
  	want = 'tpmm'
  
! class plain_text(aetools.ComponentItem):
! 	"""plain text -  """
! 	want = 'TEXT'
  
! plain_text = plain_text
  
! class point(aetools.ComponentItem):
! 	"""point - point coordinates """
! 	want = 'QDpt'
! 
! class rotation(aetools.ComponentItem):
! 	"""rotation -  """
! 	want = 'trot'
! 
! class scrap_styles(aetools.ComponentItem):
! 	"""scrap styles -  """
! 	want = 'styl'
  
  class small_integer(aetools.ComponentItem):
***************
*** 136,166 ****
  	want = 'sing'
  
  class system_dictionary(aetools.ComponentItem):
  	"""system dictionary -  """
  	want = 'aeut'
  
! class rotation(aetools.ComponentItem):
! 	"""rotation -  """
! 	want = 'trot'
! 
! class scrap_styles(aetools.ComponentItem):
! 	"""scrap styles -  """
! 	want = 'styl'
! 
! class TIFF_picture(aetools.ComponentItem):
! 	"""TIFF picture -  """
! 	want = 'TIFF'
! 
! class version(aetools.ComponentItem):
! 	"""version -  """
! 	want = 'vers'
! 
! class unsigned_integer(aetools.ComponentItem):
! 	"""unsigned integer -  """
! 	want = 'magn'
  
! class type_property_info(aetools.ComponentItem):
! 	"""type property info -  """
! 	want = 'pinf'
  
  class type_element_info(aetools.ComponentItem):
--- 138,154 ----
  	want = 'sing'
  
+ string = plain_text
+ 
  class system_dictionary(aetools.ComponentItem):
  	"""system dictionary -  """
  	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):
***************
*** 168,221 ****
  	want = 'elin'
  
  class type_parameter_info(aetools.ComponentItem):
  	"""type parameter info -  """
  	want = 'pmin'
  
  class type_suite_info(aetools.ComponentItem):
  	"""type suite info -  """
  	want = 'suin'
  
! class target_id(aetools.ComponentItem):
! 	"""target id -  """
! 	want = 'targ'
! type_class_info._superclassnames = []
! type_class_info._privpropdict = {
! }
! type_class_info._privelemdict = {
! }
! type_event_info._superclassnames = []
! type_event_info._privpropdict = {
! }
! type_event_info._privelemdict = {
! }
! plain_text._superclassnames = []
! plain_text._privpropdict = {
! }
! plain_text._privelemdict = {
! }
! plain_text._superclassnames = []
! plain_text._privpropdict = {
! }
! plain_text._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 = []
--- 156,201 ----
  	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 unsigned_integer(aetools.ComponentItem):
! 	"""unsigned integer -  """
! 	want = 'magn'
! 
! class version(aetools.ComponentItem):
! 	"""version -  """
! 	want = 'vers'
! PostScript_picture._superclassnames = []
! PostScript_picture._privpropdict = {
  }
! PostScript_picture._privelemdict = {
  }
! RGB16_color._superclassnames = []
! RGB16_color._privpropdict = {
  }
! RGB16_color._privelemdict = {
  }
! RGB96_color._superclassnames = []
! RGB96_color._privpropdict = {
  }
! RGB96_color._privelemdict = {
  }
! TIFF_picture._superclassnames = []
! TIFF_picture._privpropdict = {
  }
! TIFF_picture._privelemdict = {
  }
  application_dictionary._superclassnames = []
***************
*** 224,227 ****
--- 204,212 ----
  application_dictionary._privelemdict = {
  }
+ bounding_rectangle._superclassnames = []
+ bounding_rectangle._privpropdict = {
+ }
+ bounding_rectangle._privelemdict = {
+ }
  color_table._superclassnames = []
  color_table._privpropdict = {
***************
*** 244,247 ****
--- 229,237 ----
  extended_real._privelemdict = {
  }
+ fixed._superclassnames = []
+ fixed._privpropdict = {
+ }
+ fixed._privelemdict = {
+ }
  fixed_point._superclassnames = []
  fixed_point._privpropdict = {
***************
*** 254,257 ****
--- 244,252 ----
  fixed_rectangle._privelemdict = {
  }
+ location_reference._superclassnames = []
+ location_reference._privpropdict = {
+ }
+ location_reference._privelemdict = {
+ }
  long_fixed._superclassnames = []
  long_fixed._privpropdict = {
***************
*** 304,321 ****
  pixel_map_record._privelemdict = {
  }
! PostScript_picture._superclassnames = []
! PostScript_picture._privpropdict = {
  }
! PostScript_picture._privelemdict = {
  }
! RGB16_color._superclassnames = []
! RGB16_color._privpropdict = {
  }
! RGB16_color._privelemdict = {
  }
! RGB96_color._superclassnames = []
! RGB96_color._privpropdict = {
  }
! RGB96_color._privelemdict = {
  }
  small_integer._superclassnames = []
--- 299,326 ----
  pixel_map_record._privelemdict = {
  }
! plain_text._superclassnames = []
! plain_text._privpropdict = {
  }
! plain_text._privelemdict = {
  }
! plain_text._superclassnames = []
! plain_text._privpropdict = {
  }
! plain_text._privelemdict = {
  }
! point._superclassnames = []
! point._privpropdict = {
  }
! point._privelemdict = {
! }
! rotation._superclassnames = []
! rotation._privpropdict = {
! }
! rotation._privelemdict = {
! }
! scrap_styles._superclassnames = []
! scrap_styles._privpropdict = {
! }
! scrap_styles._privelemdict = {
  }
  small_integer._superclassnames = []
***************
*** 334,361 ****
  system_dictionary._privelemdict = {
  }
! rotation._superclassnames = []
! rotation._privpropdict = {
  }
! rotation._privelemdict = {
  }
! scrap_styles._superclassnames = []
! scrap_styles._privpropdict = {
  }
! scrap_styles._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 = []
--- 339,366 ----
  system_dictionary._privelemdict = {
  }
! target_id._superclassnames = []
! target_id._privpropdict = {
  }
! target_id._privelemdict = {
  }
! type_class_info._superclassnames = []
! type_class_info._privpropdict = {
  }
! type_class_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 = []
***************
*** 364,377 ****
  type_property_info._privelemdict = {
  }
- type_element_info._superclassnames = []
- type_element_info._privpropdict = {
- }
- type_element_info._privelemdict = {
- }
- type_parameter_info._superclassnames = []
- type_parameter_info._privpropdict = {
- }
- type_parameter_info._privelemdict = {
- }
  type_suite_info._superclassnames = []
  type_suite_info._privpropdict = {
--- 369,372 ----
***************
*** 379,386 ****
  type_suite_info._privelemdict = {
  }
! target_id._superclassnames = []
! target_id._privpropdict = {
  }
! target_id._privelemdict = {
  }
  
--- 374,386 ----
  type_suite_info._privelemdict = {
  }
! unsigned_integer._superclassnames = []
! unsigned_integer._privpropdict = {
  }
! unsigned_integer._privelemdict = {
! }
! version._superclassnames = []
! version._privpropdict = {
! }
! version._privelemdict = {
  }
  
***************
*** 395,399 ****
  	'clrt' : color_table,
  	'fpnt' : fixed_point,
! 	'TEXT' : plain_text,
  	'elin' : type_element_info,
  	'insl' : location_reference,
--- 395,399 ----
  	'clrt' : color_table,
  	'fpnt' : fixed_point,
! 	'TIFF' : TIFF_picture,
  	'elin' : type_element_info,
  	'insl' : location_reference,
***************
*** 404,410 ****
--- 404,412 ----
  	'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,
***************
*** 412,425 ****
  	'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,
--- 414,425 ----
  	'suin' : type_suite_info,
  	'trot' : rotation,
  	'fixd' : fixed,
  	'styl' : scrap_styles,
  	'lpnt' : long_point,
  	'gcli' : type_class_info,
  	'tr96' : RGB96_color,
  	'tdas' : dash_style,
  	'exte' : extended_real,
! 	'pmin' : type_parameter_info,
  	'lfpt' : long_fixed_point,
  	'lrct' : long_rectangle,

Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** __init__.py	23 Mar 2003 22:07:28 -0000	1.2
--- __init__.py	28 Mar 2003 22:07:21 -0000	1.3
***************
*** 5,28 ****
  import aetools
  Error = aetools.Error
  import AppleScript_Suite
- import Required_Suite
  import Standard_Suite
! import Text_Suite
  import QuickDraw_Graphics_Suite
  import QuickDraw_Graphics_Suppleme
  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,
  	'qdrw' : QuickDraw_Graphics_Suite,
  	'qdsp' : QuickDraw_Graphics_Suppleme,
  	'tbls' : Table_Suite,
- 	'macc' : Macintosh_Connectivity_Clas,
  	'tpnm' : Type_Names_Suite,
  }
--- 5,28 ----
  import aetools
  Error = aetools.Error
+ 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 Type_Names_Suite
  
  
  _code_to_module = {
+ 	'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,
  	'tpnm' : Type_Names_Suite,
  }
***************
*** 31,53 ****
  
  _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'),
  	'qdrw' : ('StdSuites.QuickDraw_Graphics_Suite', 'QuickDraw_Graphics_Suite'),
  	'qdsp' : ('StdSuites.QuickDraw_Graphics_Suppleme', 'QuickDraw_Graphics_Suppleme'),
  	'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 QuickDraw_Graphics_Suite import *
  from QuickDraw_Graphics_Suppleme import *
  from Table_Suite import *
- from Macintosh_Connectivity_Clas import *
  from Type_Names_Suite import *
  
--- 31,53 ----
  
  _code_to_fullname = {
+ 	'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'),
  	'tpnm' : ('StdSuites.Type_Names_Suite', 'Type_Names_Suite'),
  }
  
+ 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 Type_Names_Suite import *
  
***************
*** 69,72 ****
--- 69,157 ----
  # 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)
***************
*** 174,262 ****
  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)
  
  #
--- 259,262 ----
***************
*** 264,267 ****
--- 264,352 ----
  #
  _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,
***************
*** 369,468 ****
  	'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,
! 		Required_Suite_Events,
  		Standard_Suite_Events,
! 		Text_Suite_Events,
  		QuickDraw_Graphics_Suite_Events,
  		QuickDraw_Graphics_Suppleme_Events,
  		Table_Suite_Events,
- 		Macintosh_Connectivity_Clas_Events,
  		Type_Names_Suite_Events,
  		aetools.TalkTo):
--- 454,468 ----
  	'fss ' : file_specification,
  	'ctxt' : text,
  }
  
  
! class StdSuites(Text_Suite_Events,
! 		AppleScript_Suite_Events,
  		Standard_Suite_Events,
! 		Macintosh_Connectivity_Clas_Events,
  		QuickDraw_Graphics_Suite_Events,
  		QuickDraw_Graphics_Suppleme_Events,
+ 		Required_Suite_Events,
  		Table_Suite_Events,
  		Type_Names_Suite_Events,
  		aetools.TalkTo):