Step 1 in packaging the toolbox modules and making MacPython more

like normal Python. toolbox modules are now in the Carbon package
in :Mac:Lib, with a workaround flat namespace in :Mac:Lib:lib-compat.
Other dynamic modules are in :Lib:lib-dynload. :Mac:Lib:lib-toolbox and
:Mac:Plugins are gone.

diff --git a/Mac/Resources/pythonpath.r b/Mac/Resources/pythonpath.r
index 75a74ba78191d977e835ff9f679d5711fec3bfbd..b116f596a8d3c3f59ba0d158604910eafa1a70e7 100644 (file)
--- a/Mac/Resources/pythonpath.r
+++ b/Mac/Resources/pythonpath.r
@@ -82,10 +82,10 @@ resource 'Popt' (PYTHONOPTIONS_ID, "Options") {
 resource 'STR#' (PYTHONPATH_ID, "sys.path initialization") {
        {
                "$(PYTHON)",
-               "$(PYTHON):Mac:PlugIns",
                "$(PYTHON):Mac:Lib",
-               "$(PYTHON):Mac:Lib:lib-toolbox",
+               "$(PYTHON):Mac:Lib:lib-compat",
                "$(PYTHON):Mac:Lib:lib-scriptpackages",
+               "$(PYTHON):Lib:lib-dynload",
                "$(PYTHON):Lib",
                "$(PYTHON):Extensions:img:Mac",
                "$(PYTHON):Extensions:img:Lib",