Regenerated with Donovan Prestons patch #702620.

7 files changed, 16 insertions, 13 deletions

diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
index ac8013d..d775686 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
@@ -1,7 +1,7 @@
 """Suite Microsoft Internet Explorer Suite: Events defined by Internet Explorer
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
index 5076ce4..1062cd1 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
@@ -1,7 +1,7 @@
 """Suite Netscape Suite: Events defined by Netscape
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
index 05cfa19..3abd880 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
@@ -1,7 +1,7 @@
 """Suite Required Suite: Events that every application should support
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
index 101afe7..7c275d3 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms for most applications
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
index a89913f..7635270 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
@@ -1,7 +1,7 @@
 """Suite URL Suite: Standard suite for Uniform Resource Locators
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
index 96f4ec0..e9cd4ff 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
@@ -1,7 +1,7 @@
 """Suite Web Browser Suite: Class of events supported by Web Browser applications
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
index 15e8b21..018d368 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Package generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 Resource aete resid 0 
 """
 import aetools
@@ -38,15 +38,18 @@ from Web_Browser_Suite import *
 from URL_Suite import *
 from Microsoft_Internet_Explorer import *
 from Netscape_Suite import *
+
 def getbaseclasses(v):
-	if hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):
+	if not getattr(v, '_propdict', None):
 		v._propdict = {}
 		v._elemdict = {}
-		for superclass in v._superclassnames:
-			v._propdict.update(getattr(eval(superclass), '_privpropdict', {}))
-			v._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))
-		v._propdict.update(v._privpropdict)
-		v._elemdict.update(v._privelemdict)
+		for superclassname in getattr(v, '_superclassnames', []):
+			superclass = eval(superclassname)
+			getbaseclasses(superclass)
+			v._propdict.update(getattr(superclass, '_propdict', {}))
+			v._elemdict.update(getattr(superclass, '_elemdict', {}))
+		v._propdict.update(getattr(v, '_privpropdict', {}))
+		v._elemdict.update(getattr(v, '_privelemdict', {}))
 
 import StdSuites