[Python-checkins] python/dist/src/Mac/Lib/lib-scriptpackages/Explorer Microsoft_Internet_Explorer.py,1.1,1.1.20.1 Netscape_Suite.py,1.1,1.1.20.1 Required_Suite.py,1.1,1.1.20.1 URL_Suite.py,1.1,1.1.20.1 Web_Browser_Suite.py,1.1,1.1.20.1 __init__.py,1.1,1.1.20.1

jackjansen@sourceforge.net jackjansen@sourceforge.net
Wed, 24 Apr 2002 02:21:49 -0700


Update of /cvsroot/python/python/dist/src/Mac/Lib/lib-scriptpackages/Explorer
In directory usw-pr-cvs1:/tmp/cvs-serv19565/Explorer

Modified Files:
      Tag: release22-maint
	Microsoft_Internet_Explorer.py Netscape_Suite.py 
	Required_Suite.py URL_Suite.py Web_Browser_Suite.py 
	__init__.py 
Log Message:
Backport of trunk fix:
Second part of fix for #493826: regenerated suite modules so errn exists
but == 0 doesn't signal an error.

This also picked up a few other changes, but they should be harmless.



Index: Microsoft_Internet_Explorer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -C2 -d -r1.1 -r1.1.20.1
*** Microsoft_Internet_Explorer.py	20 Aug 2000 20:23:57 -0000	1.1
--- Microsoft_Internet_Explorer.py	24 Apr 2002 09:21:47 -0000	1.1.20.1
***************
*** 2,6 ****
  Level 1, version 1
  
! Generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
  AETE/AEUT resource version 1/0, language 0, script 0
  """
--- 2,6 ----
  Level 1, version 1
  
! Generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
  AETE/AEUT resource version 1/0, language 0, script 0
  """
***************
*** 14,19 ****
  
  	def GetSource(self, _object=None, _attributes={}, **_arguments):
! 		"""GetSource: Get the html source of a browser window
! 		Required argument: The index of the window to get the source from.  No value means get the source from the frontmost browser window.
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		Returns: undocumented, typecode 'TEXT'
--- 14,19 ----
  
  	def GetSource(self, _object=None, _attributes={}, **_arguments):
! 		"""GetSource: Get the HTML source of a browser window
! 		Required argument: Window Identifier of window from which to get the source. No value means get the source from the frontmost window.
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		Returns: undocumented, typecode 'TEXT'
***************
*** 28,32 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 28,32 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 41,45 ****
  		"""do script: Execute script commands
  		Required argument: JavaScript text to execute
! 		Keyword argument window: optional ID of window (as specified by the ListWindows event) to execute the script in
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		Returns: Return value
--- 41,45 ----
  		"""do script: Execute script commands
  		Required argument: JavaScript text to execute
! 		Keyword argument window: optional Window Identifier (as supplied by the ListWindows event) specifying context in which to execute the script
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		Returns: Return value
***************
*** 54,58 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 54,78 ----
  		_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):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result

Index: Netscape_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/lib-scriptpackages/Explorer/Netscape_Suite.py,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -C2 -d -r1.1 -r1.1.20.1
*** Netscape_Suite.py	20 Aug 2000 20:23:57 -0000	1.1
--- Netscape_Suite.py	24 Apr 2002 09:21:47 -0000	1.1.20.1
***************
*** 1,6 ****
! """Suite Netscape Suite: Events defined by Netscape.
  Level 1, version 1
  
! Generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
  AETE/AEUT resource version 1/0, language 0, script 0
  """
--- 1,6 ----
! """Suite Netscape Suite: Events defined by Netscape
  Level 1, version 1
  
! Generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
  AETE/AEUT resource version 1/0, language 0, script 0
  """
***************
*** 14,18 ****
  
  	def Open_bookmark(self, _object=None, _attributes={}, **_arguments):
! 		"""Open bookmark: Reads in a bookmark file
  		Required argument: If not available, reloads the current bookmark file
  		Keyword argument _attributes: AppleEvent attribute dictionary
--- 14,18 ----
  
  	def Open_bookmark(self, _object=None, _attributes={}, **_arguments):
! 		"""Open bookmark: Opens a bookmark file
  		Required argument: If not available, reloads the current bookmark file
  		Keyword argument _attributes: AppleEvent attribute dictionary
***************
*** 27,31 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 27,31 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result

Index: Required_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/lib-scriptpackages/Explorer/Required_Suite.py,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -C2 -d -r1.1 -r1.1.20.1
*** Required_Suite.py	20 Aug 2000 20:23:57 -0000	1.1
--- Required_Suite.py	24 Apr 2002 09:21:47 -0000	1.1.20.1
***************
*** 2,6 ****
  Level 1, version 1
  
! Generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
  AETE/AEUT resource version 1/0, language 0, script 0
  """
--- 2,6 ----
  Level 1, version 1
  
! Generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
  AETE/AEUT resource version 1/0, language 0, script 0
  """
***************
*** 27,31 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 27,31 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 47,51 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 47,51 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 67,71 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 67,71 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 86,90 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 86,90 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result

Index: URL_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/lib-scriptpackages/Explorer/URL_Suite.py,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -C2 -d -r1.1 -r1.1.20.1
*** URL_Suite.py	20 Aug 2000 20:23:58 -0000	1.1
--- URL_Suite.py	24 Apr 2002 09:21:47 -0000	1.1.20.1
***************
*** 2,6 ****
  Level 1, version 1
  
! Generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
  AETE/AEUT resource version 1/0, language 0, script 0
  """
--- 2,6 ----
  Level 1, version 1
  
! Generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
  AETE/AEUT resource version 1/0, language 0, script 0
  """
***************
*** 19,24 ****
  	def GetURL(self, _object, _attributes={}, **_arguments):
  		"""GetURL: Open the URL (and optionally save it to disk)
! 		Required argument: The URL
! 		Keyword argument to: Save the resolved URL contents to this file.
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		"""
--- 19,24 ----
  	def GetURL(self, _object, _attributes={}, **_arguments):
  		"""GetURL: Open the URL (and optionally save it to disk)
! 		Required argument: URL to open
! 		Keyword argument to: File into which to save resource located at URL.
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		"""
***************
*** 32,36 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 32,36 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result

Index: Web_Browser_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/lib-scriptpackages/Explorer/Web_Browser_Suite.py,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -C2 -d -r1.1 -r1.1.20.1
*** Web_Browser_Suite.py	20 Aug 2000 20:23:58 -0000	1.1
--- Web_Browser_Suite.py	24 Apr 2002 09:21:47 -0000	1.1.20.1
***************
*** 1,6 ****
! """Suite Web Browser Suite: Class of events which are sent to Web Browser applications
  Level 1, version 1
  
! Generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
  AETE/AEUT resource version 1/0, language 0, script 0
  """
--- 1,6 ----
! """Suite Web Browser Suite: Class of events supported by Web Browser applications
  Level 1, version 1
  
! Generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
  AETE/AEUT resource version 1/0, language 0, script 0
  """
***************
*** 18,38 ****
  		'Flags' : 'FLGS',
  		'FormData' : 'POST',
! 		'MIMEType' : 'MIME',
! 		'ProgressApp' : 'PROG',
! 		'ResultApp' : 'RSLT',
  	}
  
  	def OpenURL(self, _object, _attributes={}, **_arguments):
  		"""OpenURL: Retrieves URL off the Web.
! 		Required argument: Fully specified URL
! 		Keyword argument to: File to save downloaded data into.
! 		Keyword argument toWindow: Window to open this URL into. (Use -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: Posting of forms of a given MIMEType.
! 		Keyword argument MIMEType: MIME type for the FormData.  
! 		Keyword argument ProgressApp: If specified, ProgressApp can be named to handle the user interface for process messages. 
! 		Keyword argument ResultApp: When the requested URL has been accessed and all associated documents loaded, the Web browser will issue an OpenURLResult to the ResultApp.
  		Keyword argument _attributes: AppleEvent attribute dictionary
- 		Returns: TransactionID
  		"""
  		_code = 'WWW!'
--- 18,33 ----
  		'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
  		"""
  		_code = 'WWW!'
***************
*** 45,49 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 40,44 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 52,70 ****
  
  	_argmap_ShowFile = {
! 		'MIME_type' : 'MIME',
! 		'Window_ID' : 'WIND',
  		'URL' : 'URL ',
- 		'ResultApp' : 'RSLT',
  	}
  
  	def ShowFile(self, _object, _attributes={}, **_arguments):
! 		"""ShowFile: Passes FileSpec containing data of a given MIME type to be rendered in a given WindowID.
! 		Required argument: The file to show.
! 		Keyword argument MIME_type: MIME type
! 		Keyword argument Window_ID: ID of the window to open the file into. (Can use -1 for top window)
! 		Keyword argument URL: A URL which allows this document to be reloaded if necessary.
! 		Keyword argument ResultApp: When the requested URL has been accessed and all associated documents loaded, the Web browser will issue a ShowFileResult to the ResultApp.
  		Keyword argument _attributes: AppleEvent attribute dictionary
- 		Returns: TransactionID
  		"""
  		_code = 'WWW!'
--- 47,62 ----
  
  	_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!'
***************
*** 77,128 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	def CancelTransaction(self, _object, _attributes={}, **_arguments):
! 		"""CancelTransaction: Tells the Web browser to cancel a TransactionID is progress which the application has initiated via an OpenURL or ShowFile command.
! 		Required argument: TransactionID
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'CANT'
! 
! 		if _arguments: raise TypeError, 'No optional args expected'
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	_argmap_QueryVersion = {
! 		'Major_Version' : 'MAJV',
! 		'Minor_Version' : 'MINV',
! 	}
! 
! 	def QueryVersion(self, _no_object=None, _attributes={}, **_arguments):
! 		"""QueryVersion: Tells the Web browser that an application which wishes to communicate with it supports a specific version (major.minor) of this SDI specification
! 		Keyword argument Major_Version: Major version of the SDI specification the sending application supports. 
! 		Keyword argument Minor_Version: Minor version of the SDI specification the sending application supports. 
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		Returns:      
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'QVER'
! 
! 		aetools.keysubst(_arguments, self._argmap_QueryVersion)
! 		if _no_object != None: raise TypeError, 'No direct arg expected'
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 69,73 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 131,135 ****
  
  	def CloseAllWindows(self, _no_object=None, _attributes={}, **_arguments):
! 		"""CloseAllWindows: Tells the Web browser to close all windows
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		Returns: Success
--- 76,80 ----
  
  	def CloseAllWindows(self, _no_object=None, _attributes={}, **_arguments):
! 		"""CloseAllWindows: Closes all windows
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		Returns: Success
***************
*** 144,148 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 89,93 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 156,162 ****
  
  	def CloseWindow(self, _no_object=None, _attributes={}, **_arguments):
! 		"""CloseWindow: Tells the Web browser to close the window specified either by Window ID or Title. If no parameters are specified, the top window will be closed.
  		Keyword argument ID: ID of the window to close. (Can use -1 for top window)
! 		Keyword argument Title: Title of the window to close.
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		Returns: Success
--- 101,107 ----
  
  	def CloseWindow(self, _no_object=None, _attributes={}, **_arguments):
! 		"""CloseWindow: Close the window specified by either Window Identifier or Title. If no parameter is specified, close the top window.
  		Keyword argument ID: ID of the window to close. (Can use -1 for top window)
! 		Keyword argument Title: Title of the window to close
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		Returns: Success
***************
*** 171,175 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 116,120 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 177,195 ****
  			return _arguments['----']
  
- 	_argmap_Activate = {
- 		'Flags' : 'FLGS',
- 	}
- 
  	def Activate(self, _object=None, _attributes={}, **_arguments):
! 		"""Activate: Tells the Web browser to bring itself to the front and show WindowID. (Can use -1 for top window)
! 		Required argument: WindowID
! 		Keyword argument Flags: Reserved for future use 
  		Keyword argument _attributes: AppleEvent attribute dictionary
! 		Returns: WindowID of the front window
  		"""
  		_code = 'WWW!'
  		_subcode = 'ACTV'
  
! 		aetools.keysubst(_arguments, self._argmap_Activate)
  		_arguments['----'] = _object
  
--- 122,135 ----
  			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
  		Keyword argument _attributes: AppleEvent attribute dictionary
! 		Returns: Window Identifier of window to activate
  		"""
  		_code = 'WWW!'
  		_subcode = 'ACTV'
  
! 		if _arguments: raise TypeError, 'No optional args expected'
  		_arguments['----'] = _object
  
***************
*** 197,201 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 137,141 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 204,208 ****
  
  	def ListWindows(self, _no_object=None, _attributes={}, **_arguments):
! 		"""ListWindows: Return a list of WindowIDs representing each windows currently being used by the Web browser.
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		Returns: undocumented, typecode 'list'
--- 144,148 ----
  
  	def ListWindows(self, _no_object=None, _attributes={}, **_arguments):
! 		"""ListWindows: Returns list of Window Identifiers for all open windows.
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		Returns: undocumented, typecode 'list'
***************
*** 217,221 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 157,161 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 224,229 ****
  
  	def GetWindowInfo(self, _object, _attributes={}, **_arguments):
! 		"""GetWindowInfo: Returns a window info record (URL/Title) for the specified window. 
! 		Required argument: WindowID of the window to get info about
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		Returns:   
--- 164,169 ----
  
  	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:   
***************
*** 238,242 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 178,182 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
***************
*** 249,257 ****
  
  	def ParseAnchor(self, _object, _attributes={}, **_arguments):
! 		"""ParseAnchor: Combine a base URL and a relative URL to produce a fully-specified URL
! 		Required argument: MainURL.The base URL.
! 		Keyword argument withURL: RelativeURL, which, when combined with the MainURL (in the direct object), is used to produce a fully-specified URL.
  		Keyword argument _attributes: AppleEvent attribute dictionary
! 		Returns: The Fully specified URL
  		"""
  		_code = 'WWW!'
--- 189,197 ----
  
  	def ParseAnchor(self, _object, _attributes={}, **_arguments):
! 		"""ParseAnchor: Combines a base URL and a relative URL to produce a fully-qualified URL
! 		Required argument: Base URL
! 		Keyword argument withURL: Relative URL that is combined with the Base URL (in the direct object) to produce a fully-qualified URL.
  		Keyword argument _attributes: AppleEvent attribute dictionary
! 		Returns: Fully-qualified URL
  		"""
  		_code = 'WWW!'
***************
*** 264,614 ****
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	_argmap_BeginProgress = {
! 		'with_Message' : 'PMSG',
! 	}
! 
! 	def BeginProgress(self, _object, _attributes={}, **_arguments):
! 		"""BeginProgress: Initialize a progress indicator.
! 		Required argument: TransactionID
! 		Keyword argument with_Message: Message to display with the progress indicator.
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		Returns: Success 
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'PRBG'
! 
! 		aetools.keysubst(_arguments, self._argmap_BeginProgress)
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	_argmap_SetProgressRange = {
! 		'Max' : 'MAXV',
! 	}
! 
! 	def SetProgressRange(self, _object, _attributes={}, **_arguments):
! 		"""SetProgressRange: Sets a max value for the progress indicator associated with TransactionID
! 		Required argument: TransactionID
! 		Keyword argument Max: Max value for this progress indicator
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'PRSR'
! 
! 		aetools.keysubst(_arguments, self._argmap_SetProgressRange)
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	_argmap_MakingProgress = {
! 		'with_message' : 'PMSG',
! 		'current_setting' : 'CURR',
! 	}
! 
! 	def MakingProgress(self, _object, _attributes={}, **_arguments):
! 		"""MakingProgress: Updates the progress indicator associated with TransactionID
! 		Required argument: TransactionID
! 		Keyword argument with_message: Message to display in the progress indicator
! 		Keyword argument current_setting: Current value of the progress indicator
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		Returns: Cancel
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'PRMK'
! 
! 		aetools.keysubst(_arguments, self._argmap_MakingProgress)
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	def EndProgress(self, _object, _attributes={}, **_arguments):
! 		"""EndProgress: Nortifies the application that the progress indicator associated with TransactionID is no longer needed.
! 		Required argument: TransactionID
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'PREN'
! 
! 		if _arguments: raise TypeError, 'No optional args expected'
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	def RegisterDone(self, _object, _attributes={}, **_arguments):
! 		"""RegisterDone: Signals that all processing initiated by the RegisteNow event associated by TransactionID has finished.
! 		Required argument: TransactionID
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		Returns: 0 = failure; 1 = success; 2 = sending application needs more time to complete operation.
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'RGDN'
! 
! 		if _arguments: raise TypeError, 'No optional args expected'
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	_argmap_RegisterProtocol = {
! 		'_for' : 'PROT',
! 	}
! 
! 	def RegisterProtocol(self, _object, _attributes={}, **_arguments):
! 		"""RegisterProtocol: Notifies that the sending application is able to handle all URLs for the specified protocol.
! 		Required argument: application
! 		Keyword argument _for: Protocol, such as NEWS, MAILTO, etc... 
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		Returns: Success
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'RGPR'
! 
! 		aetools.keysubst(_arguments, self._argmap_RegisterProtocol)
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	_argmap_UnRegisterProtocol = {
! 		'_for' : 'PROT',
! 	}
! 
! 	def UnRegisterProtocol(self, _object, _attributes={}, **_arguments):
! 		"""UnRegisterProtocol: Notifies that the sending application is no longer wishes to handle URLs for the specified protocol.
! 		Required argument: application
! 		Keyword argument _for: Protocol, such as NEWS, MAILTO, etc... 
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'UNRP'
! 
! 		aetools.keysubst(_arguments, self._argmap_UnRegisterProtocol)
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	_argmap_RegisterViewer = {
! 		'_for' : 'MIME',
! 		'as' : 'FTYP',
! 		'Flags' : 'MTHD',
! 	}
! 
! 	def RegisterViewer(self, _object, _attributes={}, **_arguments):
! 		"""RegisterViewer: Notifies that the sending application is able to handle all documents for the specified MIMEType.
! 		Required argument: application
! 		Keyword argument _for: MIMEType
! 		Keyword argument as: File type for saved documents
! 		Keyword argument Flags: undocumented, typecode 'shor'
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'RGVW'
! 
! 		aetools.keysubst(_arguments, self._argmap_RegisterViewer)
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	_argmap_UnRegisterViewer = {
! 		'_for' : 'MIME',
! 	}
! 
! 	def UnRegisterViewer(self, _object, _attributes={}, **_arguments):
! 		"""UnRegisterViewer: Notifies that the sending application is no longer wishes to handle documents of the specified MIMEType.
! 		Required argument: application
! 		Keyword argument _for: MIMEType
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'UNVW'
! 
! 		aetools.keysubst(_arguments, self._argmap_UnRegisterViewer)
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	def RegisterURLEcho(self, _object, _attributes={}, **_arguments):
! 		"""RegisterURLEcho: Notifies that the sending application would like to receive EchoURL events.
! 		Required argument: application
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		Returns: Success
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'RGUE'
! 
! 		if _arguments: raise TypeError, 'No optional args expected'
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	def UnRegisterURLEcho(self, _object, _attributes={}, **_arguments):
! 		"""UnRegisterURLEcho: Notifies that the sending application would no longer like to receive EchoURL events.
! 		Required argument: application
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'UNRU'
! 
! 		if _arguments: raise TypeError, 'No optional args expected'
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	def RegisterWindowClose(self, _object, _attributes={}, **_arguments):
! 		"""RegisterWindowClose: Notifies that the sending application would like to receive WindowClose events.
! 		Required argument: application
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'RGWC'
! 
! 		if _arguments: raise TypeError, 'No optional args expected'
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	def UnRegisterWindowClose(self, _object, _attributes={}, **_arguments):
! 		"""UnRegisterWindowClose: Notifies that the sending application would no longer like to receive WindowClose events.
! 		Required argument: application
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'UNRC'
! 
! 		if _arguments: raise TypeError, 'No optional args expected'
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	def RegisterAppClose(self, _object, _attributes={}, **_arguments):
! 		"""RegisterAppClose: Notifies that the sending application would like to receive AppClose events.
! 		Required argument: application
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'RGAC'
! 
! 		if _arguments: raise TypeError, 'No optional args expected'
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
! 			raise aetools.Error, aetools.decodeerror(_arguments)
! 		# XXXX Optionally decode result
! 		if _arguments.has_key('----'):
! 			return _arguments['----']
! 
! 	def UnRegisterAppClose(self, _object, _attributes={}, **_arguments):
! 		"""UnRegisterAppClose: Notifies that the sending application would no longer like to receive AppClose events.
! 		Required argument: application
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'UNRA'
! 
! 		if _arguments: raise TypeError, 'No optional args expected'
! 		_arguments['----'] = _object
! 
! 
! 		_reply, _arguments, _attributes = self.send(_code, _subcode,
! 				_arguments, _attributes)
! 		if _arguments.has_key('errn'):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result
--- 204,208 ----
  		_reply, _arguments, _attributes = self.send(_code, _subcode,
  				_arguments, _attributes)
! 		if _arguments.get('errn', 0):
  			raise aetools.Error, aetools.decodeerror(_arguments)
  		# XXXX Optionally decode result

Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/lib-scriptpackages/Explorer/__init__.py,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -C2 -d -r1.1 -r1.1.20.1
*** __init__.py	20 Aug 2000 20:23:58 -0000	1.1
--- __init__.py	24 Apr 2002 09:21:47 -0000	1.1.20.1
***************
*** 1,20 ****
  """
! Package generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
  Resource aete resid 0 
  """
  import aetools
  import Web_Browser_Suite
  import URL_Suite
  import Microsoft_Internet_Explorer
  import Netscape_Suite
- import Required_Suite
  
  
  _code_to_module = {
  	'WWW!' : Web_Browser_Suite,
  	'GURL' : URL_Suite,
  	'MSIE' : Microsoft_Internet_Explorer,
  	'MOSS' : Netscape_Suite,
- 	'reqd' : Required_Suite,
  }
  
--- 1,23 ----
  """
! Package generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
  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
  
  
  _code_to_module = {
+ 	'reqd' : Required_Suite,
+ 	'****' : Standard_Suite,
  	'WWW!' : Web_Browser_Suite,
  	'GURL' : URL_Suite,
  	'MSIE' : Microsoft_Internet_Explorer,
  	'MOSS' : Netscape_Suite,
  }
  
***************
*** 22,44 ****
  
  _code_to_fullname = {
  	'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'),
- 	'reqd' : ('Explorer.Required_Suite', 'Required_Suite'),
  }
  
  from Web_Browser_Suite import *
  from URL_Suite import *
  from Microsoft_Internet_Explorer import *
  from Netscape_Suite import *
- from Required_Suite import *
  
  
! class Explorer(Web_Browser_Suite_Events,
  		URL_Suite_Events,
  		Microsoft_Internet_Explorer_Events,
  		Netscape_Suite_Events,
- 		Required_Suite_Events,
  		aetools.TalkTo):
  	_signature = 'MSIE'
--- 25,50 ----
  
  _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'),
  }
  
+ 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 *
  
  
! class Explorer(Required_Suite_Events,
! 		Standard_Suite_Events,
! 		Web_Browser_Suite_Events,
  		URL_Suite_Events,
  		Microsoft_Internet_Explorer_Events,
  		Netscape_Suite_Events,
  		aetools.TalkTo):
  	_signature = 'MSIE'