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

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Fri, 28 Mar 2003 15:38:06 -0800


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

Modified Files:
	AppleScript_Suite.py Macintosh_Connectivity_Clas.py 
	QuickDraw_Graphics_Suite.py QuickDraw_Graphics_Suppleme.py 
	Standard_Suite.py Table_Suite.py Text_Suite.py 
	Type_Names_Suite.py __init__.py 
Log Message:
Sigh: didn't catch all lists that needed to be sorted. Regenerated again.


Index: AppleScript_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AppleScript_Suite.py	28 Mar 2003 22:07:20 -0000	1.3
--- AppleScript_Suite.py	28 Mar 2003 23:37:57 -0000	1.4
***************
*** 864,886 ****
  
  application = app
! class result(aetools.NProperty):
! 	"""result - the last result of evaluation """
! 	which = 'rslt'
! 	want = '****'
! class space(aetools.NProperty):
! 	"""space - a space character """
! 	which = 'spac'
! 	want = 'cha '
! class return_(aetools.NProperty):
! 	"""return - a return character """
! 	which = 'ret '
! 	want = 'cha '
! class tab(aetools.NProperty):
! 	"""tab - a tab character """
! 	which = 'tab '
! 	want = 'cha '
! class minutes(aetools.NProperty):
! 	"""minutes - the number of seconds in a minute """
! 	which = 'min '
  	want = 'long'
  class hours(aetools.NProperty):
--- 864,874 ----
  
  application = app
! class AppleScript(aetools.NProperty):
! 	"""AppleScript - the top-level script object """
! 	which = 'ascr'
! 	want = 'scpt'
! class days(aetools.NProperty):
! 	"""days - the number of seconds in a day """
! 	which = 'days'
  	want = 'long'
  class hours(aetools.NProperty):
***************
*** 888,898 ****
  	which = 'hour'
  	want = 'long'
! class days(aetools.NProperty):
! 	"""days - the number of seconds in a day """
! 	which = 'days'
! 	want = 'long'
! class weeks(aetools.NProperty):
! 	"""weeks - the number of seconds in a week """
! 	which = 'week'
  	want = 'long'
  class pi(aetools.NProperty):
--- 876,882 ----
  	which = 'hour'
  	want = 'long'
! class minutes(aetools.NProperty):
! 	"""minutes - the number of seconds in a minute """
! 	which = 'min '
  	want = 'long'
  class pi(aetools.NProperty):
***************
*** 900,919 ****
  	which = 'pi  '
  	want = 'doub'
- class print_length(aetools.NProperty):
- 	"""print length - the maximum length to print """
- 	which = 'prln'
- 	want = 'long'
  class print_depth(aetools.NProperty):
  	"""print depth - the maximum depth to print """
  	which = 'prdp'
  	want = 'long'
  class text_item_delimiters(aetools.NProperty):
  	"""text item delimiters - the text item delimiters of a string """
  	which = 'txdl'
  	want = 'list'
! class AppleScript(aetools.NProperty):
! 	"""AppleScript - the top-level script object """
! 	which = 'ascr'
! 	want = 'scpt'
  
  applications = app
--- 884,919 ----
  	which = 'pi  '
  	want = 'doub'
  class print_depth(aetools.NProperty):
  	"""print depth - the maximum depth to print """
  	which = 'prdp'
  	want = 'long'
+ class print_length(aetools.NProperty):
+ 	"""print length - the maximum length to print """
+ 	which = 'prln'
+ 	want = 'long'
+ class result(aetools.NProperty):
+ 	"""result - the last result of evaluation """
+ 	which = 'rslt'
+ 	want = '****'
+ class return_(aetools.NProperty):
+ 	"""return - a return character """
+ 	which = 'ret '
+ 	want = 'cha '
+ class space(aetools.NProperty):
+ 	"""space - a space character """
+ 	which = 'spac'
+ 	want = 'cha '
+ class tab(aetools.NProperty):
+ 	"""tab - a tab character """
+ 	which = 'tab '
+ 	want = 'cha '
  class text_item_delimiters(aetools.NProperty):
  	"""text item delimiters - the text item delimiters of a string """
  	which = 'txdl'
  	want = 'list'
! class weeks(aetools.NProperty):
! 	"""weeks - the number of seconds in a week """
! 	which = 'week'
! 	want = 'long'
  
  applications = app
***************
*** 984,1015 ****
  	"""date - Absolute date and time values """
  	want = 'ldt '
! class weekday(aetools.NProperty):
! 	"""weekday - the day of a week of a date """
! 	which = 'wkdy'
! 	want = 'wkdy'
! class month(aetools.NProperty):
! 	"""month - the month of a date """
! 	which = 'mnth'
! 	want = 'mnth'
  class day(aetools.NProperty):
  	"""day - the day of the month of a date """
  	which = 'day '
  	want = 'long'
! class year(aetools.NProperty):
! 	"""year - the year of a date """
! 	which = 'year'
! 	want = 'long'
  class time(aetools.NProperty):
  	"""time - the time since midnight of a date """
  	which = 'time'
  	want = 'long'
- class date_string(aetools.NProperty):
- 	"""date string - the date portion of a date-time value as text """
- 	which = 'dstr'
- 	want = 'TEXT'
  class time_string(aetools.NProperty):
  	"""time string - the time portion of a date-time value as text """
  	which = 'tstr'
  	want = 'TEXT'
  
  dates = date
--- 984,1015 ----
  	"""date - Absolute date and time values """
  	want = 'ldt '
! class date_string(aetools.NProperty):
! 	"""date string - the date portion of a date-time value as text """
! 	which = 'dstr'
! 	want = 'TEXT'
  class day(aetools.NProperty):
  	"""day - the day of the month of a date """
  	which = 'day '
  	want = 'long'
! class month(aetools.NProperty):
! 	"""month - the month of a date """
! 	which = 'mnth'
! 	want = 'mnth'
  class time(aetools.NProperty):
  	"""time - the time since midnight of a date """
  	which = 'time'
  	want = 'long'
  class time_string(aetools.NProperty):
  	"""time string - the time portion of a date-time value as text """
  	which = 'tstr'
  	want = 'TEXT'
+ class weekday(aetools.NProperty):
+ 	"""weekday - the day of a week of a date """
+ 	which = 'wkdy'
+ 	want = 'wkdy'
+ class year(aetools.NProperty):
+ 	"""year - the year of a date """
+ 	which = 'year'
+ 	want = 'long'
  
  dates = date
***************
*** 1096,1107 ****
  	which = 'kMsg'
  	want = 'cha '
- class modifiers(aetools.NProperty):
- 	"""modifiers - the modifier keys pressed in combination """
- 	which = 'kMod'
- 	want = 'eMds'
  class key_kind(aetools.NProperty):
  	"""key kind - the kind of key that was pressed """
  	which = 'kknd'
  	want = 'ekst'
  
  keystrokes = keystroke
--- 1096,1107 ----
  	which = 'kMsg'
  	want = 'cha '
  class key_kind(aetools.NProperty):
  	"""key kind - the kind of key that was pressed """
  	which = 'kknd'
  	want = 'ekst'
+ class modifiers(aetools.NProperty):
+ 	"""modifiers - the modifier keys pressed in combination """
+ 	which = 'kMod'
+ 	want = 'eMds'
  
  keystrokes = keystroke
***************
*** 1130,1141 ****
  	"""list - An ordered collection of items """
  	want = 'list'
- class reverse(aetools.NProperty):
- 	"""reverse - the items of the list in reverse order """
- 	which = 'rvse'
- 	want = 'list'
  class rest(aetools.NProperty):
  	"""rest - all items of the list excluding first """
  	which = 'rest'
  	want = 'list'
  
  class list_or_record(aetools.ComponentItem):
--- 1130,1141 ----
  	"""list - An ordered collection of items """
  	want = 'list'
  class rest(aetools.NProperty):
  	"""rest - all items of the list excluding first """
  	which = 'rest'
  	want = 'list'
+ class reverse(aetools.NProperty):
+ 	"""reverse - the items of the list in reverse order """
+ 	which = 'rvse'
+ 	want = 'list'
  
  class list_or_record(aetools.ComponentItem):
***************
*** 1372,1383 ****
  	"""writing code info - script code and language code of text run """
  	want = 'citl'
- class script_code(aetools.NProperty):
- 	"""script code - the script code for the text """
- 	which = 'pscd'
- 	want = 'shor'
  class language_code(aetools.NProperty):
  	"""language code - the language code for the text """
  	which = 'plcd'
  	want = 'shor'
  
  writing_code_infos = writing_code_info
--- 1372,1383 ----
  	"""writing code info - script code and language code of text run """
  	want = 'citl'
  class language_code(aetools.NProperty):
  	"""language code - the language code for the text """
  	which = 'plcd'
  	want = 'shor'
+ class script_code(aetools.NProperty):
+ 	"""script code - the script code for the text """
+ 	which = 'pscd'
+ 	want = 'shor'
  
  writing_code_infos = writing_code_info
***************
*** 1595,1605 ****
  date._superclassnames = []
  date._privpropdict = {
! 	'weekday' : weekday,
! 	'month' : month,
  	'day' : day,
! 	'year' : year,
  	'time' : time,
- 	'date_string' : date_string,
  	'time_string' : time_string,
  }
  date._privelemdict = {
--- 1595,1605 ----
  date._superclassnames = []
  date._privpropdict = {
! 	'date_string' : date_string,
  	'day' : day,
! 	'month' : month,
  	'time' : time,
  	'time_string' : time_string,
+ 	'weekday' : weekday,
+ 	'year' : year,
  }
  date._privelemdict = {
***************
*** 1684,1689 ****
  keystroke._privpropdict = {
  	'key' : key,
- 	'modifiers' : modifiers,
  	'key_kind' : key_kind,
  }
  keystroke._privelemdict = {
--- 1684,1689 ----
  keystroke._privpropdict = {
  	'key' : key,
  	'key_kind' : key_kind,
+ 	'modifiers' : modifiers,
  }
  keystroke._privelemdict = {
***************
*** 1708,1713 ****
  list._privpropdict = {
  	'length' : length,
- 	'reverse' : reverse,
  	'rest' : rest,
  }
  list._privelemdict = {
--- 1708,1713 ----
  list._privpropdict = {
  	'length' : length,
  	'rest' : rest,
+ 	'reverse' : reverse,
  }
  list._privelemdict = {
***************
*** 1948,1953 ****
  writing_code_info._superclassnames = []
  writing_code_info._privpropdict = {
- 	'script_code' : script_code,
  	'language_code' : language_code,
  }
  writing_code_info._privelemdict = {
--- 1948,1953 ----
  writing_code_info._superclassnames = []
  writing_code_info._privpropdict = {
  	'language_code' : language_code,
+ 	'script_code' : script_code,
  }
  writing_code_info._privelemdict = {
***************
*** 2029,2172 ****
  #
  _classdeclarations = {
! 	'jul ' : July,
! 	'may ' : May,
  	'TEXT' : string,
  	'cmet' : cubic_meters,
! 	'STXT' : styled_text,
! 	'nds ' : number_2c__date_or_text,
! 	'feet' : feet,
! 	'feb ' : February,
  	'degc' : degrees_Celsius,
- 	'kprs' : keystroke,
- 	'psct' : writing_code,
  	'degf' : degrees_Fahrenheit,
- 	'lrs ' : list_2c__record_or_text,
- 	'ldt ' : date,
  	'degk' : degrees_Kelvin,
! 	'sun ' : Sunday,
! 	'oct ' : October,
  	'evnt' : event,
! 	'pstr' : Pascal_string,
! 	'cyrd' : cubic_yards,
! 	'PICT' : picture,
! 	'ls  ' : list_or_string,
! 	'long' : integer,
! 	'prop' : properties,
! 	'nmbr' : number,
! 	'citl' : writing_code_info,
! 	'citm' : text_item,
! 	'apr ' : April,
! 	'thu ' : Thursday,
! 	'type' : type_class,
! 	'prep' : preposition,
! 	'tue ' : Tuesday,
! 	'case' : upper_case,
! 	'vers' : version,
! 	'wed ' : Wednesday,
! 	'capp' : app,
! 	'sqkm' : square_kilometers,
! 	'obj ' : reference,
! 	'vect' : vector,
! 	'wkdy' : weekday,
! 	'cRGB' : RGB_color,
! 	'nd  ' : number_or_date,
  	'itxt' : international_text,
! 	'scnd' : seconds,
! 	'mar ' : March,
  	'kmtr' : kilometers,
! 	'sqft' : square_feet,
  	'list' : list,
! 	'styl' : styled_Clipboard_text,
! 	'nov ' : November,
! 	'qrts' : quarts,
! 	'mile' : miles,
! 	'msng' : missing_value,
! 	'alis' : alias,
! 	'jan ' : January,
  	'metr' : meters,
  	'mnth' : month,
  	'ns  ' : number_or_string,
! 	'jun ' : June,
! 	'aug ' : August,
! 	'llst' : linked_list,
! 	'doub' : real,
! 	'encs' : encoded_string,
! 	'galn' : gallons,
! 	'cuin' : cubic_inches,
! 	'fri ' : Friday,
  	'sf  ' : alias_or_string,
- 	'lr  ' : list_or_record,
- 	'mon ' : Monday,
  	'snd ' : sound,
! 	'sep ' : September,
! 	'kgrm' : kilograms,
! 	'scpt' : script,
! 	'****' : anything,
! 	'litr' : liters,
! 	'bool' : boolean,
! 	'cmtr' : centimeters,
  	'sqrm' : square_meters,
! 	'inch' : inches,
! 	'zone' : zone,
! 	'kfrm' : reference_form,
! 	'cobj' : item,
! 	'gram' : grams,
! 	'cha ' : character,
! 	'reco' : record,
  	'undf' : empty_ae_name_,
- 	'dec ' : December,
- 	'enum' : constant,
- 	'hand' : handler,
- 	'sqmi' : square_miles,
- 	'rdat' : data,
- 	'cstr' : C_string,
  	'utxt' : Unicode_text,
! 	'sutx' : styled_Unicode_text,
! 	'mach' : machine,
! 	'sqyd' : square_yards,
  	'yard' : yards,
! 	'ozs ' : ounces,
! 	'lbs ' : pounds,
! 	'cfet' : cubic_feet,
! 	'ccmt' : cubic_centimeters,
! 	'sat ' : Saturday,
! 	'pcls' : class_,
! 	'fss ' : file_specification,
! 	'ctxt' : text,
  }
  
  _propdeclarations = {
! 	'week' : weeks,
  	'mnth' : month,
  	'pare' : parent,
- 	'leng' : length,
  	'pi  ' : pi,
- 	'kMod' : modifiers,
- 	'min ' : minutes,
- 	'wkdy' : weekday,
- 	'dstr' : date_string,
- 	'rest' : rest,
- 	'ascr' : AppleScript,
- 	'kknd' : key_kind,
- 	'c@#^' : _3c_Inheritance_3e_,
- 	'ID  ' : id,
- 	'year' : year,
- 	'rvse' : reverse,
- 	'tab ' : tab,
- 	'tstr' : time_string,
  	'plcd' : language_code,
! 	'ret ' : return_,
! 	'kMsg' : key,
! 	'hour' : hours,
! 	'spac' : space,
! 	'days' : days,
! 	'txdl' : text_item_delimiters,
  	'prdp' : print_depth,
  	'prln' : print_length,
  	'pscd' : script_code,
! 	'time' : time,
! 	'pnam' : name,
  	'rslt' : result,
! 	'day ' : day,
  }
  
--- 2029,2172 ----
  #
  _classdeclarations = {
! 	'****' : anything,
! 	'PICT' : picture,
! 	'STXT' : styled_text,
  	'TEXT' : string,
+ 	'alis' : alias,
+ 	'apr ' : April,
+ 	'aug ' : August,
+ 	'bool' : boolean,
+ 	'cRGB' : RGB_color,
+ 	'capp' : app,
+ 	'case' : upper_case,
+ 	'ccmt' : cubic_centimeters,
+ 	'cfet' : cubic_feet,
+ 	'cha ' : character,
+ 	'citl' : writing_code_info,
+ 	'citm' : text_item,
  	'cmet' : cubic_meters,
! 	'cmtr' : centimeters,
! 	'cobj' : item,
! 	'cstr' : C_string,
! 	'ctxt' : text,
! 	'cuin' : cubic_inches,
! 	'cyrd' : cubic_yards,
! 	'dec ' : December,
  	'degc' : degrees_Celsius,
  	'degf' : degrees_Fahrenheit,
  	'degk' : degrees_Kelvin,
! 	'doub' : real,
! 	'encs' : encoded_string,
! 	'enum' : constant,
  	'evnt' : event,
! 	'feb ' : February,
! 	'feet' : feet,
! 	'fri ' : Friday,
! 	'fss ' : file_specification,
! 	'galn' : gallons,
! 	'gram' : grams,
! 	'hand' : handler,
! 	'inch' : inches,
  	'itxt' : international_text,
! 	'jan ' : January,
! 	'jul ' : July,
! 	'jun ' : June,
! 	'kfrm' : reference_form,
! 	'kgrm' : kilograms,
  	'kmtr' : kilometers,
! 	'kprs' : keystroke,
! 	'lbs ' : pounds,
! 	'ldt ' : date,
  	'list' : list,
! 	'litr' : liters,
! 	'llst' : linked_list,
! 	'long' : integer,
! 	'lr  ' : list_or_record,
! 	'lrs ' : list_2c__record_or_text,
! 	'ls  ' : list_or_string,
! 	'mach' : machine,
! 	'mar ' : March,
! 	'may ' : May,
  	'metr' : meters,
+ 	'mile' : miles,
  	'mnth' : month,
+ 	'mon ' : Monday,
+ 	'msng' : missing_value,
+ 	'nd  ' : number_or_date,
+ 	'nds ' : number_2c__date_or_text,
+ 	'nmbr' : number,
+ 	'nov ' : November,
  	'ns  ' : number_or_string,
! 	'obj ' : reference,
! 	'oct ' : October,
! 	'ozs ' : ounces,
! 	'pcls' : class_,
! 	'prep' : preposition,
! 	'prop' : properties,
! 	'psct' : writing_code,
! 	'pstr' : Pascal_string,
! 	'qrts' : quarts,
! 	'rdat' : data,
! 	'reco' : record,
! 	'sat ' : Saturday,
! 	'scnd' : seconds,
! 	'scpt' : script,
! 	'sep ' : September,
  	'sf  ' : alias_or_string,
  	'snd ' : sound,
! 	'sqft' : square_feet,
! 	'sqkm' : square_kilometers,
! 	'sqmi' : square_miles,
  	'sqrm' : square_meters,
! 	'sqyd' : square_yards,
! 	'styl' : styled_Clipboard_text,
! 	'sun ' : Sunday,
! 	'sutx' : styled_Unicode_text,
! 	'thu ' : Thursday,
! 	'tue ' : Tuesday,
! 	'type' : type_class,
  	'undf' : empty_ae_name_,
  	'utxt' : Unicode_text,
! 	'vect' : vector,
! 	'vers' : version,
! 	'wed ' : Wednesday,
! 	'wkdy' : weekday,
  	'yard' : yards,
! 	'zone' : zone,
  }
  
  _propdeclarations = {
! 	'ID  ' : id,
! 	'ascr' : AppleScript,
! 	'c@#^' : _3c_Inheritance_3e_,
! 	'day ' : day,
! 	'days' : days,
! 	'dstr' : date_string,
! 	'hour' : hours,
! 	'kMod' : modifiers,
! 	'kMsg' : key,
! 	'kknd' : key_kind,
! 	'leng' : length,
! 	'min ' : minutes,
  	'mnth' : month,
  	'pare' : parent,
  	'pi  ' : pi,
  	'plcd' : language_code,
! 	'pnam' : name,
  	'prdp' : print_depth,
  	'prln' : print_length,
  	'pscd' : script_code,
! 	'rest' : rest,
! 	'ret ' : return_,
  	'rslt' : result,
! 	'rvse' : reverse,
! 	'spac' : space,
! 	'tab ' : tab,
! 	'time' : time,
! 	'tstr' : time_string,
! 	'txdl' : text_item_delimiters,
! 	'week' : weeks,
! 	'wkdy' : weekday,
! 	'year' : year,
  }
  
***************
*** 2175,2182 ****
  
  _enumdeclarations = {
! 	'eMds' : _Enum_eMds,
  	'cons' : _Enum_cons,
! 	'misc' : _Enum_misc,
  	'ekst' : _Enum_ekst,
! 	'boov' : _Enum_boov,
  }
--- 2175,2182 ----
  
  _enumdeclarations = {
! 	'boov' : _Enum_boov,
  	'cons' : _Enum_cons,
! 	'eMds' : _Enum_eMds,
  	'ekst' : _Enum_ekst,
! 	'misc' : _Enum_misc,
  }

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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Macintosh_Connectivity_Clas.py	28 Mar 2003 22:07:21 -0000	1.3
--- Macintosh_Connectivity_Clas.py	28 Mar 2003 23:37:57 -0000	1.4
***************
*** 37,48 ****
  	which = 'patm'
  	want = 'TEXT'
- class AppleTalk_zone(aetools.NProperty):
- 	"""AppleTalk zone - the zone part of the address """
- 	which = 'patz'
- 	want = 'TEXT'
  class AppleTalk_type(aetools.NProperty):
  	"""AppleTalk type - the type part of the AppleTalk address """
  	which = 'patt'
  	want = 'TEXT'
  
  AppleTalk_addresses = AppleTalk_address
--- 37,48 ----
  	which = 'patm'
  	want = 'TEXT'
  class AppleTalk_type(aetools.NProperty):
  	"""AppleTalk type - the type part of the AppleTalk address """
  	which = 'patt'
  	want = 'TEXT'
+ class AppleTalk_zone(aetools.NProperty):
+ 	"""AppleTalk zone - the zone part of the address """
+ 	which = 'patz'
+ 	want = 'TEXT'
  
  AppleTalk_addresses = AppleTalk_address
***************
*** 95,106 ****
  	"""SCSI address - Addresses a SCSI device """
  	want = 'cscs'
- class SCSI_bus(aetools.NProperty):
- 	"""SCSI bus - the SCSI bus number """
- 	which = 'pscb'
- 	want = 'shor'
  class LUN(aetools.NProperty):
  	"""LUN - the SCSI logical unit number """
  	which = 'pslu'
  	want = 'shor'
  
  SCSI_addresses = SCSI_address
--- 95,106 ----
  	"""SCSI address - Addresses a SCSI device """
  	want = 'cscs'
  class LUN(aetools.NProperty):
  	"""LUN - the SCSI logical unit number """
  	which = 'pslu'
  	want = 'shor'
+ class SCSI_bus(aetools.NProperty):
+ 	"""SCSI bus - the SCSI bus number """
+ 	which = 'pscb'
+ 	want = 'shor'
  
  SCSI_addresses = SCSI_address
***************
*** 125,136 ****
  	"""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 """
--- 125,136 ----
  	"""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 properties(aetools.NProperty):
+ 	"""properties - property that allows getting and setting of multiple properties """
+ 	which = 'pALL'
+ 	want = 'reco'
  class protocol(aetools.NProperty):
  	"""protocol - How to talk to this addressee """
***************
*** 149,166 ****
  	"""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_,
  	'ID' : ID,
  }
  ADB_address._privelemdict = {
--- 149,166 ----
  	"""device specification - A device connected to a computer """
  	want = 'cdev'
  class device_address(aetools.NProperty):
  	"""device address - the address of the device """
  	which = 'pdva'
  	want = 'cadr'
+ class device_type(aetools.NProperty):
+ 	"""device type - the kind of device """
+ 	which = 'pdvt'
+ 	want = 'edvt'
  
  device_specifications = device_specification
  ADB_address._superclassnames = ['address_specification']
  ADB_address._privpropdict = {
  	'ID' : ID,
+ 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  }
  ADB_address._privelemdict = {
***************
*** 168,175 ****
  AppleTalk_address._superclassnames = ['address_specification']
  AppleTalk_address._privpropdict = {
- 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  	'AppleTalk_machine' : AppleTalk_machine,
- 	'AppleTalk_zone' : AppleTalk_zone,
  	'AppleTalk_type' : AppleTalk_type,
  }
  AppleTalk_address._privelemdict = {
--- 168,175 ----
  AppleTalk_address._superclassnames = ['address_specification']
  AppleTalk_address._privpropdict = {
  	'AppleTalk_machine' : AppleTalk_machine,
  	'AppleTalk_type' : AppleTalk_type,
+ 	'AppleTalk_zone' : AppleTalk_zone,
+ 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  }
  AppleTalk_address._privelemdict = {
***************
*** 177,182 ****
  Ethernet_address._superclassnames = ['address_specification']
  Ethernet_address._privpropdict = {
- 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  	'ID' : ID,
  }
  Ethernet_address._privelemdict = {
--- 177,182 ----
  Ethernet_address._superclassnames = ['address_specification']
  Ethernet_address._privpropdict = {
  	'ID' : ID,
+ 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  }
  Ethernet_address._privelemdict = {
***************
*** 184,189 ****
  FireWire_address._superclassnames = ['address_specification']
  FireWire_address._privpropdict = {
- 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  	'ID' : ID,
  }
  FireWire_address._privelemdict = {
--- 184,189 ----
  FireWire_address._superclassnames = ['address_specification']
  FireWire_address._privpropdict = {
  	'ID' : ID,
+ 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  }
  FireWire_address._privelemdict = {
***************
*** 191,197 ****
  IP_address._superclassnames = ['address_specification']
  IP_address._privpropdict = {
- 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
- 	'ID' : ID,
  	'DNS_form' : DNS_form,
  	'port' : port,
  }
--- 191,197 ----
  IP_address._superclassnames = ['address_specification']
  IP_address._privpropdict = {
  	'DNS_form' : DNS_form,
+ 	'ID' : ID,
+ 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  	'port' : port,
  }
***************
*** 209,216 ****
  SCSI_address._superclassnames = ['address_specification']
  SCSI_address._privpropdict = {
- 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
- 	'SCSI_bus' : SCSI_bus,
  	'ID' : ID,
  	'LUN' : LUN,
  }
  SCSI_address._privelemdict = {
--- 209,216 ----
  SCSI_address._superclassnames = ['address_specification']
  SCSI_address._privpropdict = {
  	'ID' : ID,
  	'LUN' : LUN,
+ 	'SCSI_bus' : SCSI_bus,
+ 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  }
  SCSI_address._privelemdict = {
***************
*** 218,223 ****
  Token_Ring_address._superclassnames = ['address_specification']
  Token_Ring_address._privpropdict = {
- 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  	'ID' : ID,
  }
  Token_Ring_address._privelemdict = {
--- 218,223 ----
  Token_Ring_address._superclassnames = ['address_specification']
  Token_Ring_address._privpropdict = {
  	'ID' : ID,
+ 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  }
  Token_Ring_address._privelemdict = {
***************
*** 230,235 ****
  address_specification._superclassnames = []
  address_specification._privpropdict = {
- 	'properties' : properties,
  	'conduit' : conduit,
  	'protocol' : protocol,
  }
--- 230,235 ----
  address_specification._superclassnames = []
  address_specification._privpropdict = {
  	'conduit' : conduit,
+ 	'properties' : properties,
  	'protocol' : protocol,
  }
***************
*** 238,243 ****
  bus_slot._superclassnames = ['address_specification']
  bus_slot._privpropdict = {
- 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  	'ID' : ID,
  }
  bus_slot._privelemdict = {
--- 238,243 ----
  bus_slot._superclassnames = ['address_specification']
  bus_slot._privpropdict = {
  	'ID' : ID,
+ 	'_3c_inheritance_3e_' : _3c_inheritance_3e_,
  }
  bus_slot._privelemdict = {
***************
*** 245,251 ****
  device_specification._superclassnames = []
  device_specification._privpropdict = {
- 	'properties' : properties,
- 	'device_type' : device_type,
  	'device_address' : device_address,
  }
  device_specification._privelemdict = {
--- 245,251 ----
  device_specification._superclassnames = []
  device_specification._privpropdict = {
  	'device_address' : device_address,
+ 	'device_type' : device_type,
+ 	'properties' : properties,
  }
  device_specification._privelemdict = {
***************
*** 327,363 ****
  #
  _classdeclarations = {
! 	'cat ' : AppleTalk_address,
  	'cadr' : address_specification,
! 	'ctok' : Token_Ring_address,
! 	'cfw ' : FireWire_address,
  	'cbus' : bus_slot,
- 	'cscs' : SCSI_address,
- 	'cadb' : ADB_address,
- 	'cusb' : USB_Addresses,
- 	'cip ' : IP_address,
- 	'clt ' : LocalTalk_address,
  	'cdev' : device_specification,
  	'cen ' : Ethernet_address,
  }
  
  _propdeclarations = {
! 	'pdns' : DNS_form,
! 	'pdva' : device_address,
  	'patt' : AppleTalk_type,
- 	'pprt' : protocol,
- 	'pcon' : conduit,
  	'patz' : AppleTalk_zone,
! 	'pnet' : network,
  	'pdvt' : device_type,
  	'pnam' : name,
! 	'c@#^' : _3c_inheritance_3e_,
! 	'ID  ' : ID,
! 	'pALL' : properties,
! 	'psoc' : socket,
! 	'pscb' : SCSI_bus,
  	'ppor' : port,
! 	'patm' : AppleTalk_machine,
  	'pslu' : LUN,
! 	'pnod' : node,
  }
  
--- 327,363 ----
  #
  _classdeclarations = {
! 	'cadb' : ADB_address,
  	'cadr' : address_specification,
! 	'cat ' : AppleTalk_address,
  	'cbus' : bus_slot,
  	'cdev' : device_specification,
  	'cen ' : Ethernet_address,
+ 	'cfw ' : FireWire_address,
+ 	'cip ' : IP_address,
+ 	'clt ' : LocalTalk_address,
+ 	'cscs' : SCSI_address,
+ 	'ctok' : Token_Ring_address,
+ 	'cusb' : USB_Addresses,
  }
  
  _propdeclarations = {
! 	'ID  ' : ID,
! 	'c@#^' : _3c_inheritance_3e_,
! 	'pALL' : properties,
! 	'patm' : AppleTalk_machine,
  	'patt' : AppleTalk_type,
  	'patz' : AppleTalk_zone,
! 	'pcon' : conduit,
! 	'pdns' : DNS_form,
! 	'pdva' : device_address,
  	'pdvt' : device_type,
  	'pnam' : name,
! 	'pnet' : network,
! 	'pnod' : node,
  	'ppor' : port,
! 	'pprt' : protocol,
! 	'pscb' : SCSI_bus,
  	'pslu' : LUN,
! 	'psoc' : socket,
  }
  

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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** QuickDraw_Graphics_Suite.py	28 Mar 2003 22:07:21 -0000	1.3
--- QuickDraw_Graphics_Suite.py	28 Mar 2003 23:37:58 -0000	1.4
***************
*** 77,87 ****
  	which = 'cltb'
  	want = 'clrt'
! class ordering(aetools.NProperty):
! 	"""ordering - the ordered list of graphic objects in the drawing area """
! 	which = 'gobs'
! 	want = 'obj '
! class name(aetools.NProperty):
! 	"""name - the name """
! 	which = 'pnam'
  	want = 'itxt'
  class default_location(aetools.NProperty):
--- 77,83 ----
  	which = 'cltb'
  	want = 'clrt'
! class default_font(aetools.NProperty):
! 	"""default font - the name of the default font for text objects """
! 	which = 'ptxf'
  	want = 'itxt'
  class default_location(aetools.NProperty):
***************
*** 89,120 ****
  	which = 'pnel'
  	want = 'QDpt'
- class pixel_depth(aetools.NProperty):
- 	"""pixel depth - the number of bits per pixel """
- 	which = 'pdpt'
- 	want = 'shor'
- class writing_code(aetools.NProperty):
- 	"""writing code - the script system and language of text objects in the drawing area """
- 	which = 'psct'
- 	want = 'intl'
- class text_color(aetools.NProperty):
- 	"""text color - the default color for text objects """
- 	which = 'ptxc'
- 	want = 'cRGB'
- class default_font(aetools.NProperty):
- 	"""default font - the name of the default font for text objects """
- 	which = 'ptxf'
- 	want = 'itxt'
  class default_size(aetools.NProperty):
  	"""default size - the default size for text objects """
  	which = 'ptps'
  	want = 'fixd'
  class style(aetools.NProperty):
  	"""style - the default text style for text objects """
  	which = 'txst'
  	want = 'tsty'
  class update_on_change(aetools.NProperty):
  	"""update on change - Redraw after each change? """
  	which = 'pupd'
  	want = 'bool'
  
  drawing_areas = drawing_area
--- 85,120 ----
  	which = 'pnel'
  	want = 'QDpt'
  class default_size(aetools.NProperty):
  	"""default size - the default size for text objects """
  	which = 'ptps'
  	want = 'fixd'
+ class name(aetools.NProperty):
+ 	"""name - the name """
+ 	which = 'pnam'
+ 	want = 'itxt'
+ class ordering(aetools.NProperty):
+ 	"""ordering - the ordered list of graphic objects in the drawing area """
+ 	which = 'gobs'
+ 	want = 'obj '
+ class pixel_depth(aetools.NProperty):
+ 	"""pixel depth - the number of bits per pixel """
+ 	which = 'pdpt'
+ 	want = 'shor'
  class style(aetools.NProperty):
  	"""style - the default text style for text objects """
  	which = 'txst'
  	want = 'tsty'
+ class text_color(aetools.NProperty):
+ 	"""text color - the default color for text objects """
+ 	which = 'ptxc'
+ 	want = 'cRGB'
  class update_on_change(aetools.NProperty):
  	"""update on change - Redraw after each change? """
  	which = 'pupd'
  	want = 'bool'
+ class writing_code(aetools.NProperty):
+ 	"""writing code - the script system and language of text objects in the drawing area """
+ 	which = 'psct'
+ 	want = 'intl'
  
  drawing_areas = drawing_area
***************
*** 129,148 ****
  	"""graphic line - A graphic line """
  	want = 'glin'
- class start_point(aetools.NProperty):
- 	"""start point - the starting point of the line """
- 	which = 'pstp'
- 	want = 'QDpt'
- class end_point(aetools.NProperty):
- 	"""end point - the ending point of the line """
- 	which = 'pend'
- 	want = 'QDpt'
- class dash_style(aetools.NProperty):
- 	"""dash style - the dash style """
- 	which = 'pdst'
- 	want = 'tdas'
  class arrow_style(aetools.NProperty):
  	"""arrow style - the arrow style """
  	which = 'arro'
  	want = 'arro'
  
  graphic_lines = graphic_line
--- 129,148 ----
  	"""graphic line - A graphic line """
  	want = 'glin'
  class arrow_style(aetools.NProperty):
  	"""arrow style - the arrow style """
  	which = 'arro'
  	want = 'arro'
+ class dash_style(aetools.NProperty):
+ 	"""dash style - the dash style """
+ 	which = 'pdst'
+ 	want = 'tdas'
+ class end_point(aetools.NProperty):
+ 	"""end point - the ending point of the line """
+ 	which = 'pend'
+ 	want = 'QDpt'
+ class start_point(aetools.NProperty):
+ 	"""start point - the starting point of the line """
+ 	which = 'pstp'
+ 	want = 'QDpt'
  
  graphic_lines = graphic_line
***************
*** 247,260 ****
  	'background_pattern' : background_pattern,
  	'color_table' : color_table,
- 	'ordering' : ordering,
- 	'name' : name,
- 	'default_location' : default_location,
- 	'pixel_depth' : pixel_depth,
- 	'writing_code' : writing_code,
- 	'text_color' : text_color,
  	'default_font' : default_font,
  	'default_size' : default_size,
  	'style' : style,
  	'update_on_change' : update_on_change,
  }
  drawing_area._privelemdict = {
--- 247,260 ----
  	'background_pattern' : background_pattern,
  	'color_table' : color_table,
  	'default_font' : default_font,
+ 	'default_location' : default_location,
  	'default_size' : default_size,
+ 	'name' : name,
+ 	'ordering' : ordering,
+ 	'pixel_depth' : pixel_depth,
  	'style' : style,
+ 	'text_color' : text_color,
  	'update_on_change' : update_on_change,
+ 	'writing_code' : writing_code,
  }
  drawing_area._privelemdict = {
***************
*** 267,274 ****
  graphic_line._superclassnames = []
  graphic_line._privpropdict = {
- 	'start_point' : start_point,
- 	'end_point' : end_point,
- 	'dash_style' : dash_style,
  	'arrow_style' : arrow_style,
  }
  graphic_line._privelemdict = {
--- 267,274 ----
  graphic_line._superclassnames = []
  graphic_line._privpropdict = {
  	'arrow_style' : arrow_style,
+ 	'dash_style' : dash_style,
+ 	'end_point' : end_point,
+ 	'start_point' : start_point,
  }
  graphic_line._privelemdict = {
***************
*** 357,410 ****
  #
  _classdeclarations = {
! 	'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,
  }
  
  _propdeclarations = {
! 	'pbpt' : background_pattern,
! 	'flcl' : fill_color,
! 	'parc' : arc_angle,
! 	'pbnd' : bounds,
  	'colr' : color,
  	'flpt' : fill_pattern,
- 	'ustl' : uniform_styles,
  	'font' : font,
! 	'pend' : end_point,
! 	'pstp' : start_point,
  	'pang' : start_angle,
! 	'pptm' : transfer_mode,
! 	'cltb' : color_table,
! 	'ptxc' : text_color,
! 	'ptxf' : default_font,
  	'ppcl' : pen_color,
! 	'ptps' : default_size,
  	'ppwd' : pen_width,
- 	'arro' : arrow_style,
- 	'pcwd' : corner_curve_width,
- 	'txst' : style,
  	'psct' : writing_code,
! 	'pdst' : dash_style,
  	'ptlt' : point_list,
! 	'gobs' : ordering,
! 	'pdpt' : pixel_depth,
! 	'pnel' : default_location,
! 	'pchd' : corner_curve_height,
! 	'pbcl' : background_color,
! 	'pnam' : name,
! 	'pdrt' : definition_rect,
  	'ptsz' : size,
  	'pupd' : update_on_change,
! 	'pppa' : pen_pattern,
  }
  
--- 357,410 ----
  #
  _classdeclarations = {
! 	'carc' : arc,
  	'cdrw' : drawing_area,
+ 	'cgob' : graphic_object,
+ 	'cgsh' : graphic_shape,
+ 	'cgtx' : graphic_text,
+ 	'covl' : oval,
  	'cpgn' : polygon,
! 	'cpic' : graphic_group,
  	'cpix' : pixel_map,
+ 	'cpxl' : pixel,
  	'crec' : rectangle,
+ 	'crrc' : rounded_rectangle,
+ 	'glin' : graphic_line,
  }
  
  _propdeclarations = {
! 	'arro' : arrow_style,
! 	'cltb' : color_table,
  	'colr' : color,
+ 	'flcl' : fill_color,
  	'flpt' : fill_pattern,
  	'font' : font,
! 	'gobs' : ordering,
  	'pang' : start_angle,
! 	'parc' : arc_angle,
! 	'pbcl' : background_color,
! 	'pbnd' : bounds,
! 	'pbpt' : background_pattern,
! 	'pchd' : corner_curve_height,
! 	'pcwd' : corner_curve_width,
! 	'pdpt' : pixel_depth,
! 	'pdrt' : definition_rect,
! 	'pdst' : dash_style,
! 	'pend' : end_point,
! 	'pnam' : name,
! 	'pnel' : default_location,
  	'ppcl' : pen_color,
! 	'pppa' : pen_pattern,
! 	'pptm' : transfer_mode,
  	'ppwd' : pen_width,
  	'psct' : writing_code,
! 	'pstp' : start_point,
  	'ptlt' : point_list,
! 	'ptps' : default_size,
  	'ptsz' : size,
+ 	'ptxc' : text_color,
+ 	'ptxf' : default_font,
  	'pupd' : update_on_change,
! 	'txst' : style,
! 	'ustl' : uniform_styles,
  }
  

Index: QuickDraw_Graphics_Suppleme.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QuickDraw_Graphics_Suppleme.py	23 Mar 2003 22:07:28 -0000	1.2
--- QuickDraw_Graphics_Suppleme.py	28 Mar 2003 23:37:59 -0000	1.3
***************
*** 57,68 ****
  #
  _classdeclarations = {
- 	'cpic' : graphic_group,
  	'cdrw' : drawing_area,
  }
  
  _propdeclarations = {
  	'prot' : rotation,
- 	'ptrs' : translation,
  	'pscl' : scale,
  }
  
--- 57,68 ----
  #
  _classdeclarations = {
  	'cdrw' : drawing_area,
+ 	'cpic' : graphic_group,
  }
  
  _propdeclarations = {
  	'prot' : rotation,
  	'pscl' : scale,
+ 	'ptrs' : translation,
  }
  

Index: Standard_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Standard_Suite.py	28 Mar 2003 22:07:21 -0000	1.3
--- Standard_Suite.py	28 Mar 2003 23:37:59 -0000	1.4
***************
*** 458,477 ****
  	"""application - An application program """
  	want = 'capp'
! class name(aetools.NProperty):
! 	"""name - the name of the application """
! 	which = 'pnam'
! 	want = 'itxt'
  class frontmost(aetools.NProperty):
  	"""frontmost - Is this the frontmost application? """
  	which = 'pisf'
  	want = 'bool'
  class selection(aetools.NProperty):
  	"""selection - the selection visible to the user.  Use the \xd4select\xd5 command to set a new selection; use \xd4contents of selection\xd5 to get or change information in the document. """
  	which = 'sele'
  	want = 'csel'
- class clipboard(aetools.NProperty):
- 	"""clipboard - the contents of the clipboard for this application """
- 	which = 'pcli'
- 	want = '****'
  class version(aetools.NProperty):
  	"""version - the version of the application """
--- 458,477 ----
  	"""application - An application program """
  	want = 'capp'
! class clipboard(aetools.NProperty):
! 	"""clipboard - the contents of the clipboard for this application """
! 	which = 'pcli'
! 	want = '****'
  class frontmost(aetools.NProperty):
  	"""frontmost - Is this the frontmost application? """
  	which = 'pisf'
  	want = 'bool'
+ class name(aetools.NProperty):
+ 	"""name - the name of the application """
+ 	which = 'pnam'
+ 	want = 'itxt'
  class selection(aetools.NProperty):
  	"""selection - the selection visible to the user.  Use the \xd4select\xd5 command to set a new selection; use \xd4contents of selection\xd5 to get or change information in the document. """
  	which = 'sele'
  	want = 'csel'
  class version(aetools.NProperty):
  	"""version - the version of the application """
***************
*** 526,532 ****
  	which = 'hclb'
  	want = 'bool'
! class titled(aetools.NProperty):
! 	"""titled - Does the window have a title bar? """
! 	which = 'ptit'
  	want = 'bool'
  class index(aetools.NProperty):
--- 526,532 ----
  	which = 'hclb'
  	want = 'bool'
! class floating(aetools.NProperty):
! 	"""floating - Does the window float? """
! 	which = 'isfl'
  	want = 'bool'
  class index(aetools.NProperty):
***************
*** 534,541 ****
  	which = 'pidx'
  	want = 'long'
- class floating(aetools.NProperty):
- 	"""floating - Does the window float? """
- 	which = 'isfl'
- 	want = 'bool'
  class modal(aetools.NProperty):
  	"""modal - Is the window modal? """
--- 534,537 ----
***************
*** 546,549 ****
--- 542,553 ----
  	which = 'prsz'
  	want = 'bool'
+ class titled(aetools.NProperty):
+ 	"""titled - Does the window have a title bar? """
+ 	which = 'ptit'
+ 	want = 'bool'
+ class visible(aetools.NProperty):
+ 	"""visible - Is the window visible? """
+ 	which = 'pvis'
+ 	want = 'bool'
  class zoomable(aetools.NProperty):
  	"""zoomable - Is the window zoomable? """
***************
*** 554,561 ****
  	which = 'pzum'
  	want = 'bool'
- class visible(aetools.NProperty):
- 	"""visible - Is the window visible? """
- 	which = 'pvis'
- 	want = 'bool'
  
  windows = window
--- 558,561 ----
***************
*** 567,574 ****
  application._superclassnames = []
  application._privpropdict = {
! 	'name' : name,
  	'frontmost' : frontmost,
  	'selection' : selection,
- 	'clipboard' : clipboard,
  	'version' : version,
  }
--- 567,574 ----
  application._superclassnames = []
  application._privpropdict = {
! 	'clipboard' : clipboard,
  	'frontmost' : frontmost,
+ 	'name' : name,
  	'selection' : selection,
  	'version' : version,
  }
***************
*** 602,613 ****
  	'bounds' : bounds,
  	'closeable' : closeable,
- 	'titled' : titled,
- 	'index' : index,
  	'floating' : floating,
  	'modal' : modal,
  	'resizable' : resizable,
  	'zoomable' : zoomable,
  	'zoomed' : zoomed,
- 	'visible' : visible,
  }
  window._privelemdict = {
--- 602,613 ----
  	'bounds' : bounds,
  	'closeable' : closeable,
  	'floating' : floating,
+ 	'index' : index,
  	'modal' : modal,
  	'resizable' : resizable,
+ 	'titled' : titled,
+ 	'visible' : visible,
  	'zoomable' : zoomable,
  	'zoomed' : zoomed,
  }
  window._privelemdict = {
***************
*** 664,711 ****
  #
  _classdeclarations = {
- 	'cwin' : window,
- 	'file' : file,
- 	'csel' : selection_2d_object,
  	'alis' : alias,
  	'capp' : application,
  	'cins' : insertion_point,
  	'docu' : document,
  }
  
  _propdeclarations = {
! 	'prsz' : resizable,
! 	'vers' : version,
! 	'pidx' : index,
! 	'pvis' : visible,
  	'imod' : modified,
- 	'pbnd' : bounds,
- 	'sele' : selection,
- 	'pisf' : frontmost,
- 	'pspd' : stationery,
  	'isfl' : floating,
  	'iszm' : zoomable,
! 	'hclb' : closeable,
  	'pcli' : clipboard,
- 	'pmod' : modal,
  	'pcnt' : contents,
  	'pnam' : name,
! 	'pzum' : zoomed,
  	'ptit' : titled,
  }
  
  _compdeclarations = {
  	'<   ' : _3c_,
- 	'ends' : ends_with,
- 	'>=  ' : _b3_,
- 	'cont' : contains,
  	'<=  ' : _b2_,
  	'=   ' : _3d_,
- 	'bgwt' : starts_with,
  	'>   ' : _3e_,
  }
  
  _enumdeclarations = {
  	'savo' : _Enum_savo,
  	'styl' : _Enum_styl,
- 	'kfrm' : _Enum_kfrm,
  }
--- 664,711 ----
  #
  _classdeclarations = {
  	'alis' : alias,
  	'capp' : application,
  	'cins' : insertion_point,
+ 	'csel' : selection_2d_object,
+ 	'cwin' : window,
  	'docu' : document,
+ 	'file' : file,
  }
  
  _propdeclarations = {
! 	'hclb' : closeable,
  	'imod' : modified,
  	'isfl' : floating,
  	'iszm' : zoomable,
! 	'pbnd' : bounds,
  	'pcli' : clipboard,
  	'pcnt' : contents,
+ 	'pidx' : index,
+ 	'pisf' : frontmost,
+ 	'pmod' : modal,
  	'pnam' : name,
! 	'prsz' : resizable,
! 	'pspd' : stationery,
  	'ptit' : titled,
+ 	'pvis' : visible,
+ 	'pzum' : zoomed,
+ 	'sele' : selection,
+ 	'vers' : version,
  }
  
  _compdeclarations = {
  	'<   ' : _3c_,
  	'<=  ' : _b2_,
  	'=   ' : _3d_,
  	'>   ' : _3e_,
+ 	'>=  ' : _b3_,
+ 	'bgwt' : starts_with,
+ 	'cont' : contains,
+ 	'ends' : ends_with,
  }
  
  _enumdeclarations = {
+ 	'kfrm' : _Enum_kfrm,
  	'savo' : _Enum_savo,
  	'styl' : _Enum_styl,
  }

Index: Table_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Table_Suite.py	23 Mar 2003 22:07:28 -0000	1.2
--- Table_Suite.py	28 Mar 2003 23:38:00 -0000	1.3
***************
*** 87,97 ****
  	'ccel' : cell,
  	'ccol' : column,
- 	'ctbl' : table,
  	'crow' : row,
  }
  
  _propdeclarations = {
- 	'pnam' : name,
  	'pfor' : formula,
  	'ppro' : protection,
  }
--- 87,97 ----
  	'ccel' : cell,
  	'ccol' : column,
  	'crow' : row,
+ 	'ctbl' : table,
  }
  
  _propdeclarations = {
  	'pfor' : formula,
+ 	'pnam' : name,
  	'ppro' : protection,
  }

Index: Text_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Text_Suite.py	23 Mar 2003 22:07:28 -0000	1.2
--- Text_Suite.py	28 Mar 2003 23:38:00 -0000	1.3
***************
*** 55,62 ****
  	which = 'ptsz'
  	want = 'fixd'
- class writing_code(aetools.NProperty):
- 	"""writing code - the script system and language """
- 	which = 'psct'
- 	want = 'intl'
  class style(aetools.NProperty):
  	"""style - the text style of the first character of the first character """
--- 55,58 ----
***************
*** 67,70 ****
--- 63,70 ----
  	which = 'ustl'
  	want = 'tsty'
+ class writing_code(aetools.NProperty):
+ 	"""writing code - the script system and language """
+ 	which = 'psct'
+ 	want = 'intl'
  #        element 'cha ' as ['indx']
  #        element 'clin' as ['indx']
***************
*** 86,97 ****
  	"""text style info - On and Off styles of text run """
  	want = 'tsty'
- class on_styles(aetools.NProperty):
- 	"""on styles - the styles that are on for the text """
- 	which = 'onst'
- 	want = 'styl'
  class off_styles(aetools.NProperty):
  	"""off styles - the styles that are off for the text """
  	which = 'ofst'
  	want = 'styl'
  
  text_style_infos = text_style_info
--- 86,97 ----
  	"""text style info - On and Off styles of text run """
  	want = 'tsty'
  class off_styles(aetools.NProperty):
  	"""off styles - the styles that are off for the text """
  	which = 'ofst'
  	want = 'styl'
+ class on_styles(aetools.NProperty):
+ 	"""on styles - the styles that are on for the text """
+ 	which = 'onst'
+ 	want = 'styl'
  
  text_style_infos = text_style_info
***************
*** 126,132 ****
  	'font' : font,
  	'size' : size,
- 	'writing_code' : writing_code,
  	'style' : style,
  	'uniform_styles' : uniform_styles,
  }
  text._privelemdict = {
--- 126,132 ----
  	'font' : font,
  	'size' : size,
  	'style' : style,
  	'uniform_styles' : uniform_styles,
+ 	'writing_code' : writing_code,
  }
  text._privelemdict = {
***************
*** 146,151 ****
  text_style_info._superclassnames = []
  text_style_info._privpropdict = {
- 	'on_styles' : on_styles,
  	'off_styles' : off_styles,
  }
  text_style_info._privelemdict = {
--- 146,151 ----
  text_style_info._superclassnames = []
  text_style_info._privpropdict = {
  	'off_styles' : off_styles,
+ 	'on_styles' : on_styles,
  }
  text_style_info._privelemdict = {
***************
*** 187,211 ****
  #
  _classdeclarations = {
- 	'cpar' : paragraph,
- 	'cha ' : character,
  	'cflo' : text_flow,
! 	'tsty' : text_style_info,
  	'clin' : line,
! 	'cwor' : word,
  	'ctxt' : text,
  }
  
  _propdeclarations = {
! 	'ptsz' : size,
  	'ofst' : off_styles,
  	'pjst' : justification,
! 	'colr' : color,
! 	'txst' : style,
  	'psct' : writing_code,
  	'ustl' : uniform_styles,
- 	'c@#^' : _3c_inheritance_3e_,
- 	'pnam' : name,
- 	'font' : font,
- 	'onst' : on_styles,
  }
  
--- 187,211 ----
  #
  _classdeclarations = {
  	'cflo' : text_flow,
! 	'cha ' : character,
  	'clin' : line,
! 	'cpar' : paragraph,
  	'ctxt' : text,
+ 	'cwor' : word,
+ 	'tsty' : text_style_info,
  }
  
  _propdeclarations = {
! 	'c@#^' : _3c_inheritance_3e_,
! 	'colr' : color,
! 	'font' : font,
  	'ofst' : off_styles,
+ 	'onst' : on_styles,
  	'pjst' : justification,
! 	'pnam' : name,
  	'psct' : writing_code,
+ 	'ptsz' : size,
+ 	'txst' : style,
  	'ustl' : uniform_styles,
  }
  
***************
*** 214,218 ****
  
  _enumdeclarations = {
- 	'styl' : _Enum_styl,
  	'just' : _Enum_just,
  }
--- 214,218 ----
  
  _enumdeclarations = {
  	'just' : _Enum_just,
+ 	'styl' : _Enum_styl,
  }

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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Type_Names_Suite.py	28 Mar 2003 22:07:21 -0000	1.3
--- Type_Names_Suite.py	28 Mar 2003 23:38:00 -0000	1.4
***************
*** 389,432 ****
  #
  _classdeclarations = {
- 	'shor' : small_integer,
- 	'tr16' : RGB16_color,
- 	'vers' : version,
- 	'aeut' : system_dictionary,
- 	'clrt' : color_table,
- 	'fpnt' : fixed_point,
- 	'TIFF' : TIFF_picture,
- 	'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,
  	'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,
  	'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,
! 	'qdrt' : bounding_rectangle,
! 	'comp' : double_integer,
  	'lfxd' : long_fixed,
  	'null' : null,
  	'targ' : target_id,
  }
  
--- 389,432 ----
  #
  _classdeclarations = {
  	'EPS ' : PostScript_picture,
  	'QDpt' : point,
  	'TEXT' : plain_text,
! 	'TIFF' : TIFF_picture,
! 	'aete' : application_dictionary,
! 	'aeut' : system_dictionary,
! 	'clrt' : color_table,
! 	'cmen' : menu_item,
  	'cmnu' : menu,
! 	'comp' : double_integer,
! 	'elin' : type_element_info,
  	'evin' : type_event_info,
! 	'exte' : extended_real,
  	'fixd' : fixed,
! 	'fpnt' : fixed_point,
! 	'frct' : fixed_rectangle,
  	'gcli' : type_class_info,
! 	'insl' : location_reference,
  	'lfpt' : long_fixed_point,
! 	'lfrc' : long_fixed_rectangle,
  	'lfxd' : long_fixed,
+ 	'lpnt' : long_point,
+ 	'lrct' : long_rectangle,
+ 	'mLoc' : machine_location,
+ 	'magn' : unsigned_integer,
  	'null' : null,
+ 	'pinf' : type_property_info,
+ 	'pmin' : type_parameter_info,
+ 	'qdrt' : bounding_rectangle,
+ 	'shor' : small_integer,
+ 	'sing' : small_real,
+ 	'styl' : scrap_styles,
+ 	'suin' : type_suite_info,
  	'targ' : target_id,
+ 	'tdas' : dash_style,
+ 	'tpmm' : pixel_map_record,
+ 	'tr16' : RGB16_color,
+ 	'tr96' : RGB96_color,
+ 	'trot' : rotation,
+ 	'vers' : version,
  }
  

Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** __init__.py	28 Mar 2003 22:07:21 -0000	1.3
--- __init__.py	28 Mar 2003 23:38:00 -0000	1.4
***************
*** 69,119 ****
  # 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)
--- 69,72 ----
***************
*** 259,262 ****
--- 212,262 ----
  getbaseclasses(file_specification)
  getbaseclasses(text)
+ 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)
  
  #
***************
*** 264,314 ****
  #
  _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,
--- 264,267 ----
***************
*** 454,457 ****
--- 407,457 ----
  	'fss ' : file_specification,
  	'ctxt' : text,
+ 	'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,
  }