Fix test_scriptpackage with pure will power.
I really don't know why I bother; these are all generated files.
But I don't recall how to regenerate them nor how to fix the generator.
The hardest part was fixing two mutual recursive imports;
somehow changing "import foo" into "from . import foo" where
foo and bar import each other AND both are imported from __init__.py
caused things to break. Bah.
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
index 0fd562b..17284d7 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
@@ -454,7 +454,7 @@
}
single_class_browser._privelemdict = {
}
-import Standard_Suite
+from . import Standard_Suite
single_class_hierarchy._superclassnames = ['document']
single_class_hierarchy._privpropdict = {
'inherits' : _Prop_inherits,
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
index 5ef7ca9..c57fd1f 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
@@ -3,10 +3,10 @@
"""
import aetools
Error = aetools.Error
-import CodeWarrior_suite
-import Standard_Suite
-import Metrowerks_Shell_Suite
-import Required
+from . import CodeWarrior_suite
+from . import Standard_Suite
+from . import Metrowerks_Shell_Suite
+from . import Required
_code_to_module = {
@@ -25,10 +25,10 @@
'reqd' : ('CodeWarrior.Required', 'Required'),
}
-from CodeWarrior_suite import *
-from Standard_Suite import *
-from Metrowerks_Shell_Suite import *
-from Required import *
+from CodeWarrior.CodeWarrior_suite import *
+from CodeWarrior.Standard_Suite import *
+from CodeWarrior.Metrowerks_Shell_Suite import *
+from CodeWarrior.Required import *
def getbaseclasses(v):
if not getattr(v, '_propdict', None):
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
index a9b09b0..734c90f 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
@@ -3,12 +3,12 @@
"""
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
+from . import Standard_Suite
+from . import URL_Suite
+from . import Netscape_Suite
+from . import Microsoft_Internet_Explorer
+from . import Web_Browser_Suite
+from . import Required_Suite
_code_to_module = {
@@ -31,12 +31,12 @@
'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 *
+from Explorer.Standard_Suite import *
+from Explorer.URL_Suite import *
+from Explorer.Netscape_Suite import *
+from Explorer.Microsoft_Internet_Explorer import *
+from Explorer.Web_Browser_Suite import *
+from Explorer.Required_Suite import *
def getbaseclasses(v):
if not getattr(v, '_propdict', None):
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py b/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
index e495ef4..474ac6f 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
@@ -148,8 +148,8 @@
# element 'inlf' as ['indx', 'name']
# element 'pack' as ['indx', 'name']
disk._superclassnames = ['container']
-import Files
-import Finder_items
+from . import Files
+from . import Finder_items
disk._privpropdict = {
'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
'capacity' : _Prop_capacity,
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Files.py b/Lib/plat-mac/lib-scriptpackages/Finder/Files.py
index ddbe1ba..1b96540 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Files.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Files.py
@@ -148,7 +148,7 @@
}
document_file._privelemdict = {
}
-import Finder_items
+from . import Finder_items
file._superclassnames = ['item']
file._privpropdict = {
'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
index c0a7b20..831e101 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
@@ -141,10 +141,10 @@
# element 'lwnd' as ['indx', 'name']
# element 'pack' as ['indx', 'name']
application._superclassnames = []
-import Files
-import Window_classes
-import Containers_and_folders
-import Finder_items
+from . import Files
+from . import Window_classes
+from . import Containers_and_folders
+from . import Finder_items
application._privpropdict = {
'Finder_preferences' : _Prop_Finder_preferences,
'clipboard' : _Prop_clipboard,
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
index 8782a4f..364d467 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
@@ -3,15 +3,15 @@
"""
import aetools
Error = aetools.Error
-import Standard_Suite
-import Legacy_suite
-import Containers_and_folders
-import Files
-import Finder_Basics
-import Finder_items
-import Window_classes
-import Type_Definitions
-import Enumerations
+from . import Standard_Suite
+from . import Legacy_suite
+from . import Containers_and_folders
+from . import Files
+from . import Finder_Basics
+from . import Finder_items
+from . import Window_classes
+from . import Type_Definitions
+from . import Enumerations
_code_to_module = {
@@ -40,15 +40,15 @@
'tpnm' : ('Finder.Enumerations', 'Enumerations'),
}
-from Standard_Suite import *
-from Legacy_suite import *
-from Containers_and_folders import *
-from Files import *
-from Finder_Basics import *
-from Finder_items import *
-from Window_classes import *
-from Type_Definitions import *
-from Enumerations import *
+from Finder.Standard_Suite import *
+from Finder.Legacy_suite import *
+from Finder.Containers_and_folders import *
+from Finder.Files import *
+from Finder.Finder_Basics import *
+from Finder.Finder_items import *
+from Finder.Window_classes import *
+from Finder.Type_Definitions import *
+from Finder.Enumerations import *
def getbaseclasses(v):
if not getattr(v, '_propdict', None):
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
index 0dc5398..6fc495f 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
@@ -3,13 +3,13 @@
"""
import aetools
Error = aetools.Error
-import Standard_Suite
-import Standard_URL_suite
-import Mozilla_suite
-import Text
-import WorldWideWeb_suite
-import PowerPlant
-import Required_suite
+from . import Standard_Suite
+from . import Standard_URL_suite
+from . import Mozilla_suite
+from . import Text
+from . import WorldWideWeb_suite
+from . import PowerPlant
+from . import Required_suite
_code_to_module = {
@@ -34,13 +34,13 @@
'reqd' : ('Netscape.Required_suite', 'Required_suite'),
}
-from Standard_Suite import *
-from Standard_URL_suite import *
-from Mozilla_suite import *
-from Text import *
-from WorldWideWeb_suite import *
-from PowerPlant import *
-from Required_suite import *
+from Netscape.Standard_Suite import *
+from Netscape.Standard_URL_suite import *
+from Netscape.Mozilla_suite import *
+from Netscape.Text import *
+from Netscape.WorldWideWeb_suite import *
+from Netscape.PowerPlant import *
+from Netscape.Required_suite import *
def getbaseclasses(v):
if not getattr(v, '_propdict', None):
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
index b80e3ba..b07f160 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
@@ -4,15 +4,15 @@
"""
import aetools
Error = aetools.Error
-import Text_Suite
-import AppleScript_Suite
-import Standard_Suite
-import Macintosh_Connectivity_Clas
-import QuickDraw_Graphics_Suite
-import QuickDraw_Graphics_Suppleme
-import Required_Suite
-import Table_Suite
-import Type_Names_Suite
+from . import Text_Suite
+from . import AppleScript_Suite
+from . import Standard_Suite
+from . import Macintosh_Connectivity_Clas
+from . import QuickDraw_Graphics_Suite
+from . import QuickDraw_Graphics_Suppleme
+from . import Required_Suite
+from . import Table_Suite
+from . import Type_Names_Suite
_code_to_module = {
@@ -41,15 +41,15 @@
'tpnm' : ('StdSuites.Type_Names_Suite', 'Type_Names_Suite'),
}
-from Text_Suite import *
-from AppleScript_Suite import *
-from Standard_Suite import *
-from Macintosh_Connectivity_Clas import *
-from QuickDraw_Graphics_Suite import *
-from QuickDraw_Graphics_Suppleme import *
-from Required_Suite import *
-from Table_Suite import *
-from Type_Names_Suite import *
+from StdSuites.Text_Suite import *
+from StdSuites.AppleScript_Suite import *
+from StdSuites.Standard_Suite import *
+from StdSuites.Macintosh_Connectivity_Clas import *
+from StdSuites.QuickDraw_Graphics_Suite import *
+from StdSuites.QuickDraw_Graphics_Suppleme import *
+from StdSuites.Required_Suite import *
+from StdSuites.Table_Suite import *
+from StdSuites.Type_Names_Suite import *
def getbaseclasses(v):
if not getattr(v, '_propdict', None):
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_Folder_File_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_Folder_File_Suite.py
index a9ac3dd..a0b199f 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_Folder_File_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_Folder_File_Suite.py
@@ -5,6 +5,11 @@
AETE/AEUT resource version 1/0, language 0, script 0
"""
+# Crutch for recursive import
+import sys
+import SystemEvents
+SystemEvents.Disk_Folder_File_Suite = sys.modules[__name__]
+
import aetools
import MacOS
@@ -210,10 +215,10 @@
files = file
application._superclassnames = []
-import Standard_Suite
-import Folder_Actions_Suite
-import Login_Items_Suite
-import Processes_Suite
+from . import Standard_Suite
+from . import Folder_Actions_Suite
+from . import Login_Items_Suite
+from . import Processes_Suite
application._privpropdict = {
'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
'folder_actions_enabled' : _Prop_folder_actions_enabled,
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py
index c2c7e5e..cb07a14 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py
@@ -5,6 +5,11 @@
AETE/AEUT resource version 1/0, language 0, script 0
"""
+# Crutch for recursive import
+import sys
+import SystemEvents
+SystemEvents.Folder_Actions_Suite = sys.modules[__name__]
+
import aetools
import MacOS
@@ -208,10 +213,11 @@
scripts = script
application._superclassnames = []
-import Disk_Folder_File_Suite
-import Standard_Suite
-import Login_Items_Suite
-import Processes_Suite
+import sys
+from . import Disk_Folder_File_Suite
+from . import Standard_Suite
+from . import Login_Items_Suite
+from . import Processes_Suite
application._privpropdict = {
'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
'folder_actions_enabled' : _Prop_folder_actions_enabled,
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py
index ed09245..0409558 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py
@@ -40,7 +40,7 @@
want = 'utxt'
login_items = login_item
-import Standard_Suite
+from . import Standard_Suite
login_item._superclassnames = ['item']
login_item._privpropdict = {
'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py
index ef539b1..bfdf536 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py
@@ -105,11 +105,11 @@
applications = application
application._superclassnames = []
-import Disk_Folder_File_Suite
-import Standard_Suite
-import Folder_Actions_Suite
-import Login_Items_Suite
-import Processes_Suite
+from . import Disk_Folder_File_Suite
+from . import Standard_Suite
+from . import Folder_Actions_Suite
+from . import Login_Items_Suite
+from . import Processes_Suite
application._privpropdict = {
'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
'folder_actions_enabled' : _Prop_folder_actions_enabled,
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py
index 9dcb85f..a55c0a1 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py
@@ -121,10 +121,10 @@
processes = process
application._superclassnames = []
-import Disk_Folder_File_Suite
-import Standard_Suite
-import Folder_Actions_Suite
-import Login_Items_Suite
+from . import Disk_Folder_File_Suite
+from . import Standard_Suite
+from . import Folder_Actions_Suite
+from . import Login_Items_Suite
application._privpropdict = {
'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
'folder_actions_enabled' : _Prop_folder_actions_enabled,
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py
index d5b4bfc..cf3e213 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py
@@ -65,11 +65,11 @@
applications = application
application._superclassnames = []
-import Disk_Folder_File_Suite
-import Standard_Suite
-import Folder_Actions_Suite
-import Login_Items_Suite
-import Processes_Suite
+from . import Disk_Folder_File_Suite
+from . import Standard_Suite
+from . import Folder_Actions_Suite
+from . import Login_Items_Suite
+from . import Processes_Suite
application._privpropdict = {
'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
'folder_actions_enabled' : _Prop_folder_actions_enabled,
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py
index 9f109e1..ec66c2c 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py
@@ -101,7 +101,7 @@
'paragraph' : paragraph,
'word' : word,
}
-import Standard_Suite
+from . import Standard_Suite
attribute_run._superclassnames = ['item']
attribute_run._privpropdict = {
'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
index 95f985c..ce3b0e2 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
@@ -3,14 +3,14 @@
"""
import aetools
Error = aetools.Error
-import Standard_Suite
-import Text_Suite
-import Disk_Folder_File_Suite
-import Folder_Actions_Suite
-import Login_Items_Suite
-import Power_Suite
-import Processes_Suite
-import System_Events_Suite
+from . import Standard_Suite
+from . import Text_Suite
+from . import Disk_Folder_File_Suite
+from . import Folder_Actions_Suite
+from . import Login_Items_Suite
+from . import Power_Suite
+from . import Processes_Suite
+from . import System_Events_Suite
_code_to_module = {
@@ -37,14 +37,14 @@
'sevs' : ('SystemEvents.System_Events_Suite', 'System_Events_Suite'),
}
-from Standard_Suite import *
-from Text_Suite import *
-from Disk_Folder_File_Suite import *
-from Folder_Actions_Suite import *
-from Login_Items_Suite import *
-from Power_Suite import *
-from Processes_Suite import *
-from System_Events_Suite import *
+from SystemEvents.Standard_Suite import *
+from SystemEvents.Text_Suite import *
+from SystemEvents.Disk_Folder_File_Suite import *
+from SystemEvents.Folder_Actions_Suite import *
+from SystemEvents.Login_Items_Suite import *
+from SystemEvents.Power_Suite import *
+from SystemEvents.Processes_Suite import *
+from SystemEvents.System_Events_Suite import *
def getbaseclasses(v):
if not getattr(v, '_propdict', None):
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
index afa02b3..caa53d4 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
@@ -173,7 +173,7 @@
windows = window
application._superclassnames = []
-import Standard_Suite
+from . import Standard_Suite
application._privpropdict = {
'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
'properties' : _Prop_properties,
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
index 62f4744..1303208 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
@@ -101,7 +101,7 @@
'paragraph' : paragraph,
'word' : word,
}
-import Standard_Suite
+from . import Standard_Suite
attribute_run._superclassnames = ['item']
attribute_run._privpropdict = {
'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
index 47b75f2..d400409 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
@@ -3,9 +3,9 @@
"""
import aetools
Error = aetools.Error
-import Standard_Suite
-import Text_Suite
-import Terminal_Suite
+from . import Standard_Suite
+from . import Text_Suite
+from . import Terminal_Suite
_code_to_module = {
@@ -22,9 +22,9 @@
'trmx' : ('Terminal.Terminal_Suite', 'Terminal_Suite'),
}
-from Standard_Suite import *
-from Text_Suite import *
-from Terminal_Suite import *
+from Terminal.Standard_Suite import *
+from Terminal.Text_Suite import *
+from Terminal.Terminal_Suite import *
def getbaseclasses(v):
if not getattr(v, '_propdict', None):
diff --git a/Lib/plat-mac/lib-scriptpackages/_builtinSuites/__init__.py b/Lib/plat-mac/lib-scriptpackages/_builtinSuites/__init__.py
index 2c722d9..b327d58 100644
--- a/Lib/plat-mac/lib-scriptpackages/_builtinSuites/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/_builtinSuites/__init__.py
@@ -5,7 +5,7 @@
in the Standard suite.
"""
import aetools
-import builtin_Suite
+from . import builtin_Suite
_code_to_module = {
@@ -20,7 +20,7 @@
'core' : ('_builtinSuites.builtin_Suite', 'builtin_Suite'),
}
-from builtin_Suite import *
+from _builtinSuites.builtin_Suite import *
class _builtinSuites(builtin_Suite_Events,
aetools.TalkTo):