(Tentative) files used for MacPython-OS9 2.3.3 distribution.

diff --git a/Mac/Distributions/(vise)/Python 2.3.vct b/Mac/Distributions/(vise)/Python 2.3.vct
index 4e0d3af18c4ff893f96d42041d48fac23348fe1f..02749852d1bf9490e03f3886c9ba6c2e767e0c1d 100644 (file)
Binary files a/Mac/Distributions/(vise)/Python 2.3.vct and b/Mac/Distributions/(vise)/Python 2.3.vct differ

diff --git a/Mac/Distributions/binary.include b/Mac/Distributions/binary.include
index af54ce99d4453ca3c341e825a45e43e21e114720..94bf915eadb203a3c17ac4786da491a9fb2a64a8 100644 (file)
--- a/Mac/Distributions/binary.include
+++ b/Mac/Distributions/binary.include
@@ -157,6 +157,7 @@
 (':Misc', '')
 (':Modules', None)
 (':Objects:Icon', None)
+(':Objects:dictnotes.txt', None)
 (':Objects:listsort.txt', None)
 (':PC', None)
 (':PCbuild', None)
@@ -189,6 +190,7 @@
 (':Tools:pynche', '')
 (':Tools:scripts', '')
 (':Tools:unicode:makeunicodedata.py', '')
+(':Tools:unicode:mkstringprep.py', '')
 (':Tools:versioncheck', '')
 (':Tools:webchecker', '')
 (':Tools:world', '')
@@ -204,5 +206,4 @@
 (':pystone.py', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Tools:unicode:mkstringprep.py', '')
-(':Objects:dictnotes.txt', None)
+(':aclocal.m4', None)

diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include
index a28307088efa0d7611a4e451493dd462cd20e16a..5b6b55e930986d9e490186721da799a5f181d2b1 100644 (file)
--- a/Mac/Distributions/dev.include
+++ b/Mac/Distributions/dev.include
@@ -241,6 +241,9 @@
 (':Mac:Build:_Win.mcp', None)
 (':Mac:Build:_Win.mcp.exp', None)
 (':Mac:Build:_Win.mcp.xml', None)
+(':Mac:Build:_csv.carbon.mcp', None)
+(':Mac:Build:_csv.carbon.mcp.exp', None)
+(':Mac:Build:_csv.carbon.mcp.xml', None)
 (':Mac:Build:_dummy_tkinter.mcp', None)
 (':Mac:Build:_dummy_tkinter.mcp.exp', None)
 (':Mac:Build:_dummy_tkinter.old.mcp', None)
@@ -451,6 +454,7 @@
 (':Modules:Setup.thread.in', None)
 (':Modules:_bsddb.c', None)
 (':Modules:_codecsmodule.c', None)
+(':Modules:_csv.c', None)
 (':Modules:_curses_panel.c', None)
 (':Modules:_cursesmodule.c', None)
 (':Modules:_hotshot.c', None)
@@ -616,6 +620,7 @@
 (':Tools:pynche', None)
 (':Tools:scripts', None)
 (':Tools:unicode:makeunicodedata.py', '')
+(':Tools:unicode:mkstringprep.py', '')
 (':Tools:versioncheck', None)
 (':Tools:webchecker', None)
 (':Tools:world', None)
@@ -632,8 +637,5 @@
 (':readmefiles', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Tools:unicode:mkstringprep.py', '')
-(':Modules:_csv.c', None)
-(':Mac:Build:_csv.carbon.mcp.xml', None)
-(':Mac:Build:_csv.carbon.mcp.exp', None)
-(':Mac:Build:_csv.carbon.mcp', None)
+(':aclocal.m4', None)
+(':Modules:gc_weakref.txt', None)

diff --git a/Mac/Distributions/src.exclude b/Mac/Distributions/src.exclude
index e63e55e9405bc2d30ae89909a18663ea9eeff72d..8881a33b0f3df6fcf2111cc46740f374247f0d6a 100644 (file)
--- a/Mac/Distributions/src.exclude
+++ b/Mac/Distributions/src.exclude
@@ -20,3 +20,4 @@ CVS
 Makefile.pre.in
 PyIDE-src
 [(]*[)]
+(vise)

diff --git a/Mac/Distributions/src.include b/Mac/Distributions/src.include
index cdf147b812d4ac7297d22734f1a09663a6c47143..bdf5164527905d2a967d73a8568e9a9487425ec9 100644 (file)
--- a/Mac/Distributions/src.include
+++ b/Mac/Distributions/src.include
@@ -39,6 +39,7 @@
 (':Mac:Contrib', '')
 (':Mac:Demo', '')
 (':Mac:Distributions:(vise)', None)
+(':Mac:Distributions:.DS_Store', None)
 (':Mac:Distributions:68k-shared.exclude', None)
 (':Mac:Distributions:68k-shared.include', None)
 (':Mac:Distributions:68k-stand.exclude', None)
@@ -74,6 +75,7 @@
 (':Mac:Tools:PyIDE', None)
 (':Mac:Tools:bruce', None)
 (':Mac:Tools:macfreeze', '')
+(':Mac:Unsupported:unshar.py', '')
 (':Mac:Wastemods', '')
 (':Mac:_checkversion.py', None)
 (':Mac:mwerks', '')
@@ -120,6 +122,7 @@
 (':Tools:pynche', '')
 (':Tools:scripts', '')
 (':Tools:unicode:makeunicodedata.py', '')
+(':Tools:unicode:mkstringprep.py', '')
 (':Tools:versioncheck', '')
 (':Tools:webchecker', '')
 (':Tools:world', '')
@@ -135,6 +138,4 @@
 (':pystone.py', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Mac:Distributions:.DS_Store', None)
-(':Mac:Unsupported:unshar.py', '')
-(':Tools:unicode:mkstringprep.py', '')
+(':aclocal.m4', '')

diff --git a/Mac/Include/macbuildno.h b/Mac/Include/macbuildno.h
index d9264d5eed09d0cf64edd817745f6431571161ae..b7ed71d0ac952f22d178556d5ff40f9f85f1a5cc 100644 (file)
--- a/Mac/Include/macbuildno.h
+++ b/Mac/Include/macbuildno.h
@@ -1 +1 @@
-#define BUILD 155
+#define BUILD 156

diff --git a/Mac/ReadMe b/Mac/ReadMe
index 59773f2fe5e708f44978065ba92918d3bf7f3530..9c6e4e7d5e1331c684e306e835336879b7047af2 100644 (file)
--- a/Mac/ReadMe
+++ b/Mac/ReadMe
@@ -1,4 +1,4 @@
-How to install MacPython-OS9 2.3 on your Macintosh
+How to install MacPython-OS9 2.3.3 on your Macintosh
 --------------------------------------------------
 
 This is a MacPython that can run on Mac OS 8.6 with CarbonLib
@@ -18,8 +18,7 @@ Two changes since 2.2 deserve special mention:
 - Most Mac-specific modules have moved to :Lib:plat-mac. :Mac:Lib now contains
   only modules that are not shared with MacPython-OSX 2.3.
 - macfs is now a pure Python wrapper module around various modules in the
-  Carbon package. For 2.3a2 only this wrapping is incomplete: fsspec.SetDates()
-  does not work yet. If you encounter any other problems please report them.
+  Carbon package.
 
 ------
 
@@ -82,18 +81,19 @@ test_socket and test_logging fail, this problem is being investigated.
 
 test_tarfile fails, this problem is being investigated.
 
-Three tests will fail on MacOS9 with MemoryErrors:
+Four tests may fail on MacOS9 with MemoryErrors: test_import,
 test_longexp, test_sha and test_zlib (on MacOSX these should pass).
+If test_import fails various later tests will also fail, increase
+memory size to 64MB or so to make it pass.
 
-If you increase the PythonInterpreter memory partition size they will
-pass (but for longexp you have to increase it by an incredible amount,
+If you increase the PythonInterpreter memory partition size the tests will
+all pass (but for longexp you have to increase it by an incredible amount,
 400MB is rumoured). It will, however, print some messages about
 optional features not supported. You should not worry about these,
 they are modules that are supported by Python on other
 platforms. Also, if you didn't run compileall before autotesting you
 may run out of memory the first time you run the tests. test_socket
-may also fail if you have no internet connection. Please also read the
-Relnotes file for other minor problems with this distribution.
+may also fail if you have no internet connection.
 
 Using Python is most easily done from the IDE, which has a builtin
 editor, debugger and other goodies. The alternative is to use
@@ -126,7 +126,7 @@ Uninstalling
 
 Up to three items are installed in the MacOS 8 or 9 system folder: the interpreter
 shared library PythonCore lives in the Extensions
-folder and the "Python 2.3a2 Preferences" file in the Python subfolder
+folder and the "Python 2.3.3 Preferences" file in the Python subfolder
 in the Preferences folder. All the rest of Python lives in the folder
 you installed in.
 
@@ -170,9 +170,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.3a2 works as expected you can trash
+After you are satisfied that 2.3.3 works as expected you can trash
 anything in the system folder that has "python" in the name and not
-"2.3a2".
+"2.3.3".
 
 The ConfigurePython applet will try to detect incompatible
 preferences files and offer to remove them. This means that re-running

diff --git a/Mac/mwerks/mwerks_pyexpat_config.h b/Mac/mwerks/mwerks_pyexpat_config.h
index 4ca4b07cf378000643ef5d8d781abfb1fb777729..a7e0b307276de282f0c9f6fa7ae7a7dfcbd19cc6 100644 (file)
--- a/Mac/mwerks/mwerks_pyexpat_config.h
+++ b/Mac/mwerks/mwerks_pyexpat_config.h
@@ -7,3 +7,4 @@
 #define XML_DTD 1
 #define BYTEORDER 4321
 #define XML_CONTEXT_BYTES 1024
+#define HAVE_MEMMOVE