Merging changes from release22-branch.

11 files changed, 61 insertions, 55 deletions

diff --git a/Mac/Build/PythonCore.mcp b/Mac/Build/PythonCore.mcp
index 03e46e1..140ce15 100644
--- a/Mac/Build/PythonCore.mcp
+++ b/Mac/Build/PythonCore.mcp
diff --git a/Mac/Distributions/(vise)/Python 2.2.vct b/Mac/Distributions/(vise)/Python 2.2.vct
index e53f6f4..18e625c 100644
--- a/Mac/Distributions/(vise)/Python 2.2.vct
+++ b/Mac/Distributions/(vise)/Python 2.2.vct
diff --git a/Mac/Distributions/binary.exclude b/Mac/Distributions/binary.exclude
index e0b3b92..e61b9a4 100644
--- a/Mac/Distributions/binary.exclude
+++ b/Mac/Distributions/binary.exclude
@@ -34,3 +34,4 @@ CVS
 Makefile*
 Setup.in
 [(]*[)]
+*~[0-9]
diff --git a/Mac/Distributions/binary.include b/Mac/Distributions/binary.include
index 1c6f417..73279a2 100644
--- a/Mac/Distributions/binary.include
+++ b/Mac/Distributions/binary.include
@@ -127,6 +127,7 @@
 (':Mac:Contrib:PythonScript', '')
 (':Mac:Contrib:Sherlock', '')
 (':Mac:Contrib:Tabcleaner', '')
+(':Mac:Contrib:mpwsystem', '')
 (':Mac:Contrib:osam:OSAm.carbon.slb', '')
 (':Mac:Contrib:osam:OSAm.exp', None)
 (':Mac:Contrib:osam:OSAm.ppc.slb', '')
@@ -149,6 +150,7 @@
 (':Mac:ReadMe', ':ReadMe')
 (':Mac:ReadMe-dev', None)
 (':Mac:ReadMe-src', None)
+(':Mac:ReadMe~0', None)
 (':Mac:ReadmeSource', None)
 (':Mac:Relnotes', ':Relnotes:')
 (':Mac:Resources', None)
@@ -219,5 +221,3 @@
 (':pystone.py', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Mac:ReadMe~0', None)
-(':Mac:Contrib:mpwsystem', '')
diff --git a/Mac/Distributions/dev.exclude b/Mac/Distributions/dev.exclude
index 2babfd6..42ad004 100644
--- a/Mac/Distributions/dev.exclude
+++ b/Mac/Distributions/dev.exclude
@@ -17,3 +17,4 @@
 @*
 CVS
 [(]*[)]
+*~[0-9]
diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include
index e7476e6..70c75cb 100644
--- a/Mac/Distributions/dev.include
+++ b/Mac/Distributions/dev.include
@@ -63,13 +63,16 @@
 (':Mac:Build:Printing.mcp', None)
 (':Mac:Build:Printing.mcp.exp', None)
 (':Mac:Build:Printing.mcp.xml', None)
+(':Mac:Build:PythonCore.axp', None)
 (':Mac:Build:PythonCore.exp', None)
 (':Mac:Build:PythonCore.mcp', None)
 (':Mac:Build:PythonCoreCarbon.exp', None)
 (':Mac:Build:PythonInterpreter.mcp', None)
+(':Mac:Build:PythonInterpreter.old.mcp', None)
 (':Mac:Build:PythonStandSmall.mcp', None)
 (':Mac:Build:PythonStandSmall.mcp~0', None)
 (':Mac:Build:PythonStandSmall.mcp~1', None)
+(':Mac:Build:PythonStandSmall.old.mcp', None)
 (':Mac:Build:PythonStandalone.mcp', None)
 (':Mac:Build:PythonStandalone.mcp~0', None)
 (':Mac:Build:PythonStandalone.mcp~1', None)
@@ -104,6 +107,12 @@
 (':Mac:Build:_CF.carbon.mcp', None)
 (':Mac:Build:_CF.carbon.mcp.exp', None)
 (':Mac:Build:_CF.carbon.mcp.xml', None)
+(':Mac:Build:_CG.carbon.mcp', None)
+(':Mac:Build:_CG.carbon.mcp.exp', None)
+(':Mac:Build:_CG.carbon.old.mcp', None)
+(':Mac:Build:_CarbonEvt.carbon.mcp', None)
+(':Mac:Build:_CarbonEvt.carbon.mcp.exp', None)
+(':Mac:Build:_CarbonEvt.carbon.mcp.xml', None)
 (':Mac:Build:_Cm.carbon.mcp', None)
 (':Mac:Build:_Cm.carbon.mcp.exp', None)
 (':Mac:Build:_Cm.carbon.mcp.xml', None)
@@ -223,6 +232,7 @@
 (':Mac:Build:_Win.mcp.xml', None)
 (':Mac:Build:_dummy_tkinter.mcp', None)
 (':Mac:Build:_dummy_tkinter.mcp.exp', None)
+(':Mac:Build:_dummy_tkinter.old.mcp', None)
 (':Mac:Build:_hotshot.carbon.mcp', None)
 (':Mac:Build:_hotshot.carbon.mcp.exp', None)
 (':Mac:Build:_hotshot.carbon.mcp.xml', None)
@@ -373,6 +383,7 @@
 (':Mac:ReadMe', None)
 (':Mac:ReadMe-dev', ':')
 (':Mac:ReadMe-src', None)
+(':Mac:ReadMe~0', None)
 (':Mac:Relnotes', None)
 (':Mac:Relnotes-source', None)
 (':Mac:Resources:Carbon.r', None)
@@ -529,6 +540,8 @@
 (':Modules:testcapi_long.h', None)
 (':Modules:threadmodule.c', None)
 (':Modules:timemodule.c', None)
+(':Modules:timemodule.c~0', None)
+(':Modules:timemodule.c~1', None)
 (':Modules:timing.h', None)
 (':Modules:timingmodule.c', None)
 (':Modules:tkappinit.c', None)
@@ -600,16 +613,3 @@
 (':readmefiles', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Mac:Build:_CG.carbon.old.mcp', None)
-(':Mac:Build:_CG.carbon.mcp.exp', None)
-(':Mac:Build:_CG.carbon.mcp', None)
-(':Mac:Build:_CarbonEvt.carbon.mcp.xml', None)
-(':Mac:Build:_CarbonEvt.carbon.mcp.exp', None)
-(':Mac:Build:_CarbonEvt.carbon.mcp', None)
-(':Mac:ReadMe~0', None)
-(':Modules:timemodule.c~1', None)
-(':Modules:timemodule.c~0', None)
-(':Mac:Build:PythonStandSmall.old.mcp', None)
-(':Mac:Build:PythonInterpreter.old.mcp', None)
-(':Mac:Build:PythonCore.axp', None)
-(':Mac:Build:_dummy_tkinter.old.mcp', None)
diff --git a/Mac/Include/macbuildno.h b/Mac/Include/macbuildno.h
index ae377c1..d2179af 100644
--- a/Mac/Include/macbuildno.h
+++ b/Mac/Include/macbuildno.h
@@ -1 +1 @@
-#define BUILD 121
+#define BUILD 124
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index e66ab83..f78f97f 100644
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -392,6 +392,17 @@ Pstring(char *str)
 }
 
 #if TARGET_API_MAC_OS8
+Point
+LMGetMouse(void)
+{
+	return LMGetMouseLocation();
+}
+
+long LMGetExpandMem(void)
+{
+	return 0;
+}
+
 void
 c2pstrcpy(unsigned char *dst, const char *src)
 {
diff --git a/Mac/ReadMe b/Mac/ReadMe
index 9745090..17e781f 100644
--- a/Mac/ReadMe
+++ b/Mac/ReadMe
@@ -1,9 +1,6 @@
-How to install Python 2.2c1 on your Macintosh
+How to install Python 2.2 on your Macintosh
 ---------------------------------------------
 
-This is a release candidate for MacPython 2.2, please report any problems as
-soon as possible, by email to pythonmac-sig@python.org.
-
 This is a MacPython that can run on classic MacOS (from 8.1
 onwards) and natively on MacOSX. The installer tries to work out whether you can
 use the Carbon version or not. For Mac OS X users: this version of Python
@@ -32,19 +29,19 @@ Mac:Demo. The documentation is sparse, but it will have to serve for
 now. The documentation is in HTML format, start with index.html.
 
 This installer installs MacPython for classic PPC MacOS, MacPython for Carbon
-(OS X, OS 9 or OS8 with CarbonLib installed) or both, depending on your
+(OS X, OS 9 or OS 8 with CarbonLib installed) or both, depending on your
 configuration. By selecting custom install you can bypass these tests and
 install what you want.
 
-If you want 68k support you will have to stay with MacPython 1.5.2.
+If you want 68k support you will have get MacPython 1.5.2.
 
 Toolbox module reorganization and more
 --------------------------------------
 
 You can safely skip this section if this is your first encounter with MacPython.
 
-I am working on a new organization of the mac-specific modules, and in
-general bringing the MacPython folder structure more in line with
+This release has a new organization of the mac-specific modules, and in
+general brings the MacPython folder structure more in line with
 unix-Python. This is not only a good idea, it will also immensely
 facilitate moving MacPython functionality to an OSX Python that is based
 on Mach-O and the unix-Python distribution. But don't worry: MacPython
@@ -92,6 +89,8 @@ But:
 - this works only for input, and there's no way to find out what the original
   linefeed convention of the file was.
 - Windows \r\n linefeeds are not supported and get turned into \n\n.
+- in 2.3 this feature will be replaced by a more general, platform independent
+  way of handling files with foreign newline conventions.
 
 What to install
 ---------------
@@ -169,20 +168,18 @@ ways.
 Uninstalling
 ------------
 
-Two items are installed in the system folder: the interpreter shared
-libraries PythonCore and PythonCoreCarbon lives in the Extensions
-folder and the "Python 2.2c1 Preferences" file in the Python subfolder
+Up to three items are installed in the system folder: the interpreter shared
+libraries PythonCore and PythonCoreCarbon live in the Extensions
+folder and the "Python 2.2 Preferences" file in the Python subfolder
 in the Preferences folder. All the rest of Python lives in the folder
 you installed in.
 
-On OSX the libraries are installed in /Library/CFMSupport. There is a
-nasty bug in OSX that is triggered by Python: if any orphaned aliases
-are left in /Library/CFMSupport your machine will start to behave very
-badly. 2.1 beta installers triggered this problem if you simply threw
-away your Python folder, so if you installed a 2.1beta you should
-clean out the aliases in /Library/CFMSupport too. The final 2.1 and
-2.1.1 installers always copied the shared libraries on OSX, so it does
-not have the problem anymore.
+On OSX the libraries are installed in /Library/CFMSupport. The ConfigurePython
+applets will complain if you have no right to create the libraries there
+(you need Admin privileges). This has one consequence: you will not be able to
+run applets unless they reside in the MacPython folder (such as the IDE or
+EditPythonPrefs). If you try to run an applet stored elsewhere you will
+get a "Cannot locate PythonCore" error message.
 
 Things to see
 -------------
@@ -221,9 +218,9 @@ this means you can keep your older version around if you are unsure
 whether to upgrade. The bad news is that your old preference settings
 are lost and you have to set them again.
 
-After you are satisfied that 2.2c1 works as expected you can trash
+After you are satisfied that 2.2 works as expected you can trash
 anything in the system folder that has "python" in the name and not
-"2.2c1".
+"2.2".
 
 The ConfigurePython... applets will try to detect incompatible
 preferences files and offer to remove them. This means that re-running
@@ -278,9 +275,9 @@ this purpose.
 
 
 Jack Jansen
-Oratrix Development BV
-Valeriusplein 30
-Amsterdam
+CWI
+Kruislaan 413
+1098 SJ Amsterdam
 the Netherlands
 
 <jack@cwi.nl>, http://www.cwi.nl/~jack
diff --git a/Mac/Relnotes b/Mac/Relnotes
index 3d99c13..ce67bdb 100644
--- a/Mac/Relnotes
+++ b/Mac/Relnotes
@@ -1,8 +1,8 @@
-Changes in 2.2c1 since 2.1.1
+Changes in 2.2 since 2.1.1
 ----------------------------
 
 These release notes refer to Mac-specific changes only. See NEWS (in the Misc folder)
-for machine-independent changes. Changes that are new in 2.2c1 are flagged as such.
+for machine-independent changes.
 
 
 - The main change is that all toolbox modules have moved to a package called Carbon.
@@ -11,27 +11,27 @@ for machine-independent changes. Changes that are new in 2.2c1 are flagged as su
   some open questions and join the discussions on pythonmac-sig if you have anything
   to contribute. Aside from reducing clutter this change will also benefit the
   port to Mach-O/OSX Python later.
-- All toolbox modules have been updated to Universal Headers 3.4. [2.2c1]
+- All toolbox modules have been updated to Universal Headers 3.4.
 - Toolbox modules are weaklinked against InterfaceLib (for PPC builds) and raise
-  an exception when you call an unimplemented one on an old MacOS. [2.2c1]
+  an exception when you call an unimplemented one on an old MacOS.
 - On input MacPython now accepts either \n (unix style) or \r (mac style) newlines
   for text files. This behaviour can be turned off with a preference.
   This is an experimental feature; again: feedback is requested.
-- The IDE looks better on OS X, but still not as good as on OS9. [2.2c1]
+- The IDE looks better on OS X, but still not as good as on OS9.
 - Command-dot handling has been improved a lot: scripts are now much easier to interrupt,
   and they only scan for cmd-. while in the foreground.
 - "Copy" from the MacPython console window was always disabled. Fixed.
 - This release should run on MacOS 8.1 again.
 - A new, rather different GUSI I/O library is used.
-- time.time() returns positive values again. [2.2c1]
+- time.time() returns positive values again.
 - There is a new module macresource which makes it easier to open a resource file
   accompanying your script when the script is not (yet) converted to an applet.
   This module will later also do the right thing in Mach-O/OSX Python.
 - (Carbon only) experimental modules Carbon.CG (CoreGraphics) and CarbonEvt have
-  been added. [2.2c1]
+  been added.
 - A new, experimental module hfsplus is included, which gives access to some of the
   functionality of the HFS+ API.
-- A new, experimental module gives access to Carbon Events. [2.2c1]
+- A new, experimental module gives access to Carbon Events.
 - Threads had a stack that was too small for many serious Python applications (20K).
   They now get 64K. There is still no overflow check, though.
 - Garbage collection and the gc module have (finally) been enabled.
@@ -52,11 +52,6 @@ for machine-independent changes. Changes that are new in 2.2c1 are flagged as su
 - Contrib:morefindertools is gone, the functionality has been integrated into
   the standard module findertools.py.
 
-What is not in this distribution
---------------------------------
-
-- The toolbox modules have not all been updated to Universal Header 3.4 or CarbonLib 1.4 yet.
-
 Known problems
 --------------
 
@@ -65,7 +60,8 @@ http://www.cwi.nl/~jack/macpython.html.
 
 - MacPython 2.2 (and MacPython 2.1) will not run correctly on a multiprocessor MacOS X
   machine, it will quickly deadlock during I/O operations. The GUSI I/O library is suspected,
-  hints/clues/workarounds are solicited.
+  hints/clues/workarounds are solicited. This problem also occurs intermittently on fast
+  OS X single-processor machines.
 - Tkinter does not work under Carbon.
 - The IDE and Tkinter do not work together. Run tkinter programs under PythonInterpreter.
 - Tkinter file events do not work, unless you have opened the file through Tcl (but then
diff --git a/Mac/_checkversion.py b/Mac/_checkversion.py
index 443b9b5..79cc591 100644
--- a/Mac/_checkversion.py
+++ b/Mac/_checkversion.py
@@ -5,7 +5,7 @@ _checkversion.py file"""
 import pyversioncheck
 
 _PACKAGE="MacPython"
-_VERSION="2.2b1"
+_VERSION="2.2"
 _URL="http://www.cwi.nl/~jack/macpythonversion.txt"
 
 try: