From f7e571432ab60dfdef9de41218e8612c49a13be0 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Sat, 8 Sep 2001 21:38:26 +0000 Subject: Final tweaks for 2.2a3 distribution. --- Mac/Build/PythonCore.exp | 26 ++++++++++++++++++++------ Mac/Build/PythonCore.mcp | Bin 164756 -> 153158 bytes Mac/Build/PythonCoreCarbon.exp | 26 ++++++++++++++++++++------ Mac/Build/PythonStandSmall.mcp | Bin 296887 -> 326329 bytes Mac/Distributions/(vise)/Python 2.2.vct | Bin 640997 -> 646052 bytes Mac/Distributions/binary.include | 13 ++++++++----- Mac/Distributions/dev.include | 24 ++++++++++++++---------- Mac/Distributions/src.exclude | 2 +- Mac/Distributions/src.include | 27 +++++++++++++++------------ Mac/Include/macbuildno.h | 2 +- Mac/ReadMe | 28 ++++++++++++++++------------ Mac/Relnotes | 14 ++++++++------ Mac/_checkversion.py | 2 +- 13 files changed, 104 insertions(+), 60 deletions(-) diff --git a/Mac/Build/PythonCore.exp b/Mac/Build/PythonCore.exp index b904845..a1925f8 100644 --- a/Mac/Build/PythonCore.exp +++ b/Mac/Build/PythonCore.exp @@ -171,6 +171,7 @@ PyRun_String PyErr_Display PyErr_PrintEx PyErr_Print +PyRun_SimpleStringFlags PyRun_SimpleString PyRun_SimpleFileExFlags PyRun_SimpleFileEx @@ -319,6 +320,9 @@ PyMethod_New PyInstance_NewRaw PyClass_IsSubclass PyInstance_New +PyMethod_Class +PyMethod_Self +PyMethod_Function PyClass_New PyCObject_Type PyCObject_Import @@ -421,6 +425,7 @@ PyLong_FromString PyLong_AsVoidPtr PyLong_FromVoidPtr PyLong_AsDouble +_PyLong_AsScaledDouble _PyLong_AsByteArray _PyLong_FromByteArray PyLong_AsUnsignedLong @@ -450,6 +455,7 @@ _Py_NotImplementedStruct _Py_cobject_hack _Py_abstract_hack PyObject_ClearWeakRefs +Py_DivisionWarningFlag _PyTrash_delete_later _PyTrash_delete_nesting _PyTrash_destroy_chain @@ -463,6 +469,7 @@ PyMem_Free PyMem_Realloc PyMem_Malloc _Py_ReadyTypes +PyObject_Dir PyCallable_Check PyNumber_Coerce PyNumber_CoerceEx @@ -533,6 +540,7 @@ PyTuple_GetItem PyTuple_Size PyTuple_New type_getsets +subtype_getsets PyType_Type PyBaseObject_Type PySuper_Type @@ -654,15 +662,15 @@ PyMac_StopGUSISpin RotateCursor SpinCursor PyMac_GetFullPath -__convert_to_newlines PyMac_AppRefNum PyMac_options console_output_state +__convert_to_newlines PyMac_GetDelayConsoleFlag Py_GetExecPrefix Py_GetPrefix -Py_GetArgcArgv Py_GetProgramFullPath +Py_GetArgcArgv PyMac_Exit abort PyMac_OutputNotSeen @@ -681,9 +689,9 @@ macstat sync initgestalt initmacfs -PyMac_BuildFSSpec -PyMac_BuildFSRef -PyMac_GetFSRef +_PyMac_BuildFSSpec +_PyMac_BuildFSRef +_PyMac_GetFSRef newmfssobject _PyMac_GetFSSpec initmac @@ -877,7 +885,7 @@ PyOS_vsnprintf PyOS_snprintf proxytype wrappertype -PyGetSet_Type +PyProperty_Type PyWrapper_New PyDictProxy_New proxy_str @@ -897,7 +905,10 @@ _PyObject_GC_Track _PyGC_Dump initgc PyMac_OSErrException +PyMacGluePtr_PyMac_BuildFSSpec PyMacGluePtr_PyMac_GetFSSpec +PyMacGluePtr_PyMac_BuildFSRef +PyMacGluePtr_PyMac_GetFSRef PyMacGluePtr_AEDesc_New PyMacGluePtr_AEDesc_Convert PyMacGluePtr_CmpObj_New @@ -990,7 +1001,10 @@ CmpObj_Convert CmpObj_New AEDesc_Convert AEDesc_New +PyMac_GetFSRef +PyMac_BuildFSRef PyMac_GetFSSpec +PyMac_BuildFSSpec PyMac_Buildwide PyMac_Getwide PyMac_BuildFixed diff --git a/Mac/Build/PythonCore.mcp b/Mac/Build/PythonCore.mcp index cda8cff..f458780 100644 Binary files a/Mac/Build/PythonCore.mcp and b/Mac/Build/PythonCore.mcp differ diff --git a/Mac/Build/PythonCoreCarbon.exp b/Mac/Build/PythonCoreCarbon.exp index 7bc9a0d..f5d6f41 100644 --- a/Mac/Build/PythonCoreCarbon.exp +++ b/Mac/Build/PythonCoreCarbon.exp @@ -171,6 +171,7 @@ PyRun_String PyErr_Display PyErr_PrintEx PyErr_Print +PyRun_SimpleStringFlags PyRun_SimpleString PyRun_SimpleFileExFlags PyRun_SimpleFileEx @@ -319,6 +320,9 @@ PyMethod_New PyInstance_NewRaw PyClass_IsSubclass PyInstance_New +PyMethod_Class +PyMethod_Self +PyMethod_Function PyClass_New PyCObject_Type PyCObject_Import @@ -421,6 +425,7 @@ PyLong_FromString PyLong_AsVoidPtr PyLong_FromVoidPtr PyLong_AsDouble +_PyLong_AsScaledDouble _PyLong_AsByteArray _PyLong_FromByteArray PyLong_AsUnsignedLong @@ -450,6 +455,7 @@ _Py_NotImplementedStruct _Py_cobject_hack _Py_abstract_hack PyObject_ClearWeakRefs +Py_DivisionWarningFlag _PyTrash_delete_later _PyTrash_delete_nesting _PyTrash_destroy_chain @@ -463,6 +469,7 @@ PyMem_Free PyMem_Realloc PyMem_Malloc _Py_ReadyTypes +PyObject_Dir PyCallable_Check PyNumber_Coerce PyNumber_CoerceEx @@ -533,6 +540,7 @@ PyTuple_GetItem PyTuple_Size PyTuple_New type_getsets +subtype_getsets PyType_Type PyBaseObject_Type PySuper_Type @@ -648,15 +656,15 @@ PyMac_StopGUSISpin RotateCursor SpinCursor PyMac_GetFullPath -__convert_to_newlines PyMac_AppRefNum PyMac_options console_output_state +__convert_to_newlines PyMac_GetDelayConsoleFlag Py_GetExecPrefix Py_GetPrefix -Py_GetArgcArgv Py_GetProgramFullPath +Py_GetArgcArgv PyMac_Exit abort PyMac_OutputNotSeen @@ -674,9 +682,9 @@ macstat sync initgestalt initmacfs -PyMac_BuildFSSpec -PyMac_BuildFSRef -PyMac_GetFSRef +_PyMac_BuildFSSpec +_PyMac_BuildFSRef +_PyMac_GetFSRef newmfsrobject newmfssobject _PyMac_GetFSSpec @@ -871,7 +879,7 @@ PyOS_vsnprintf PyOS_snprintf proxytype wrappertype -PyGetSet_Type +PyProperty_Type PyWrapper_New PyDictProxy_New proxy_str @@ -891,7 +899,10 @@ _PyObject_GC_Track _PyGC_Dump initgc PyMac_OSErrException +PyMacGluePtr_PyMac_BuildFSSpec PyMacGluePtr_PyMac_GetFSSpec +PyMacGluePtr_PyMac_BuildFSRef +PyMacGluePtr_PyMac_GetFSRef PyMacGluePtr_AEDesc_New PyMacGluePtr_AEDesc_Convert PyMacGluePtr_CmpObj_New @@ -984,7 +995,10 @@ CmpObj_Convert CmpObj_New AEDesc_Convert AEDesc_New +PyMac_GetFSRef +PyMac_BuildFSRef PyMac_GetFSSpec +PyMac_BuildFSSpec PyMac_Buildwide PyMac_Getwide PyMac_BuildFixed diff --git a/Mac/Build/PythonStandSmall.mcp b/Mac/Build/PythonStandSmall.mcp index 0fa380b..b1c3a22 100644 Binary files a/Mac/Build/PythonStandSmall.mcp and b/Mac/Build/PythonStandSmall.mcp differ diff --git a/Mac/Distributions/(vise)/Python 2.2.vct b/Mac/Distributions/(vise)/Python 2.2.vct index 8bc26cf..89ab9b1 100644 Binary files a/Mac/Distributions/(vise)/Python 2.2.vct and b/Mac/Distributions/(vise)/Python 2.2.vct differ diff --git a/Mac/Distributions/binary.include b/Mac/Distributions/binary.include index 4701bfc..aef2eaf 100644 --- a/Mac/Distributions/binary.include +++ b/Mac/Distributions/binary.include @@ -29,6 +29,9 @@ (':Extensions:README', None) (':Extensions:README.TOO', None) (':Extensions:audio', None) +(':Extensions:example2:README', None) +(':Extensions:example3:README', None) +(':Extensions:example:README', None) (':Extensions:img:Lib', '') (':Extensions:img:Mac:genimgprojects.py', None) (':Extensions:img:Mac:imgcolormap.carbon.slb', '') @@ -125,6 +128,7 @@ (':Mac:Contrib:Sherlock', '') (':Mac:Contrib:Tabcleaner', '') (':Mac:Contrib:morefindertools', '') +(':Mac:Contrib:osam:OSAm.carbon.slb', '') (':Mac:Contrib:osam:OSAm.exp', None) (':Mac:Contrib:osam:OSAm.ppc.slb', '') (':Mac:Contrib:osam:OSAm.ppc.slb.sit', None) @@ -140,7 +144,7 @@ (':Mac:MPW', None) (':Mac:Modules', None) (':Mac:OSX:README.macosx.txt', None) -(':Mac:PlugIns', '') +(':Mac:OSXResources', None) (':Mac:Python:Icon', None) (':Mac:ReadMe', ':ReadMe') (':Mac:ReadMe-dev', None) @@ -168,6 +172,7 @@ (':Objects:Icon', None) (':PC', None) (':PCbuild', None) +(':PLAN.txt', None) (':Parser:Icon', None) (':Python IDE', None) (':Python:Icon', None) @@ -209,10 +214,8 @@ (':loop.py', None) (':mac2unix-real.shar', None) (':mac2unix.shar', None) +(':pyconfig.h.in', None) (':pystone.py', None) (':setup.py', None) (':site-packages', None) -(':Extensions:example3:README', None) -(':Extensions:example2:README', None) -(':Extensions:example:README', None) -(':Mac:Contrib:osam:OSAm.carbon.slb', '') +(':Mac:OSX:README', None) diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include index 6fa9d50..3996c4a 100644 --- a/Mac/Distributions/dev.include +++ b/Mac/Distributions/dev.include @@ -353,7 +353,6 @@ (':Mac:Lib', None) (':Mac:MPW', None) (':Mac:Modules', None) -(':Mac:OSX:README.macosx.txt', None) (':Mac:OSXResources', None) (':Mac:OSXResources:', None) (':Mac:PlugIns:readme.txt', None) @@ -364,6 +363,15 @@ (':Mac:ReadMe-src', None) (':Mac:Relnotes', None) (':Mac:Relnotes-source', None) +(':Mac:Resources:Carbon.r', None) +(':Mac:Resources:balloons.bh', None) +(':Mac:Resources:bundle.rsrc', None) +(':Mac:Resources:dialogs.rsrc', None) +(':Mac:Resources:errors.rsrc', None) +(':Mac:Resources:gusiprefs.rsrc', None) +(':Mac:Resources:pythonpath.r', '') +(':Mac:Resources:tkpython.rsrc', None) +(':Mac:Resources:version.r', None) (':Mac:TODO', None) (':Mac:Tools:BBPy', None) (':Mac:Tools:CGI', None) @@ -522,6 +530,8 @@ (':Modules:yuv.h', None) (':Modules:yuvconvert.c', None) (':Modules:zlibmodule.c', None) +(':Modules:zlibmodule.c~0', None) +(':Modules:zlibmodule.c~1', None) (':Objects', None) (':Objects:Icon\r', None) (':PC', None) @@ -576,12 +586,6 @@ (':readmefiles', None) (':setup.py', None) (':site-packages', None) -(':Mac:Resources:pythonpath.r', '') -(':Mac:Resources:version.r', None) -(':Mac:Resources:tkpython.rsrc', None) -(':Mac:Resources:gusiprefs.rsrc', None) -(':Mac:Resources:errors.rsrc', None) -(':Mac:Resources:dialogs.rsrc', None) -(':Mac:Resources:Carbon.r', None) -(':Mac:Resources:bundle.rsrc', None) -(':Mac:Resources:balloons.bh', None) +(':Mac:OSX:README.macosx.txt', None) +(':Mac:OSX:README', None) +(':Mac:OSX:Makefile', None) diff --git a/Mac/Distributions/src.exclude b/Mac/Distributions/src.exclude index 4d9e3fb..b72d54d 100644 --- a/Mac/Distributions/src.exclude +++ b/Mac/Distributions/src.exclude @@ -11,6 +11,7 @@ *.slb *.xMAP *.xSYM +*~[0-9] .#* .cvsignore @* @@ -18,4 +19,3 @@ CVS Makefile.pre.in PyIDE-src [(]*[)] -*~[0-9] diff --git a/Mac/Distributions/src.include b/Mac/Distributions/src.include index a380332..623d436 100644 --- a/Mac/Distributions/src.include +++ b/Mac/Distributions/src.include @@ -2,6 +2,8 @@ (':BuildApplet', None) (':BuildApplication', None) (':ConfigurePython', None) +(':ConfigurePythonCarbon', None) +(':ConfigurePythonClassic', None) (':Demo', '') (':Doc', None) (':EditPythonPrefs', None) @@ -12,6 +14,9 @@ (':Extensions:README', '') (':Extensions:README.TOO', '') (':Extensions:audio', None) +(':Extensions:example', '') +(':Extensions:example2', '') +(':Extensions:example3', '') (':Extensions:img', '') (':Extensions:midi', None) (':Extensions:pyexpat', None) @@ -56,7 +61,6 @@ (':Mac:Lib', '') (':Mac:MPW', '') (':Mac:Modules', '') -(':Mac:PlugIns:readme.txt', '') (':Mac:Python', '') (':Mac:ReadMe', '') (':Mac:ReadMe-dev', None) @@ -72,6 +76,7 @@ (':Mac:Tools:bruce', None) (':Mac:Tools:macfreeze', '') (':Mac:Unsupported', '') +(':Mac:Wastemods', '') (':Mac:_checkversion.py', None) (':Mac:mwerks', '') (':Mac:mwerks:old', None) @@ -90,8 +95,11 @@ (':Python68K', None) (':PythonApplet', None) (':PythonCore', None) +(':PythonCoreCarbon', None) (':PythonFAT', None) (':PythonInterpreter', None) +(':PythonInterpreterCarbon', None) +(':PythonInterpreterClassic', None) (':PythonPPC', None) (':PythonStandCarbon', None) (':PythonStandSmall', None) @@ -99,6 +107,7 @@ (':PythonStandSmallThreading', None) (':PythonStandalone', None) (':README', '') +(':RISCOS', None) (':Tools:Icon\r', None) (':Tools:README', '') (':Tools:audiopy', '') @@ -125,16 +134,10 @@ (':mac2unix.shar', None) (':mkapplet', None) (':pystone.py', None) -(':site-packages', None) (':setup.py', None) -(':PythonInterpreterClassic', None) -(':PythonInterpreterCarbon', None) -(':PythonCoreCarbon', None) -(':ConfigurePythonClassic', None) -(':ConfigurePythonCarbon', None) -(':Extensions:example', '') +(':site-packages', None) +(':PLAN.txt', '') +(':PythonStandSmallCarbon', None) +(':PythonCarbonStandalone', None) +(':Mac:OSXResources', '') (':Mac:OSX', '') -(':Mac:Wastemods', '') -(':Extensions:example2', '') -(':Extensions:example3', '') -(':RISCOS', None) diff --git a/Mac/Include/macbuildno.h b/Mac/Include/macbuildno.h index 604ce64..2dd36729 100644 --- a/Mac/Include/macbuildno.h +++ b/Mac/Include/macbuildno.h @@ -1 +1 @@ -#define BUILD 104 +#define BUILD 107 diff --git a/Mac/ReadMe b/Mac/ReadMe index 5ff575b..dc9783c 100644 --- a/Mac/ReadMe +++ b/Mac/ReadMe @@ -1,4 +1,4 @@ -How to install Python 2.2a2 on your Macintosh +How to install Python 2.2a3 on your Macintosh --------------------------------------------- This is a MacPython that can run on classic MacOS (from 8.1 @@ -12,9 +12,9 @@ A special note about the active installer: do not background it, it may hang your machine. This is a general problem with Vise active installers, MindVision are working on it. -Aside from the general new Python 2.2a2 listed in the general relnotes file +Aside from the general new Python 2.2a3 listed in the general relnotes file there is some other new machine-independent stuff in this release as well, as -it was built from newer sources than unix/windows 2.2a2. +it was built from newer sources than unix/windows 2.2a3. ------ If this is your first encounter with Python: you definitely need the @@ -101,13 +101,11 @@ A feature that I am not sure about (so: feedback!) is that if you open a textfil for reading MacPython will now accept either unix linefeeds (LF, '\n') or Macintosh linefeeds (CR, '\r') and present both of them as '\n'. This is done on a low level, so it works for files opened by scripts as well as for your scripts -and modules itself. +and modules itself. This can be turned off with a preference/startup option. But: - this works only for input, and there's no way to find out what the original linefeed convention of the file was. -- this is unconditional, so there's no way to turn it off, either on a file-by-file - basis or globally (but opening binary files works as it always has, of course). - Windows \r\n linefeeds are not supported and get turned into \n\n. What to install @@ -150,9 +148,14 @@ After installing ---------------- It is probably a good idea to run the automatic tests. Start -Python and "import test.autotest". +Python and "import test.regrtest ; test.regrtest.main()". -Three tests will fail on MacOS9, all with MemoryErrors: +test_time will fail because MacPython accepts bogus values for mktime(), this +will be fixed later. + +test_descrtut will fail because of a problem with the test itself. + +Three tests will fail on MacOS9 with MemoryErrors: test_longexp, test_sha and test_zlib (on MacOSX nothing should fail). If you increase the PythonInterpreter memory @@ -178,7 +181,7 @@ 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.2a2 Preferences" file in the Python subfolder in the +"Python 2.2a3 Preferences" file in the Python subfolder in the Preferences folder. All the rest of Python lives in the folder you installed in. @@ -227,9 +230,9 @@ that 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.2a2 works as expected you can trash +After you are satisfied that 2.2a3 works as expected you can trash anything in the system folder that has "python" in the name and not -"2.2a2". +"2.2a3". The ConfigurePython... applets will try to detect incompatible preferences files and offer to remove them. This means that re-running ConfigurePython after @@ -261,7 +264,8 @@ course. 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, David Goodger, Chris Barker, Luc Lefebvre, Tattoo Mabonzo K., Russell Finn, -Tom Bridgman, Russel Owen, Pascal Oberndoerfer, Dean Draayer +Tom Bridgman, Russel Owen, Pascal Oberndoerfer, Dean Draayer, +Alexandre Parenteau, and all the other people who provided feedback, code or both! MacPython includes waste, a TextEdit replacement which is (c) 1998 Marco Piovanelli. diff --git a/Mac/Relnotes b/Mac/Relnotes index 6787b86..3ba5a89 100644 --- a/Mac/Relnotes +++ b/Mac/Relnotes @@ -1,10 +1,8 @@ -Changes in 2.2a2 since 2.1.1 +Changes in 2.2a3 since 2.1.1 ---------------------------- These release notes refer to Mac-specific changes only. See NEWS (in the Misc folder) -for machine-independent changes. But note that more things may have changed: MacPython -2.2a2 is built from newer sources than unix/windows 2.2a2 (for CVS users: the r22a2-mac -tag is what you are looking for). +for machine-independent changes. - The main change is that all toolbox modules have moved to a package called Carbon. So things like "import Res" should be changed to "from Carbon import Res", and @@ -13,7 +11,8 @@ tag is what you are looking for). to contribute. Aside from reducing clutter this change will also benefit the port to Mach-O/OSX Python later. - On input MacPython now accepts either \n (unix style) or \r (mac style) newlines - for text files. This is an experimental feature; again: feedback is requested. + for text files. This behaviour can be turned off with a preference. + This is an experimental feature; again: feedback is requested. - 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. @@ -22,6 +21,9 @@ tag is what you are looking for). - Garbage collection and the gc module have (finally) been enabled. - EasyDialogs.ProgressBar now has indeterminate progressbars if you specify maxval=0. This is also the new default. Patch supplied by Dean Draayer. +- There are new preferences for enabling old-style division warnings and for + accepting unix-style newlines in text input files. These can also be set during + startup, and in addition you can select very verbose import tracing. - Various outdated scripts have been moved to :Mac:Unsupported. - Various outdated items from :Mac:Lib:test have been removed. @@ -38,7 +40,7 @@ Known problems This list is probably incomplete, more problems may be listed on the MacPython homepage, http://www.cwi.nl/~jack/macpython.html. -- MacPython 2.2a2 (and MacPython 2.1) will not run correctly on a multiprocessor MacOS X +- MacPython 2.2a3 (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. - Tkinter does not work under Carbon. diff --git a/Mac/_checkversion.py b/Mac/_checkversion.py index b7c6944..a4eff81 100644 --- a/Mac/_checkversion.py +++ b/Mac/_checkversion.py @@ -5,7 +5,7 @@ _checkversion.py file""" import pyversioncheck _PACKAGE="MacPython" -_VERSION="2.1.1" +_VERSION="2.2a3" _URL="http://www.cwi.nl/~jack/macpythonversion.txt" try: -- cgit v0.12