4 files changed, 130 insertions, 217 deletions
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py
index c48e447..92c1e1f 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py
@@ -333,19 +333,19 @@ class Standard_Suite_Events:
 class application(aetools.ComponentItem):
 	"""application - An application's top level scripting object. """
 	want = 'capp'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'cobj'
-class frontmost(aetools.NProperty):
+class _Prop_frontmost(aetools.NProperty):
 	"""frontmost - Is this the frontmost (active) application? """
 	which = 'pisf'
 	want = 'bool'
-class name(aetools.NProperty):
+class _Prop_name(aetools.NProperty):
 	"""name - The name of the application. """
 	which = 'pnam'
 	want = 'utxt'
-class version(aetools.NProperty):
+class _Prop_version(aetools.NProperty):
 	"""version - The version of the application. """
 	which = 'vers'
 	want = 'utxt'
@@ -357,11 +357,11 @@ applications = application
 class item(aetools.ComponentItem):
 	"""item - A scriptable object. """
 	want = 'cobj'
-class class_(aetools.NProperty):
+class _Prop_class_(aetools.NProperty):
 	"""class - The class of the object. """
 	which = 'pcls'
 	want = 'type'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - All of the object's properties. """
 	which = 'pALL'
 	want = 'reco'
@@ -377,59 +377,59 @@ colors = color
 class window(aetools.ComponentItem):
 	"""window - A window. """
 	want = 'cwin'
-class bounds(aetools.NProperty):
+class _Prop_bounds(aetools.NProperty):
 	"""bounds - The bounding rectangle of the window. """
 	which = 'pbnd'
 	want = 'qdrt'
-class closeable(aetools.NProperty):
+class _Prop_closeable(aetools.NProperty):
 	"""closeable - Whether the window has a close box. """
 	which = 'hclb'
 	want = 'bool'
-class document(aetools.NProperty):
+class _Prop_document(aetools.NProperty):
 	"""document - The document whose contents are being displayed in the window. """
 	which = 'docu'
 	want = 'docu'
-class floating(aetools.NProperty):
+class _Prop_floating(aetools.NProperty):
 	"""floating - Whether the window floats. """
 	which = 'isfl'
 	want = 'bool'
-class id(aetools.NProperty):
+class _Prop_id(aetools.NProperty):
 	"""id - The unique identifier of the window. """
 	which = 'ID  '
 	want = 'long'
-class index(aetools.NProperty):
+class _Prop_index(aetools.NProperty):
 	"""index - The index of the window in the back-to-front window ordering. """
 	which = 'pidx'
 	want = 'long'
-class miniaturizable(aetools.NProperty):
+class _Prop_miniaturizable(aetools.NProperty):
 	"""miniaturizable - Whether the window can be miniaturized. """
 	which = 'ismn'
 	want = 'bool'
-class miniaturized(aetools.NProperty):
+class _Prop_miniaturized(aetools.NProperty):
 	"""miniaturized - Whether the window is currently miniaturized. """
 	which = 'pmnd'
 	want = 'bool'
-class modal(aetools.NProperty):
+class _Prop_modal(aetools.NProperty):
 	"""modal - Whether the window is the application's current modal window. """
 	which = 'pmod'
 	want = 'bool'
-class resizable(aetools.NProperty):
+class _Prop_resizable(aetools.NProperty):
 	"""resizable - Whether the window can be resized. """
 	which = 'prsz'
 	want = 'bool'
-class titled(aetools.NProperty):
+class _Prop_titled(aetools.NProperty):
 	"""titled - Whether the window has a title bar. """
 	which = 'ptit'
 	want = 'bool'
-class visible(aetools.NProperty):
+class _Prop_visible(aetools.NProperty):
 	"""visible - Whether the window is currently visible. """
 	which = 'pvis'
 	want = 'bool'
-class zoomable(aetools.NProperty):
+class _Prop_zoomable(aetools.NProperty):
 	"""zoomable - Whether the window can be zoomed. """
 	which = 'iszm'
 	want = 'bool'
-class zoomed(aetools.NProperty):
+class _Prop_zoomed(aetools.NProperty):
 	"""zoomed - Whether the window is currently zoomed. """
 	which = 'pzum'
 	want = 'bool'
@@ -439,11 +439,11 @@ windows = window
 class document(aetools.ComponentItem):
 	"""document - A document. """
 	want = 'docu'
-class modified(aetools.NProperty):
+class _Prop_modified(aetools.NProperty):
 	"""modified - Has the document been modified since the last save? """
 	which = 'imod'
 	want = 'bool'
-class path(aetools.NProperty):
+class _Prop_path(aetools.NProperty):
 	"""path - The document's path. """
 	which = 'ppth'
 	want = 'utxt'
@@ -451,10 +451,10 @@ class path(aetools.NProperty):
 documents = document
 application._superclassnames = ['item']
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'frontmost' : frontmost,
-	'name' : name,
-	'version' : version,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'frontmost' : _Prop_frontmost,
+	'name' : _Prop_name,
+	'version' : _Prop_version,
 }
 application._privelemdict = {
 	'document' : document,
@@ -462,44 +462,44 @@ application._privelemdict = {
 }
 item._superclassnames = []
 item._privpropdict = {
-	'class_' : class_,
-	'properties' : properties,
+	'class_' : _Prop_class_,
+	'properties' : _Prop_properties,
 }
 item._privelemdict = {
 }
 color._superclassnames = ['item']
 color._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 color._privelemdict = {
 }
 window._superclassnames = ['item']
 window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'bounds' : bounds,
-	'closeable' : closeable,
-	'document' : document,
-	'floating' : floating,
-	'id' : id,
-	'index' : index,
-	'miniaturizable' : miniaturizable,
-	'miniaturized' : miniaturized,
-	'modal' : modal,
-	'name' : name,
-	'resizable' : resizable,
-	'titled' : titled,
-	'visible' : visible,
-	'zoomable' : zoomable,
-	'zoomed' : zoomed,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'bounds' : _Prop_bounds,
+	'closeable' : _Prop_closeable,
+	'document' : _Prop_document,
+	'floating' : _Prop_floating,
+	'id' : _Prop_id,
+	'index' : _Prop_index,
+	'miniaturizable' : _Prop_miniaturizable,
+	'miniaturized' : _Prop_miniaturized,
+	'modal' : _Prop_modal,
+	'name' : _Prop_name,
+	'resizable' : _Prop_resizable,
+	'titled' : _Prop_titled,
+	'visible' : _Prop_visible,
+	'zoomable' : _Prop_zoomable,
+	'zoomed' : _Prop_zoomed,
 }
 window._privelemdict = {
 }
 document._superclassnames = ['item']
 document._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'modified' : modified,
-	'name' : name,
-	'path' : path,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'modified' : _Prop_modified,
+	'name' : _Prop_name,
+	'path' : _Prop_path,
 }
 document._privelemdict = {
 }
@@ -536,43 +536,3 @@ _classdeclarations = {
 	'cwin' : window,
 	'docu' : document,
 }
-
-_propdeclarations = {
-	'ID  ' : id,
-	'c@#^' : _3c_Inheritance_3e_,
-	'docu' : document,
-	'hclb' : closeable,
-	'imod' : modified,
-	'isfl' : floating,
-	'ismn' : miniaturizable,
-	'iszm' : zoomable,
-	'pALL' : properties,
-	'pbnd' : bounds,
-	'pcls' : class_,
-	'pidx' : index,
-	'pisf' : frontmost,
-	'pmnd' : miniaturized,
-	'pmod' : modal,
-	'pnam' : name,
-	'ppth' : path,
-	'prsz' : resizable,
-	'ptit' : titled,
-	'pvis' : visible,
-	'pzum' : zoomed,
-	'vers' : version,
-}
-
-_compdeclarations = {
-	'<   ' : _3c_,
-	'<=  ' : _b2_,
-	'=   ' : _3d_,
-	'>   ' : _3e_,
-	'>=  ' : _b3_,
-	'bgwt' : starts_with,
-	'cont' : contains,
-	'ends' : ends_with,
-}
-
-_enumdeclarations = {
-	'savo' : _Enum_savo,
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
index a724e7f..29a95db 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
@@ -64,11 +64,11 @@ class Terminal_Suite_Events:
 class application(aetools.ComponentItem):
 	"""application - The Terminal program """
 	want = 'capp'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'capp'
-class properties(aetools.NProperty):
+class _Prop_properties(aetools.NProperty):
 	"""properties - every property of the Terminal program """
 	which = 'pALL'
 	want = '****'
@@ -80,91 +80,91 @@ applications = application
 class window(aetools.ComponentItem):
 	"""window - A Terminal window """
 	want = 'cwin'
-class background_color(aetools.NProperty):
+class _Prop_background_color(aetools.NProperty):
 	"""background color - the background color for the window """
 	which = 'pbcl'
 	want = '****'
-class bold_text_color(aetools.NProperty):
+class _Prop_bold_text_color(aetools.NProperty):
 	"""bold text color - the bold text color for the window """
 	which = 'pbtc'
 	want = '****'
-class bounds(aetools.NProperty):
+class _Prop_bounds(aetools.NProperty):
 	"""bounds - the boundary rectangle for the window, relative to the upper left corner of the screen """
 	which = 'pbnd'
 	want = '****'
-class busy(aetools.NProperty):
+class _Prop_busy(aetools.NProperty):
 	"""busy - Is the window busy running a process? """
 	which = 'busy'
 	want = 'bool'
-class contents(aetools.NProperty):
+class _Prop_contents(aetools.NProperty):
 	"""contents - the currently visible contents of the window """
 	which = 'pcnt'
 	want = 'utxt'
-class cursor_color(aetools.NProperty):
+class _Prop_cursor_color(aetools.NProperty):
 	"""cursor color - the cursor color for the window """
 	which = 'pcuc'
 	want = '****'
-class custom_title(aetools.NProperty):
+class _Prop_custom_title(aetools.NProperty):
 	"""custom title - the custom title for the window """
 	which = 'titl'
 	want = 'utxt'
-class frame(aetools.NProperty):
+class _Prop_frame(aetools.NProperty):
 	"""frame - the origin and size of the window """
 	which = 'pfra'
 	want = '****'
-class frontmost(aetools.NProperty):
+class _Prop_frontmost(aetools.NProperty):
 	"""frontmost - Is the window in front of the other Terminal windows? """
 	which = 'pisf'
 	want = 'bool'
-class history(aetools.NProperty):
+class _Prop_history(aetools.NProperty):
 	"""history - the contents of the entire scrolling buffer of the window """
 	which = 'hist'
 	want = 'utxt'
-class normal_text_color(aetools.NProperty):
+class _Prop_normal_text_color(aetools.NProperty):
 	"""normal text color - the normal text color for the window """
 	which = 'ptxc'
 	want = '****'
-class number_of_columns(aetools.NProperty):
+class _Prop_number_of_columns(aetools.NProperty):
 	"""number of columns - the number of columns in the window """
 	which = 'ccol'
 	want = 'long'
-class number_of_rows(aetools.NProperty):
+class _Prop_number_of_rows(aetools.NProperty):
 	"""number of rows - the number of rows in the window """
 	which = 'crow'
 	want = 'long'
-class origin(aetools.NProperty):
+class _Prop_origin(aetools.NProperty):
 	"""origin - the lower left coordinates of the window, relative to the lower left corner of the screen """
 	which = 'pori'
 	want = '****'
-class position(aetools.NProperty):
+class _Prop_position(aetools.NProperty):
 	"""position - the upper left coordinates of the window, relative to the upper left corner of the screen """
 	which = 'ppos'
 	want = '****'
-class processes(aetools.NProperty):
+class _Prop_processes(aetools.NProperty):
 	"""processes - a list of the currently running processes """
 	which = 'prcs'
 	want = 'utxt'
-class size(aetools.NProperty):
+class _Prop_size(aetools.NProperty):
 	"""size - the width and height of the window """
 	which = 'psiz'
 	want = '****'
-class title_displays_custom_title(aetools.NProperty):
+class _Prop_title_displays_custom_title(aetools.NProperty):
 	"""title displays custom title - Does the title for the window contain a custom title? """
 	which = 'tdct'
 	want = 'bool'
-class title_displays_device_name(aetools.NProperty):
+class _Prop_title_displays_device_name(aetools.NProperty):
 	"""title displays device name - Does the title for the window contain the device name? """
 	which = 'tddn'
 	want = 'bool'
-class title_displays_file_name(aetools.NProperty):
+class _Prop_title_displays_file_name(aetools.NProperty):
 	"""title displays file name - Does the title for the window contain the file name? """
 	which = 'tdfn'
 	want = 'bool'
-class title_displays_shell_path(aetools.NProperty):
+class _Prop_title_displays_shell_path(aetools.NProperty):
 	"""title displays shell path - Does the title for the window contain the shell path? """
 	which = 'tdsp'
 	want = 'bool'
-class title_displays_window_size(aetools.NProperty):
+class _Prop_title_displays_window_size(aetools.NProperty):
 	"""title displays window size - Does the title for the window contain the window size? """
 	which = 'tdws'
 	want = 'bool'
@@ -173,8 +173,8 @@ windows = window
 application._superclassnames = []
 import Standard_Suite
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'properties' : properties,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'properties' : _Prop_properties,
 }
 application._privelemdict = {
 	'document' : Standard_Suite.document,
@@ -182,30 +182,30 @@ application._privelemdict = {
 }
 window._superclassnames = []
 window._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'background_color' : background_color,
-	'bold_text_color' : bold_text_color,
-	'bounds' : bounds,
-	'busy' : busy,
-	'contents' : contents,
-	'cursor_color' : cursor_color,
-	'custom_title' : custom_title,
-	'frame' : frame,
-	'frontmost' : frontmost,
-	'history' : history,
-	'normal_text_color' : normal_text_color,
-	'number_of_columns' : number_of_columns,
-	'number_of_rows' : number_of_rows,
-	'origin' : origin,
-	'position' : position,
-	'processes' : processes,
-	'properties' : properties,
-	'size' : size,
-	'title_displays_custom_title' : title_displays_custom_title,
-	'title_displays_device_name' : title_displays_device_name,
-	'title_displays_file_name' : title_displays_file_name,
-	'title_displays_shell_path' : title_displays_shell_path,
-	'title_displays_window_size' : title_displays_window_size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'background_color' : _Prop_background_color,
+	'bold_text_color' : _Prop_bold_text_color,
+	'bounds' : _Prop_bounds,
+	'busy' : _Prop_busy,
+	'contents' : _Prop_contents,
+	'cursor_color' : _Prop_cursor_color,
+	'custom_title' : _Prop_custom_title,
+	'frame' : _Prop_frame,
+	'frontmost' : _Prop_frontmost,
+	'history' : _Prop_history,
+	'normal_text_color' : _Prop_normal_text_color,
+	'number_of_columns' : _Prop_number_of_columns,
+	'number_of_rows' : _Prop_number_of_rows,
+	'origin' : _Prop_origin,
+	'position' : _Prop_position,
+	'processes' : _Prop_processes,
+	'properties' : _Prop_properties,
+	'size' : _Prop_size,
+	'title_displays_custom_title' : _Prop_title_displays_custom_title,
+	'title_displays_device_name' : _Prop_title_displays_device_name,
+	'title_displays_file_name' : _Prop_title_displays_file_name,
+	'title_displays_shell_path' : _Prop_title_displays_shell_path,
+	'title_displays_window_size' : _Prop_title_displays_window_size,
 }
 window._privelemdict = {
 }
@@ -217,36 +217,3 @@ _classdeclarations = {
 	'capp' : application,
 	'cwin' : window,
 }
-
-_propdeclarations = {
-	'busy' : busy,
-	'c@#^' : _3c_Inheritance_3e_,
-	'ccol' : number_of_columns,
-	'crow' : number_of_rows,
-	'hist' : history,
-	'pALL' : properties,
-	'pbcl' : background_color,
-	'pbnd' : bounds,
-	'pbtc' : bold_text_color,
-	'pcnt' : contents,
-	'pcuc' : cursor_color,
-	'pfra' : frame,
-	'pisf' : frontmost,
-	'pori' : origin,
-	'ppos' : position,
-	'prcs' : processes,
-	'psiz' : size,
-	'ptxc' : normal_text_color,
-	'tdct' : title_displays_custom_title,
-	'tddn' : title_displays_device_name,
-	'tdfn' : title_displays_file_name,
-	'tdsp' : title_displays_shell_path,
-	'tdws' : title_displays_window_size,
-	'titl' : custom_title,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
index 3b4fb29..3ab6c6d 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
@@ -18,11 +18,11 @@ class Text_Suite_Events:
 class attachment(aetools.ComponentItem):
 	"""attachment - Represents an inline text attachment.  This class is used mainly for make commands. """
 	want = 'atts'
-class _3c_Inheritance_3e_(aetools.NProperty):
+class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 	"""<Inheritance> - All of the properties of the superclass. """
 	which = 'c@#^'
 	want = 'ctxt'
-class file_name(aetools.NProperty):
+class _Prop_file_name(aetools.NProperty):
 	"""file name - The path to the file for the attachment """
 	which = 'atfn'
 	want = 'utxt'
@@ -34,15 +34,15 @@ class file_name(aetools.NProperty):
 class attribute_run(aetools.ComponentItem):
 	"""attribute run - This subdivides the text into chunks that all have the same attributes. """
 	want = 'catr'
-class color(aetools.NProperty):
+class _Prop_color(aetools.NProperty):
 	"""color - The color of the first character. """
 	which = 'colr'
 	want = 'colr'
-class font(aetools.NProperty):
+class _Prop_font(aetools.NProperty):
 	"""font - The name of the font of the first character. """
 	which = 'font'
 	want = 'utxt'
-class size(aetools.NProperty):
+class _Prop_size(aetools.NProperty):
 	"""size - The size in points of the first character. """
 	which = 'ptsz'
 	want = 'long'
@@ -92,8 +92,8 @@ class word(aetools.ComponentItem):
 words = word
 attachment._superclassnames = ['text']
 attachment._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'file_name' : file_name,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'file_name' : _Prop_file_name,
 }
 attachment._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -104,10 +104,10 @@ attachment._privelemdict = {
 import Standard_Suite
 attribute_run._superclassnames = ['item']
 attribute_run._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 attribute_run._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -117,10 +117,10 @@ attribute_run._privelemdict = {
 }
 character._superclassnames = ['item']
 character._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 character._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -130,10 +130,10 @@ character._privelemdict = {
 }
 paragraph._superclassnames = ['item']
 paragraph._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 paragraph._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -143,10 +143,10 @@ paragraph._privelemdict = {
 }
 text._superclassnames = ['item']
 text._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 text._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -156,10 +156,10 @@ text._privelemdict = {
 }
 word._superclassnames = ['item']
 word._privpropdict = {
-	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
-	'color' : color,
-	'font' : font,
-	'size' : size,
+	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+	'color' : _Prop_color,
+	'font' : _Prop_font,
+	'size' : _Prop_size,
 }
 word._privelemdict = {
 	'attribute_run' : attribute_run,
@@ -179,17 +179,3 @@ _classdeclarations = {
 	'ctxt' : text,
 	'cwor' : word,
 }
-
-_propdeclarations = {
-	'atfn' : file_name,
-	'c@#^' : _3c_Inheritance_3e_,
-	'colr' : color,
-	'font' : font,
-	'ptsz' : size,
-}
-
-_compdeclarations = {
-}
-
-_enumdeclarations = {
-}
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
index 10d2baf..1aaf3d8 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
@@ -43,14 +43,14 @@ import StdSuites
 #
 # Set property and element dictionaries now that all classes have been defined
 #
-getbaseclasses(window)
-getbaseclasses(application)
 getbaseclasses(character)
 getbaseclasses(attachment)
 getbaseclasses(paragraph)
 getbaseclasses(word)
 getbaseclasses(attribute_run)
 getbaseclasses(text)
+getbaseclasses(window)
+getbaseclasses(application)
 getbaseclasses(color)
 getbaseclasses(window)
 getbaseclasses(application)
@@ -61,14 +61,14 @@ getbaseclasses(document)
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cwin' : window,
-	'capp' : application,
 	'cha ' : character,
 	'atts' : attachment,
 	'cpar' : paragraph,
 	'cwor' : word,
 	'catr' : attribute_run,
 	'ctxt' : text,
+	'cwin' : window,
+	'capp' : application,
 	'colr' : color,
 	'cwin' : window,
 	'capp' : application,