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

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

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

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

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

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

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

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

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

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