[Python-checkins] python/dist/src/Lib/plat-mac/lib-scriptpackages/Explorer Microsoft_Internet_Explorer.py,1.2,1.3 Required_Suite.py,1.2,1.3 Web_Browser_Suite.py,1.2,1.3 __init__.py,1.2,1.3

[jackjansen@users.sourceforge.net]

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

Modified Files:
	Microsoft_Internet_Explorer.py Required_Suite.py 
	Web_Browser_Suite.py __init__.py 
Log Message:
Regenerated (from resource files) with sorting version of gensuitemodule.
This is a first step towards regenerating the modules with newer, MacOSX,
versions of these programs, and using the programmatic interface to
get at the terminology in stead of poking in resource files.


Index: Microsoft_Internet_Explorer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Microsoft_Internet_Explorer.py	23 Mar 2003 22:07:27 -0000	1.2
--- Microsoft_Internet_Explorer.py	28 Mar 2003 22:07:17 -0000	1.3
***************
*** 34,52 ****
  			return _arguments['----']
  
! 	_argmap_do_script = {
! 		'window' : 'WIND',
! 	}
! 
! 	def do_script(self, _object, _attributes={}, **_arguments):
! 		"""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
  		"""
  		_code = 'misc'
! 		_subcode = 'dosc'
  
! 		aetools.keysubst(_arguments, self._argmap_do_script)
  		_arguments['----'] = _object
  
--- 34,46 ----
  			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
  
***************
*** 60,72 ****
  			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
  
--- 54,72 ----
  			return _arguments['----']
  
! 	_argmap_do_script = {
! 		'window' : 'WIND',
! 	}
! 
! 	def do_script(self, _object, _attributes={}, **_arguments):
! 		"""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
  		"""
  		_code = 'misc'
! 		_subcode = 'dosc'
  
! 		aetools.keysubst(_arguments, self._argmap_do_script)
  		_arguments['----'] = _object
  

Index: Required_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Required_Suite.py	23 Mar 2003 22:07:27 -0000	1.2
--- Required_Suite.py	28 Mar 2003 22:07:17 -0000	1.3
***************
*** 14,26 ****
  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'
  
  
--- 14,27 ----
  class Required_Suite_Events(Required_Suite_Events):
  
! 	def open(self, _object, _attributes={}, **_arguments):
! 		"""open: Open documents
! 		Required argument: undocumented, typecode 'alis'
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		"""
  		_code = 'aevt'
! 		_subcode = 'odoc'
  
  		if _arguments: raise TypeError, 'No optional args expected'
! 		_arguments['----'] = _object
  
  
***************
*** 33,43 ****
  			return _arguments['----']
  
! 	def open(self, _object, _attributes={}, **_arguments):
! 		"""open: Open documents
  		Required argument: undocumented, typecode 'alis'
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		"""
  		_code = 'aevt'
! 		_subcode = 'odoc'
  
  		if _arguments: raise TypeError, 'No optional args expected'
--- 34,44 ----
  			return _arguments['----']
  
! 	def print_(self, _object, _attributes={}, **_arguments):
! 		"""print: Print documents
  		Required argument: undocumented, typecode 'alis'
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		"""
  		_code = 'aevt'
! 		_subcode = 'pdoc'
  
  		if _arguments: raise TypeError, 'No optional args expected'
***************
*** 53,66 ****
  			return _arguments['----']
  
! 	def print_(self, _object, _attributes={}, **_arguments):
! 		"""print: Print documents
! 		Required argument: undocumented, typecode 'alis'
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		"""
  		_code = 'aevt'
! 		_subcode = 'pdoc'
  
  		if _arguments: raise TypeError, 'No optional args expected'
! 		_arguments['----'] = _object
  
  
--- 54,66 ----
  			return _arguments['----']
  
! 	def quit(self, _no_object=None, _attributes={}, **_arguments):
! 		"""quit: Quit application
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		"""
  		_code = 'aevt'
! 		_subcode = 'quit'
  
  		if _arguments: raise TypeError, 'No optional args expected'
! 		if _no_object != None: raise TypeError, 'No direct arg expected'
  
  
***************
*** 73,82 ****
  			return _arguments['----']
  
! 	def quit(self, _no_object=None, _attributes={}, **_arguments):
! 		"""quit: Quit application
  		Keyword argument _attributes: AppleEvent attribute dictionary
  		"""
  		_code = 'aevt'
! 		_subcode = 'quit'
  
  		if _arguments: raise TypeError, 'No optional args expected'
--- 73,82 ----
  			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'

Index: Web_Browser_Suite.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Web_Browser_Suite.py	23 Mar 2003 22:07:27 -0000	1.2
--- Web_Browser_Suite.py	28 Mar 2003 22:07:17 -0000	1.3
***************
*** 13,67 ****
  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
! 		Keyword argument _attributes: AppleEvent attribute dictionary
! 		"""
! 		_code = 'WWW!'
! 		_subcode = 'OURL'
! 
! 		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)
  		_arguments['----'] = _object
  
--- 13,26 ----
  class Web_Browser_Suite_Events:
  
! 	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
  
***************
*** 122,133 ****
  			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'
--- 81,92 ----
  			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
  		Keyword argument _attributes: AppleEvent attribute dictionary
! 		Returns:   
  		"""
  		_code = 'WWW!'
! 		_subcode = 'WNFO'
  
  		if _arguments: raise TypeError, 'No optional args expected'
***************
*** 163,176 ****
  			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
  		Keyword argument _attributes: AppleEvent attribute dictionary
- 		Returns:   
  		"""
  		_code = 'WWW!'
! 		_subcode = 'WNFO'
  
! 		if _arguments: raise TypeError, 'No optional args expected'
  		_arguments['----'] = _object
  
--- 122,147 ----
  			return _arguments['----']
  
! 	_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
  		"""
  		_code = 'WWW!'
! 		_subcode = 'OURL'
  
! 		aetools.keysubst(_arguments, self._argmap_OpenURL)
  		_arguments['----'] = _object
  
***************
*** 199,202 ****
--- 170,202 ----
  
  		aetools.keysubst(_arguments, self._argmap_ParseAnchor)
+ 		_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
  

Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** __init__.py	23 Mar 2003 22:07:27 -0000	1.2
--- __init__.py	28 Mar 2003 22:07:17 -0000	1.3
***************
*** 5,23 ****
  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,
  }
  
--- 5,23 ----
  import aetools
  Error = aetools.Error
  import Standard_Suite
  import URL_Suite
  import Netscape_Suite
+ import Microsoft_Internet_Explorer
+ import Web_Browser_Suite
+ import Required_Suite
  
  
  _code_to_module = {
  	'****' : Standard_Suite,
  	'GURL' : URL_Suite,
  	'MOSS' : Netscape_Suite,
+ 	'MSIE' : Microsoft_Internet_Explorer,
+ 	'WWW!' : Web_Browser_Suite,
+ 	'reqd' : Required_Suite,
  }
  
***************
*** 25,42 ****
  
  _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 *
  
  def getbaseclasses(v):
--- 25,42 ----
  
  _code_to_fullname = {
  	'****' : ('Explorer.Standard_Suite', 'Standard_Suite'),
  	'GURL' : ('Explorer.URL_Suite', 'URL_Suite'),
  	'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 Standard_Suite import *
  from URL_Suite import *
  from Netscape_Suite import *
+ from Microsoft_Internet_Explorer import *
+ from Web_Browser_Suite import *
+ from Required_Suite import *
  
  def getbaseclasses(v):
***************
*** 67,76 ****
  
  
! 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'
--- 67,76 ----
  
  
! class Explorer(Standard_Suite_Events,
  		URL_Suite_Events,
  		Netscape_Suite_Events,
+ 		Microsoft_Internet_Explorer_Events,
+ 		Web_Browser_Suite_Events,
+ 		Required_Suite_Events,
  		aetools.TalkTo):
  	_signature = 'MSIE'