From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 21 Feb 2003 22:33:55 +0000 (+0000)
Subject: Checking mac-specific stuff from the 2.3a2 branch in on the trunk.
X-Git-Tag: v2.3c1~1727
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bb97e66dcbb110877ac17209c7d2641db6f6006;p=python
Checking mac-specific stuff from the 2.3a2 branch in on the trunk.
---
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 6848367f6e..6acd18b2e8 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -633,6 +633,7 @@ _expectations = {
test_poll
test_popen
test_popen2
+ test_posix
test_pty
test_pwd
test_resource
diff --git a/Mac/Build/PythonCore.mcp b/Mac/Build/PythonCore.mcp
index 592253d18a..7ec096f13e 100644
Binary files a/Mac/Build/PythonCore.mcp and b/Mac/Build/PythonCore.mcp differ
diff --git a/Mac/Build/PythonInterpreter.mcp b/Mac/Build/PythonInterpreter.mcp
index 9779ce5f5e..830d7663d0 100644
Binary files a/Mac/Build/PythonInterpreter.mcp and b/Mac/Build/PythonInterpreter.mcp differ
diff --git a/Mac/Build/PythonStandSmall.mcp b/Mac/Build/PythonStandSmall.mcp
index 538815d4f4..131b9ba250 100644
Binary files a/Mac/Build/PythonStandSmall.mcp and b/Mac/Build/PythonStandSmall.mcp differ
diff --git a/Mac/Build/_CG.carbon.mcp b/Mac/Build/_CG.carbon.mcp
index a4b6e73466..da7927ec42 100755
Binary files a/Mac/Build/_CG.carbon.mcp and b/Mac/Build/_CG.carbon.mcp differ
diff --git a/Mac/Distributions/(vise)/Python 2.3.vct b/Mac/Distributions/(vise)/Python 2.3.vct
index b876e5a360..2e0cfd3bc7 100644
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/dev.include b/Mac/Distributions/dev.include
index 46d277ed00..962ca5706e 100644
--- a/Mac/Distributions/dev.include
+++ b/Mac/Distributions/dev.include
@@ -94,6 +94,9 @@
(':Mac:Build:_AH.carbon.mcp', None)
(':Mac:Build:_AH.carbon.mcp.exp', None)
(':Mac:Build:_AH.carbon.mcp.xml', None)
+(':Mac:Build:_Alias.carbon.mcp', None)
+(':Mac:Build:_Alias.carbon.mcp.exp', None)
+(':Mac:Build:_Alias.carbon.mcp.xml', None)
(':Mac:Build:_App.carbon.mcp', None)
(':Mac:Build:_App.carbon.mcp.exp', None)
(':Mac:Build:_App.carbon.mcp.xml', None)
@@ -139,12 +142,18 @@
(':Mac:Build:_Evt.mcp', None)
(':Mac:Build:_Evt.mcp.exp', None)
(':Mac:Build:_Evt.mcp.xml', None)
+(':Mac:Build:_File.carbon.mcp', None)
+(':Mac:Build:_File.carbon.mcp.exp', None)
+(':Mac:Build:_File.carbon.mcp.xml', None)
(':Mac:Build:_Fm.carbon.mcp', None)
(':Mac:Build:_Fm.carbon.mcp.exp', None)
(':Mac:Build:_Fm.carbon.mcp.xml', None)
(':Mac:Build:_Fm.mcp', None)
(':Mac:Build:_Fm.mcp.exp', None)
(':Mac:Build:_Fm.mcp.xml', None)
+(':Mac:Build:_Folder.carbon.mcp', None)
+(':Mac:Build:_Folder.carbon.mcp.exp', None)
+(':Mac:Build:_Folder.carbon.mcp.xml', None)
(':Mac:Build:_Help.carbon.mcp', None)
(':Mac:Build:_Help.carbon.mcp.exp', None)
(':Mac:Build:_Help.carbon.mcp.xml', None)
@@ -269,6 +278,9 @@
(':Mac:Build:ctb.mcp', None)
(':Mac:Build:ctb.mcp.exp', None)
(':Mac:Build:ctb.mcp.xml', None)
+(':Mac:Build:datetime.carbon.mcp', None)
+(':Mac:Build:datetime.carbon.mcp.exp', None)
+(':Mac:Build:datetime.carbon.mcp.xml', None)
(':Mac:Build:gdbm.carbon.mcp', None)
(':Mac:Build:gdbm.carbon.mcp.exp', None)
(':Mac:Build:gdbm.carbon.mcp.xml', None)
@@ -436,11 +448,13 @@
(':Modules:Setup.dist', None)
(':Modules:Setup.in', None)
(':Modules:Setup.thread.in', None)
+(':Modules:_bsddb.c', None)
(':Modules:_codecsmodule.c', None)
(':Modules:_curses_panel.c', None)
(':Modules:_cursesmodule.c', None)
(':Modules:_hotshot.c', None)
(':Modules:_localemodule.c', None)
+(':Modules:_randommodule.c', None)
(':Modules:_sre.c', None)
(':Modules:_ssl.c', None)
(':Modules:_testcapimodule.c', None)
@@ -453,6 +467,7 @@
(':Modules:audioop.c', None)
(':Modules:binascii.c', None)
(':Modules:bsddbmodule.c', None)
+(':Modules:bz2module.c', None)
(':Modules:cPickle.c', None)
(':Modules:cStringIO.c', None)
(':Modules:ccpython.cc', None)
@@ -466,6 +481,7 @@
(':Modules:cryptmodule.c', None)
(':Modules:cstubs', None)
(':Modules:cursesmodule.c', None)
+(':Modules:datetimemodule.c', None)
(':Modules:dbmmodule.c', None)
(':Modules:dlmodule.c', None)
(':Modules:errnomodule.c', None)
@@ -500,6 +516,7 @@
(':Modules:mpzmodule.c', None)
(':Modules:nismodule.c', None)
(':Modules:operator.c', None)
+(':Modules:ossaudiodev.c', None)
(':Modules:parsermodule.c', None)
(':Modules:pcre-int.h', None)
(':Modules:pcre.h', None)
@@ -553,6 +570,7 @@
(':Modules:xxsubtype.c', None)
(':Modules:yuv.h', None)
(':Modules:yuvconvert.c', None)
+(':Modules:zipimport.c', None)
(':Modules:zlibmodule.c', None)
(':Modules:zlibmodule.c~0', None)
(':Modules:zlibmodule.c~1', None)
@@ -611,21 +629,6 @@
(':readmefiles', None)
(':setup.py', None)
(':site-packages', None)
-(':Mac:Build:_Folder.carbon.mcp.xml', None)
-(':Mac:Build:_Folder.carbon.mcp.exp', None)
-(':Mac:Build:_Folder.carbon.mcp', None)
-(':Mac:Build:_File.carbon.mcp.xml', None)
-(':Mac:Build:_File.carbon.mcp.exp', None)
-(':Mac:Build:_File.carbon.mcp', None)
-(':Mac:Build:_Alias.carbon.mcp.xml', None)
-(':Mac:Build:_Alias.carbon.mcp.exp', None)
-(':Mac:Build:_Alias.carbon.mcp', None)
-(':Modules:zipimport.c', None)
-(':Modules:ossaudiodev.c', None)
-(':Modules:datetimemodule.c', None)
-(':Modules:bz2module.c', None)
-(':Modules:_randommodule.c', None)
-(':Modules:_bsddb.c', None)
-(':Mac:Build:datetime.carbon.mcp.xml', None)
-(':Mac:Build:datetime.carbon.mcp.exp', None)
-(':Mac:Build:datetime.carbon.mcp', None)
+(':Modules:itertoolsmodule.c', None)
+(':Modules:_iconv_codec.c', None)
+(':Mac:mwerks:mwerks_pyexpat_config.h', None)
diff --git a/Mac/Include/macbuildno.h b/Mac/Include/macbuildno.h
index 8882ac7ed7..f1564792ce 100644
--- a/Mac/Include/macbuildno.h
+++ b/Mac/Include/macbuildno.h
@@ -1 +1 @@
-#define BUILD 148
+#define BUILD 154
diff --git a/Mac/ReadMe b/Mac/ReadMe
index f08ce6e180..d5ea8f3c3d 100644
--- a/Mac/ReadMe
+++ b/Mac/ReadMe
@@ -1,4 +1,4 @@
-How to install MacPython-OS9 2.3a1 on your Macintosh
+How to install MacPython-OS9 2.3a2 on your Macintosh
----------------------------------------------------
This is a MacPython that can run on Mac OS 8.6 with CarbonLib
@@ -18,7 +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.3a1 only this wrapping is incomplete: fsspec.SetDates()
+ 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.
------
@@ -75,10 +75,9 @@ After installing
It is probably a good idea to run the automatic tests. Start
Python and "import test.regrtest ; test.regrtest.main()".
-test_httplib fails with an unexpected output error,
-this problem is being investigated.
+test_socket and test_logging fail, this problem is being investigated.
-test_socket fails, this problem is being investigated.
+test_tarfile fails, this problem is being investigated.
Three tests will fail on MacOS9 with MemoryErrors:
test_longexp, test_sha and test_zlib (on MacOSX these should pass).
@@ -124,7 +123,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.3a1 Preferences" file in the Python subfolder
+folder and the "Python 2.3a2 Preferences" file in the Python subfolder
in the Preferences folder. All the rest of Python lives in the folder
you installed in.
@@ -168,9 +167,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.3a1 works as expected you can trash
+After you are satisfied that 2.3a2 works as expected you can trash
anything in the system folder that has "python" in the name and not
-"2.3a1".
+"2.3a2".
The ConfigurePython applet will try to detect incompatible
preferences files and offer to remove them. This means that re-running
diff --git a/Mac/Tools/IDE/PyEdit.py b/Mac/Tools/IDE/PyEdit.py
index e9e0f26f17..ef31486785 100644
--- a/Mac/Tools/IDE/PyEdit.py
+++ b/Mac/Tools/IDE/PyEdit.py
@@ -471,7 +471,7 @@ class Editor(W.Window):
except os.error:
pass
template = buildtools.findtemplate()
- buildtools.process(template, filename, destname, rsrcname=rsrcname, progress=None)
+ buildtools.process(template, filename, destname, 1, rsrcname=rsrcname, progress=None)
try:
os.remove(filename)
os.rmdir(tmpdir)
diff --git a/Mac/_checkversion.py b/Mac/_checkversion.py
index 79cc5914cb..91b395448b 100644
--- a/Mac/_checkversion.py
+++ b/Mac/_checkversion.py
@@ -5,7 +5,7 @@ _checkversion.py file"""
import pyversioncheck
_PACKAGE="MacPython"
-_VERSION="2.2"
+_VERSION="2.3a2"
_URL="http://www.cwi.nl/~jack/macpythonversion.txt"
try:
diff --git a/Mac/mwerks/mwerks_pyexpat_config.h b/Mac/mwerks/mwerks_pyexpat_config.h
new file mode 100644
index 0000000000..4ca4b07cf3
--- /dev/null
+++ b/Mac/mwerks/mwerks_pyexpat_config.h
@@ -0,0 +1,9 @@
+/*
+** Configuration file for dynamically loaded Carbon pyexpat module.
+*/
+#include "mwerks_shcarbon_config.h"
+
+#define XML_NS 1
+#define XML_DTD 1
+#define BYTEORDER 4321
+#define XML_CONTEXT_BYTES 1024
diff --git a/Mac/scripts/genpluginprojects.py b/Mac/scripts/genpluginprojects.py
index e346e95d0b..03ce54f65d 100644
--- a/Mac/scripts/genpluginprojects.py
+++ b/Mac/scripts/genpluginprojects.py
@@ -101,7 +101,7 @@ def genallprojects(force=0):
genpluginproject("carbon", "pyexpat",
sources=["pyexpat.c", "xmlparse.c", "xmlrole.c", "xmltok.c"],
extradirs=[":::Modules:expat"],
- prefixname="mwerks_shcarbon_config.h"
+ prefixname="mwerks_pyexpat_config.h"
)
genpluginproject("carbon", "zlib",
libraries=["zlib.ppc.Lib"],