From 6da48561cb7844526164d3a656c6d16afe904e3d Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 21 Apr 2006 15:44:20 +0000
Subject: [PATCH] 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.
---
 .../CodeWarrior/CodeWarrior_suite.py          |  2 +-
 .../CodeWarrior/__init__.py                   | 16 ++++-----
 .../lib-scriptpackages/Explorer/__init__.py   | 24 ++++++-------
 .../Finder/Containers_and_folders.py          |  4 +--
 .../lib-scriptpackages/Finder/Files.py        |  2 +-
 .../Finder/Finder_Basics.py                   |  8 ++---
 .../lib-scriptpackages/Finder/__init__.py     | 36 +++++++++----------
 .../lib-scriptpackages/Netscape/__init__.py   | 28 +++++++--------
 .../lib-scriptpackages/StdSuites/__init__.py  | 36 +++++++++----------
 .../SystemEvents/Disk_Folder_File_Suite.py    | 13 ++++---
 .../SystemEvents/Folder_Actions_Suite.py      | 14 +++++---
 .../SystemEvents/Login_Items_Suite.py         |  2 +-
 .../SystemEvents/Power_Suite.py               | 10 +++---
 .../SystemEvents/Processes_Suite.py           |  8 ++---
 .../SystemEvents/System_Events_Suite.py       | 10 +++---
 .../SystemEvents/Text_Suite.py                |  2 +-
 .../SystemEvents/__init__.py                  | 32 ++++++++---------
 .../Terminal/Terminal_Suite.py                |  2 +-
 .../lib-scriptpackages/Terminal/Text_Suite.py |  2 +-
 .../lib-scriptpackages/Terminal/__init__.py   | 12 +++----
 .../_builtinSuites/__init__.py                |  4 +--
 21 files changed, 139 insertions(+), 128 deletions(-)

diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
index 0fd562b95dc..17284d759c1 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._privpropdict = {
 }
 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 5ef7ca964c5..c57fd1fba4a 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
@@ -3,10 +3,10 @@ Package generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarri
 """
 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 @@ _code_to_fullname = {
     '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 a9b09b041dd..734c90f7637 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
@@ -3,12 +3,12 @@ Package generated from /Applications/Internet Explorer.app
 """
 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 @@ _code_to_fullname = {
     '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 e495ef496ca..474ac6f3fc1 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 @@ class _Prop_warns_before_emptying(aetools.NProperty):
 #        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 ddbe1bafbb1..1b965401e2f 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._privpropdict = {
 }
 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 c0a7b20050b..831e101b99d 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 @@ visible = _Prop_visible()
 #        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 8782a4f81bb..364d467d796 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
@@ -3,15 +3,15 @@ Package generated from /System/Library/CoreServices/Finder.app
 """
 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 @@ _code_to_fullname = {
     '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 0dc5398a06b..6fc495f8f51 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
@@ -3,13 +3,13 @@ Package generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicato
 """
 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 @@ _code_to_fullname = {
     '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 b80e3bacc28..b07f160b03f 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
@@ -4,15 +4,15 @@ Resource aeut resid 0 Standard Event Suites for English
 """
 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 @@ _code_to_fullname = {
     '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 a9ac3dd2790..a0b199f0d21 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 @@ Generated from /System/Library/CoreServices/System Events.app
 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 @@ class _Prop_version(aetools.NProperty):
 
 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 c2c7e5e0383..cb07a147a7f 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 @@ Generated from /System/Library/CoreServices/System Events.app
 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 @@ class _Prop_POSIX_path(aetools.NProperty):
 
 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 ed09245157a..04095581888 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 @@ class _Prop_path(aetools.NProperty):
     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 ef539b1e033..bfdf5364a46 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 @@ properties = _Prop_properties()
 
 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 9dcb85fb2f9..a55c0a1a17d 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 @@ class _Prop_visible(aetools.NProperty):
 
 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 d5b4bfc6e7d..cf3e213222f 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 @@ properties = _Prop_properties()
 
 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 9f109e111e1..ec66c2c46bd 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 @@ attachment._privelemdict = {
     '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 95f985cccc2..ce3b0e25826 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
@@ -3,14 +3,14 @@ Package generated from /System/Library/CoreServices/System Events.app
 """
 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 @@ _code_to_fullname = {
     '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 afa02b39fc8..caa53d4e65e 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 @@ class _Prop_title_displays_window_size(aetools.NProperty):
 
 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 62f4744b21e..1303208c1cc 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 @@ attachment._privelemdict = {
     '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 47b75f2aeba..d40040922df 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
@@ -3,9 +3,9 @@ Package generated from /Applications/Utilities/Terminal.app
 """
 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 @@ _code_to_fullname = {
     '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 2c722d9f549..b327d583111 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 Required suite according to the Apple docs, but they often seem to be
 in the Standard suite.
 """
 import aetools
-import builtin_Suite
+from . import builtin_Suite
 
 
 _code_to_module = {
@@ -20,7 +20,7 @@ _code_to_fullname = {
         'core' : ('_builtinSuites.builtin_Suite', 'builtin_Suite'),
 }
 
-from builtin_Suite import *
+from _builtinSuites.builtin_Suite import *
 
 class _builtinSuites(builtin_Suite_Events,
                 aetools.TalkTo):