Final tweaks for 2.0b1

34 files changed, 42 insertions, 8 deletions

diff --git a/Mac/Build/App.prj b/Mac/Build/App.prj
index 4e339a7509..1860a60a85 100644
--- a/Mac/Build/App.prj
+++ b/Mac/Build/App.prj
diff --git a/Mac/Build/Cm.prj b/Mac/Build/Cm.prj
index 7687d29c8d..965e05e7cb 100644
--- a/Mac/Build/Cm.prj
+++ b/Mac/Build/Cm.prj
diff --git a/Mac/Build/ColorPicker.prj b/Mac/Build/ColorPicker.prj
index 6418621673..8b55e225e5 100644
--- a/Mac/Build/ColorPicker.prj
+++ b/Mac/Build/ColorPicker.prj
diff --git a/Mac/Build/Drag.prj b/Mac/Build/Drag.prj
index 6320daa0b4..8b8ac112a0 100644
--- a/Mac/Build/Drag.prj
+++ b/Mac/Build/Drag.prj
diff --git a/Mac/Build/Fm.prj b/Mac/Build/Fm.prj
index 505797bae1..65dc221446 100644
--- a/Mac/Build/Fm.prj
+++ b/Mac/Build/Fm.prj
diff --git a/Mac/Build/Help.prj b/Mac/Build/Help.prj
index aa7b145c91..11bacbcb60 100644
--- a/Mac/Build/Help.prj
+++ b/Mac/Build/Help.prj
diff --git a/Mac/Build/Icn.prj b/Mac/Build/Icn.prj
index b9a9dc2599..f2e6512a8a 100644
--- a/Mac/Build/Icn.prj
+++ b/Mac/Build/Icn.prj
diff --git a/Mac/Build/List.prj b/Mac/Build/List.prj
index 3d1b415b0c..7e991bcee4 100644
--- a/Mac/Build/List.prj
+++ b/Mac/Build/List.prj
diff --git a/Mac/Build/Printing.prj b/Mac/Build/Printing.prj
index afd4197007..5b253329c3 100644
--- a/Mac/Build/Printing.prj
+++ b/Mac/Build/Printing.prj
diff --git a/Mac/Build/PythonCore.prj b/Mac/Build/PythonCore.prj
index 45431bff16..a0c91815d7 100644
--- a/Mac/Build/PythonCore.prj
+++ b/Mac/Build/PythonCore.prj
diff --git a/Mac/Build/PythonCorePPC.prj b/Mac/Build/PythonCorePPC.prj
index 962abe5ddf..7685675662 100644
--- a/Mac/Build/PythonCorePPC.prj
+++ b/Mac/Build/PythonCorePPC.prj
diff --git a/Mac/Build/PythonInterpreter.prj b/Mac/Build/PythonInterpreter.prj
index a2b1bc0aee..a3423a5467 100644
--- a/Mac/Build/PythonInterpreter.prj
+++ b/Mac/Build/PythonInterpreter.prj
diff --git a/Mac/Build/PythonStandSmall.prj b/Mac/Build/PythonStandSmall.prj
index 8fe48658ca..270bbe15bd 100644
--- a/Mac/Build/PythonStandSmall.prj
+++ b/Mac/Build/PythonStandSmall.prj
diff --git a/Mac/Build/PythonStandalone.prj b/Mac/Build/PythonStandalone.prj
index da7996d4ee..8853376013 100644
--- a/Mac/Build/PythonStandalone.prj
+++ b/Mac/Build/PythonStandalone.prj
diff --git a/Mac/Build/Qdoffs.prj b/Mac/Build/Qdoffs.prj
index ffd71af709..88a49d3602 100644
--- a/Mac/Build/Qdoffs.prj
+++ b/Mac/Build/Qdoffs.prj
diff --git a/Mac/Build/Qt.prj b/Mac/Build/Qt.prj
index 4289f8b46c..4f44b4d725 100644
--- a/Mac/Build/Qt.prj
+++ b/Mac/Build/Qt.prj
diff --git a/Mac/Build/Scrap.prj b/Mac/Build/Scrap.prj
index acfdf1f8fa..a08ced4f76 100644
--- a/Mac/Build/Scrap.prj
+++ b/Mac/Build/Scrap.prj
diff --git a/Mac/Build/Snd.prj b/Mac/Build/Snd.prj
index 488abdedf1..ea96ade2a2 100644
--- a/Mac/Build/Snd.prj
+++ b/Mac/Build/Snd.prj
diff --git a/Mac/Build/Sndihooks.prj b/Mac/Build/Sndihooks.prj
index 3f1769f516..77243ea80b 100644
--- a/Mac/Build/Sndihooks.prj
+++ b/Mac/Build/Sndihooks.prj
diff --git a/Mac/Build/TE.prj b/Mac/Build/TE.prj
index 1a1f0f56a7..b3c58b2806 100644
--- a/Mac/Build/TE.prj
+++ b/Mac/Build/TE.prj
diff --git a/Mac/Build/calldll.ppc.prj b/Mac/Build/calldll.ppc.prj
index b5aec75323..c2c696a520 100644
--- a/Mac/Build/calldll.ppc.prj
+++ b/Mac/Build/calldll.ppc.prj
diff --git a/Mac/Build/ctb.prj b/Mac/Build/ctb.prj
index 8157751d97..8d186505c1 100644
--- a/Mac/Build/ctb.prj
+++ b/Mac/Build/ctb.prj
diff --git a/Mac/Build/gdbm.prj b/Mac/Build/gdbm.prj
index e33f460c2f..9c790643d4 100644
--- a/Mac/Build/gdbm.prj
+++ b/Mac/Build/gdbm.prj
diff --git a/Mac/Build/icglue.prj b/Mac/Build/icglue.prj
index 06edd5c18e..21f600ab1c 100644
--- a/Mac/Build/icglue.prj
+++ b/Mac/Build/icglue.prj
diff --git a/Mac/Build/macspeech.prj b/Mac/Build/macspeech.prj
index c7bd7fee77..178283d70d 100644
--- a/Mac/Build/macspeech.prj
+++ b/Mac/Build/macspeech.prj
diff --git a/Mac/Build/pyexpat.prj b/Mac/Build/pyexpat.prj
index f7b6959694..289a381d4b 100644
--- a/Mac/Build/pyexpat.prj
+++ b/Mac/Build/pyexpat.prj
diff --git a/Mac/Build/ucnhash.prj b/Mac/Build/ucnhash.prj
index f93ccf63fd..ce0859d722 100644
--- a/Mac/Build/ucnhash.prj
+++ b/Mac/Build/ucnhash.prj
diff --git a/Mac/Build/waste.prj b/Mac/Build/waste.prj
index e677df564c..088c521ed5 100644
--- a/Mac/Build/waste.prj
+++ b/Mac/Build/waste.prj
diff --git a/Mac/Build/zlib.prj b/Mac/Build/zlib.prj
index 1338c7d93c..fb6d29a613 100644
--- a/Mac/Build/zlib.prj
+++ b/Mac/Build/zlib.prj
diff --git a/Mac/Distributions/(vise)/Python 2.0.vct b/Mac/Distributions/(vise)/Python 2.0.vct
index deb23c05a3..ec5fb8eebe 100644
--- a/Mac/Distributions/(vise)/Python 2.0.vct
+++ b/Mac/Distributions/(vise)/Python 2.0.vct
diff --git a/Mac/ReadMe b/Mac/ReadMe
index d177c2f336..892a71f0ac 100644
--- a/Mac/ReadMe
+++ b/Mac/ReadMe
@@ -154,9 +154,10 @@ Thanks!
 -------
 
 Thanks go to the whole Python community with Guido in the lead, of course.
-Mac-specific thanks go to the pythonmac-sig, Just van Rossum, Corran Webster,
+Mac-specific thanks go to the pythonmac-sig, Just van Rossum, Corran Webster, Tony Ingraldi,
 Erik van Blokland, Bill Bedford, Chris Stern, Gordon Worley, Oliver Steele, M. Papillon,
-Steven Majewski and all the other people who provided feedback, code or both!
+Steven Majewski, David Goodger, Chris Barker and all the other people who provided feedback,
+code or both!
 
 Feedback
 --------
diff --git a/Mac/Relnotes b/Mac/Relnotes
index 3abe6c9d84..006c3592a8 100644
--- a/Mac/Relnotes
+++ b/Mac/Relnotes
@@ -1,16 +1,47 @@
 Changes in 2.0b1 since 1.5.2
 ----------------------------
 
+These release notes refer to Mac-specific changes only. See NEWS (in the Misc folder)
+for machine-independent changes.
+
 Unfortunately I have messed my administration up, so I can't give complete
 Mac-specific release notes for the changes in this release. So, I will
 have to leave it at the highlights:
 
 - 68K support has been dropped, this release is PPC only.
 - Threads support (through standard Python threads module).
+- Tkinter works again! At least: it doesn't immedeately crash in obvious ways.
 - Appearance support through App module and added calls in many other modules.
+  Most dialogs and applets have also been converted to Appearance. There's also a
+  ControlAccessor module that handles [GS]etControlData with their plethora of
+  argument types.
 - Navigation Services support, with macfs StandardFile calls transparently
   replaced by their NavServices counterparts.
-- Offscreen QuickDraw support through Qdoffs module.
+- Offscreen QuickDraw and GWorld support through Qdoffs module.
 - Drag manager support (Drag module).
-- Much better CGI support, see :Mac:Tools:CGI.
+- Much better CGI support and examples, see :Mac:Tools:CGI.
 - Better OSA/AppleEvent support.
+- Up/downcasting of handle-based types is now unified and implemented in the
+  inherting module, e.g.
+  handleobj = ctlobj.as_Resource()
+  ctlobj = Ctl.as_Control(handle)
+- Added macos.FreeMem(), MaxBlock() and CompactMem(), mainly so apps in Python can
+  give low-memory warnings.
+- MediaDescr module parses some QuickTime media descriptions (but definitely not all).
+
+What is not in this distribution
+--------------------------------
+
+- The garbage collection mods to 2.0 have not been enabled, mainly due to lack of test-time.
+- Stackless Python/microthreads are not in here. Ask on the pythonmac-SIG if you want them.
+- Carbon support is not in here, but should be happening as soon as GUSI is ready.
+- Distutils is not in here, again due to lack of time.
+
+Known problems
+--------------
+
+This list is far from complete, more problems may be listed on the MacPython homepage,
+http://www.cwi.nl/~jack/macpython.html.
+
+- The IDE and Tkinter do not work together. Run tkinter programs under PythonInterpreter.
+- Aliases do not work in sys.path entries.
diff --git a/Mac/Resources/pythonpath.r b/Mac/Resources/pythonpath.r
index 74835fc142..7f23c15a31 100644
--- a/Mac/Resources/pythonpath.r
+++ b/Mac/Resources/pythonpath.r
@@ -76,15 +76,17 @@ resource 'Popt' (PYTHONOPTIONS_ID, "Options") {
 resource 'STR#' (PYTHONPATH_ID, "sys.path initialization") {
 	{
 		"$(PYTHON)",
-		"$(PYTHON):Lib",
 		"$(PYTHON):Mac:PlugIns",
 		"$(PYTHON):Mac:Lib",
 		"$(PYTHON):Mac:Lib:lib-toolbox",
-		"$(PYTHON):Mac:Lib:lib-scripting",
+		"$(PYTHON):Mac:Lib:lib-scriptpackages",
+		"$(PYTHON):Lib",
 		"$(PYTHON):Extensions:img:Mac",
 		"$(PYTHON):Extensions:img:Lib",
 		"$(PYTHON):Extensions:Numerical:Lib",
-		"$(PYTHON):Lib:lib-tk"
+		"$(PYTHON):Extensions:Imaging:PIL",
+		"$(PYTHON):Lib:lib-tk",
+		"$(PYTHON):Lib:site-packages",
 	}
 };
 
diff --git a/Mac/_checkversion.py b/Mac/_checkversion.py
index 264723c3cf..a7ce8efff7 100644
--- a/Mac/_checkversion.py
+++ b/Mac/_checkversion.py
@@ -5,7 +5,7 @@ _checkversion.py file"""
 import pyversioncheck
 
 _PACKAGE="MacPython"
-_VERSION="1.5.2c1"
+_VERSION="2.0b1"
 _URL="http://www.cwi.nl/~jack/macpythonversion.txt"
 
 try: