mirror of
https://github.com/python/cpython.git
synced 2024-11-24 10:24:35 +08:00
Tweaks for MacPython 2.2b1
This commit is contained in:
parent
8626aeb1ce
commit
5d528b787e
@ -26,7 +26,7 @@
|
||||
#define PY_RELEASE_SERIAL 1
|
||||
|
||||
/* Version as a string */
|
||||
#define PY_VERSION "2.2b1+"
|
||||
#define PY_VERSION "2.2b1"
|
||||
|
||||
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
|
||||
Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
|
||||
|
@ -130,6 +130,7 @@ PyMarshal_ReadObjectFromString
|
||||
PyMarshal_ReadObjectFromFile
|
||||
PyMarshal_ReadLastObjectFromFile
|
||||
PyMarshal_ReadLongFromFile
|
||||
PyMarshal_ReadShortFromFile
|
||||
PyMarshal_WriteObjectToFile
|
||||
PyMarshal_WriteLongToFile
|
||||
_Py_PackageContext
|
||||
@ -717,7 +718,7 @@ pcre_info
|
||||
pcre_version
|
||||
pcre_study
|
||||
initcPickle
|
||||
Pickler_setattr
|
||||
fast_save_leave
|
||||
cPickle_PyMapping_HasKey
|
||||
initcStringIO
|
||||
PyMac_FindModuleExtension
|
||||
|
@ -130,6 +130,7 @@ PyMarshal_ReadObjectFromString
|
||||
PyMarshal_ReadObjectFromFile
|
||||
PyMarshal_ReadLastObjectFromFile
|
||||
PyMarshal_ReadLongFromFile
|
||||
PyMarshal_ReadShortFromFile
|
||||
PyMarshal_WriteObjectToFile
|
||||
PyMarshal_WriteLongToFile
|
||||
_Py_PackageContext
|
||||
@ -711,7 +712,7 @@ pcre_info
|
||||
pcre_version
|
||||
pcre_study
|
||||
initcPickle
|
||||
Pickler_setattr
|
||||
fast_save_leave
|
||||
cPickle_PyMapping_HasKey
|
||||
initcStringIO
|
||||
PyMac_FindModuleExtension
|
||||
@ -1039,6 +1040,8 @@ PyWeakref_GetObject
|
||||
PyWeakref_NewProxy
|
||||
PyWeakref_NewRef
|
||||
_PyWeakref_GetWeakrefCount
|
||||
PyStructSequence_InitType
|
||||
PyStructSequence_New
|
||||
GUSISetupConsoleStdio
|
||||
GUSIStdioFlush
|
||||
GUSIStdioClose
|
||||
|
@ -19,7 +19,6 @@
|
||||
*.orig
|
||||
*.prj
|
||||
*.prj.exp
|
||||
*.pyc
|
||||
*.xSYM
|
||||
*.ľ
|
||||
*.ľ.exp
|
||||
@ -33,3 +32,5 @@ CVS
|
||||
Makefile*
|
||||
Setup.in
|
||||
[(]*[)]
|
||||
*.pyc
|
||||
*.pyo
|
||||
|
@ -127,7 +127,6 @@
|
||||
(':Mac:Contrib:PythonScript', '')
|
||||
(':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', '')
|
||||
@ -143,6 +142,7 @@
|
||||
(':Mac:Lib', '')
|
||||
(':Mac:MPW', None)
|
||||
(':Mac:Modules', None)
|
||||
(':Mac:OSX:README', None)
|
||||
(':Mac:OSX:README.macosx.txt', None)
|
||||
(':Mac:OSXResources', None)
|
||||
(':Mac:Python:Icon', None)
|
||||
@ -174,6 +174,7 @@
|
||||
(':PCbuild', None)
|
||||
(':PLAN.txt', None)
|
||||
(':Parser:Icon', None)
|
||||
(':Parser:grammar.mak', None)
|
||||
(':Python IDE', None)
|
||||
(':Python:Icon', None)
|
||||
(':PythonCarbonStandalone', None)
|
||||
@ -218,4 +219,3 @@
|
||||
(':pystone.py', None)
|
||||
(':setup.py', None)
|
||||
(':site-packages', None)
|
||||
(':Mac:OSX:README', None)
|
||||
|
@ -16,3 +16,4 @@
|
||||
@*
|
||||
CVS
|
||||
[(]*[)]
|
||||
*.pyo
|
||||
|
@ -353,6 +353,9 @@
|
||||
(':Mac:Lib', None)
|
||||
(':Mac:MPW', None)
|
||||
(':Mac:Modules', None)
|
||||
(':Mac:OSX:Makefile', None)
|
||||
(':Mac:OSX:README', None)
|
||||
(':Mac:OSX:README.macosx.txt', None)
|
||||
(':Mac:OSXResources', None)
|
||||
(':Mac:OSXResources:', None)
|
||||
(':Mac:PlugIns:readme.txt', None)
|
||||
@ -586,6 +589,10 @@
|
||||
(':readmefiles', None)
|
||||
(':setup.py', None)
|
||||
(':site-packages', None)
|
||||
(':Mac:OSX:README.macosx.txt', None)
|
||||
(':Mac:OSX:README', None)
|
||||
(':Mac:OSX:Makefile', None)
|
||||
(':Mac:Build:_hotshot.mcp.xml', None)
|
||||
(':Mac:Build:_hotshot.mcp.exp', None)
|
||||
(':Mac:Build:_hotshot.mcp', None)
|
||||
(':Mac:Build:_hotshot.carbon.mcp.xml', None)
|
||||
(':Mac:Build:_hotshot.carbon.mcp.exp', None)
|
||||
(':Mac:Build:_hotshot.carbon.mcp', None)
|
||||
(':Modules:_hotshot.c', None)
|
||||
|
@ -1 +1 @@
|
||||
#define BUILD 107
|
||||
#define BUILD 111
|
||||
|
44
Mac/ReadMe
44
Mac/ReadMe
@ -1,4 +1,4 @@
|
||||
How to install Python 2.2a3 on your Macintosh
|
||||
How to install Python 2.2b1 on your Macintosh
|
||||
---------------------------------------------
|
||||
|
||||
This is a MacPython that can run on classic MacOS (from 8.1
|
||||
@ -6,15 +6,13 @@ onwards) and natively on MacOSX. The installer tries to work out whether you can
|
||||
use the Carbon version or not.
|
||||
|
||||
You should definitely read the Relnotes file too, and the section below about
|
||||
toolbox module reorganization.
|
||||
toolbox module reorganization. You should also read :Misc:NEWS, which lists
|
||||
the general (non-mac-dependent) new features of this Python release.
|
||||
|
||||
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.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.2a3.
|
||||
------
|
||||
|
||||
If this is your first encounter with Python: you definitely need the
|
||||
@ -65,27 +63,6 @@ classic PPC, and they are normal classic modules. Also note that some
|
||||
modules you may think of as toolbox modules (such as Waste) really are not,
|
||||
and they are not in the Carbon package.
|
||||
|
||||
Some open issues I would like to discuss on the PythonMac-SIG, please join
|
||||
in if you have views on the matter:
|
||||
- Is this all a good idea?
|
||||
- Some modules are not in the Carbon package (icglue, for instance, or
|
||||
supporting module such as aetools and aepack) and maybe they should be,
|
||||
some are (ControlAccessors) which arguably should not. Opinions are welcome.
|
||||
- I'm tempted to put Qt and QuickTime into their own package, especially
|
||||
since I'm also working on porting it to Windows. It would also be in line
|
||||
with Apple's organization. Opinions?
|
||||
- Should we get rid of the Res/Resource dichotomy, where the first is the
|
||||
extension module and the second is the Python module with the constants?
|
||||
We could simply import the extension module functionality into the Python
|
||||
module, at the expense of a rather large namespace.
|
||||
- Should we have a Carbon.Carbon module that simply imports the whole world,
|
||||
so that "from Carbon.Carbon import *" is pretty much equivalent to the C
|
||||
#include <Carbon/Carbon.h>?
|
||||
- Should we put all the other Mac modules into a Mac package? This will make
|
||||
MacPython programs a lot more verbose, but that is a good thing too if people
|
||||
try to port Mac Python scripts to other platforms.
|
||||
Should the Carbon package then be a sub-package of the Mac package?
|
||||
|
||||
Another change related to the OSX growth path is that there is a new module
|
||||
macresource that you can use to easily open a resource file accompanying your
|
||||
script. Use "macresource.need("DLOG", MY_DIALOG_ID, "name.rsrc") and if the
|
||||
@ -94,10 +71,7 @@ turned into an applet) the given resource file will be opened. This method will
|
||||
eventually also contain the magic needed to open the resource file on
|
||||
OSX MachO Python.
|
||||
|
||||
... and more
|
||||
------------
|
||||
|
||||
A feature that I am not sure about (so: feedback!) is that if you open a textfile
|
||||
Another feature to help with the OSX transition is that if you open a textfile
|
||||
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
|
||||
@ -151,12 +125,12 @@ It is probably a good idea to run the automatic tests. Start
|
||||
Python and "import test.regrtest ; test.regrtest.main()".
|
||||
|
||||
test_time will fail because MacPython accepts bogus values for mktime(), this
|
||||
will be fixed later.
|
||||
will be fixed later (it is not a very serious problem).
|
||||
|
||||
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).
|
||||
test_longexp, test_sha and test_zlib (on MacOSX these should pass).
|
||||
|
||||
If you increase the PythonInterpreter memory
|
||||
partition size they will pass (but for longexp you have to increase it by an
|
||||
@ -181,7 +155,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.2a3 Preferences" file in the Python subfolder in the
|
||||
"Python 2.2b1 Preferences" file in the Python subfolder in the
|
||||
Preferences folder. All the rest of Python lives in the folder you
|
||||
installed in.
|
||||
|
||||
@ -230,9 +204,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.2a3 works as expected you can trash
|
||||
After you are satisfied that 2.2b1 works as expected you can trash
|
||||
anything in the system folder that has "python" in the name and not
|
||||
"2.2a3".
|
||||
"2.2b1".
|
||||
|
||||
The ConfigurePython... applets will try to detect incompatible preferences
|
||||
files and offer to remove them. This means that re-running ConfigurePython after
|
||||
|
30
Mac/Relnotes
30
Mac/Relnotes
@ -1,31 +1,39 @@
|
||||
Changes in 2.2a3 since 2.1.1
|
||||
Changes in 2.2b1 since 2.1.1
|
||||
----------------------------
|
||||
|
||||
These release notes refer to Mac-specific changes only. See NEWS (in the Misc folder)
|
||||
for machine-independent changes.
|
||||
for machine-independent changes. Changes that were already in 2.2a3 are flagged as such.
|
||||
|
||||
|
||||
- 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
|
||||
"from Res import *" to "from Carbon.Res import *". Please see the readme file for
|
||||
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.
|
||||
port to Mach-O/OSX Python later. [2.2a3]
|
||||
- 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.
|
||||
This is an experimental feature; again: feedback is requested. [2.2a3]
|
||||
- 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.
|
||||
This module will later also do the right thing in Mach-O/OSX Python. [2.2a3]
|
||||
- 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.
|
||||
They now get 64K. There is still no overflow check, though. [2.2a3]
|
||||
- Garbage collection and the gc module have (finally) been enabled. [2.2a3]
|
||||
- EasyDialogs.ProgressBar now has indeterminate progressbars if you specify maxval=0.
|
||||
This is also the new default. Patch supplied by Dean Draayer.
|
||||
This is also the new default. Patch supplied by Dean Draayer. [2.2a3]
|
||||
- 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.
|
||||
startup, and in addition you can select very verbose import tracing. [2.2a3]
|
||||
- Various outdated scripts have been moved to :Mac:Unsupported. [2.2a3]
|
||||
- Various outdated items from :Mac:Lib:test have been removed. [2.2a3]
|
||||
- C Developers: you know have control over the Python console if you are embedding
|
||||
MacPython in another application, thanks to Alexandre Parenteau. :Mac:Demo:embed.html
|
||||
has very minimal documentation.
|
||||
- BuildCGIApplet works again.
|
||||
- The CodeWarrior OSA suite missed quit(). It is back.
|
||||
- Contrib:morefindertools is gone, the functionality has been integrated into
|
||||
the standard module findertools.py.
|
||||
|
||||
What is not in this distribution
|
||||
--------------------------------
|
||||
|
@ -5,7 +5,7 @@ _checkversion.py file"""
|
||||
import pyversioncheck
|
||||
|
||||
_PACKAGE="MacPython"
|
||||
_VERSION="2.2a3"
|
||||
_VERSION="2.2b1"
|
||||
_URL="http://www.cwi.nl/~jack/macpythonversion.txt"
|
||||
|
||||
try:
|
||||
|
Loading…
Reference in New Issue
Block a user