Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b952651

Browse files
jackjansenjackjansen
committed
Merging changes from release22-branch.
1 parent 089c7d1 commit b952651

11 files changed

Lines changed: 61 additions & 55 deletions

File tree

‎Mac/Build/PythonCore.mcp‎

0 Bytes
Binary file not shown.

‎Mac/Distributions/(vise)/Python 2.2.vct‎

419 Bytes
Binary file not shown.

‎Mac/Distributions/binary.exclude‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ CVS
3434
Makefile*
3535
Setup.in
3636
[(]*[)]
37+
*~[0-9]

‎Mac/Distributions/binary.include‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
(':Mac:Contrib:PythonScript', '')
128128
(':Mac:Contrib:Sherlock', '')
129129
(':Mac:Contrib:Tabcleaner', '')
130+
(':Mac:Contrib:mpwsystem', '')
130131
(':Mac:Contrib:osam:OSAm.carbon.slb', '')
131132
(':Mac:Contrib:osam:OSAm.exp', None)
132133
(':Mac:Contrib:osam:OSAm.ppc.slb', '')
@@ -149,6 +150,7 @@
149150
(':Mac:ReadMe', ':ReadMe')
150151
(':Mac:ReadMe-dev', None)
151152
(':Mac:ReadMe-src', None)
153+
(':Mac:ReadMe~0', None)
152154
(':Mac:ReadmeSource', None)
153155
(':Mac:Relnotes', ':Relnotes:')
154156
(':Mac:Resources', None)
@@ -219,5 +221,3 @@
219221
(':pystone.py', None)
220222
(':setup.py', None)
221223
(':site-packages', None)
222-
(':Mac:ReadMe~0', None)
223-
(':Mac:Contrib:mpwsystem', '')

‎Mac/Distributions/dev.exclude‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717
@*
1818
CVS
1919
[(]*[)]
20+
*~[0-9]

‎Mac/Distributions/dev.include‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,16 @@
6363
(':Mac:Build:Printing.mcp', None)
6464
(':Mac:Build:Printing.mcp.exp', None)
6565
(':Mac:Build:Printing.mcp.xml', None)
66+
(':Mac:Build:PythonCore.axp', None)
6667
(':Mac:Build:PythonCore.exp', None)
6768
(':Mac:Build:PythonCore.mcp', None)
6869
(':Mac:Build:PythonCoreCarbon.exp', None)
6970
(':Mac:Build:PythonInterpreter.mcp', None)
71+
(':Mac:Build:PythonInterpreter.old.mcp', None)
7072
(':Mac:Build:PythonStandSmall.mcp', None)
7173
(':Mac:Build:PythonStandSmall.mcp~0', None)
7274
(':Mac:Build:PythonStandSmall.mcp~1', None)
75+
(':Mac:Build:PythonStandSmall.old.mcp', None)
7376
(':Mac:Build:PythonStandalone.mcp', None)
7477
(':Mac:Build:PythonStandalone.mcp~0', None)
7578
(':Mac:Build:PythonStandalone.mcp~1', None)
@@ -104,6 +107,12 @@
104107
(':Mac:Build:_CF.carbon.mcp', None)
105108
(':Mac:Build:_CF.carbon.mcp.exp', None)
106109
(':Mac:Build:_CF.carbon.mcp.xml', None)
110+
(':Mac:Build:_CG.carbon.mcp', None)
111+
(':Mac:Build:_CG.carbon.mcp.exp', None)
112+
(':Mac:Build:_CG.carbon.old.mcp', None)
113+
(':Mac:Build:_CarbonEvt.carbon.mcp', None)
114+
(':Mac:Build:_CarbonEvt.carbon.mcp.exp', None)
115+
(':Mac:Build:_CarbonEvt.carbon.mcp.xml', None)
107116
(':Mac:Build:_Cm.carbon.mcp', None)
108117
(':Mac:Build:_Cm.carbon.mcp.exp', None)
109118
(':Mac:Build:_Cm.carbon.mcp.xml', None)
@@ -223,6 +232,7 @@
223232
(':Mac:Build:_Win.mcp.xml', None)
224233
(':Mac:Build:_dummy_tkinter.mcp', None)
225234
(':Mac:Build:_dummy_tkinter.mcp.exp', None)
235+
(':Mac:Build:_dummy_tkinter.old.mcp', None)
226236
(':Mac:Build:_hotshot.carbon.mcp', None)
227237
(':Mac:Build:_hotshot.carbon.mcp.exp', None)
228238
(':Mac:Build:_hotshot.carbon.mcp.xml', None)
@@ -373,6 +383,7 @@
373383
(':Mac:ReadMe', None)
374384
(':Mac:ReadMe-dev', ':')
375385
(':Mac:ReadMe-src', None)
386+
(':Mac:ReadMe~0', None)
376387
(':Mac:Relnotes', None)
377388
(':Mac:Relnotes-source', None)
378389
(':Mac:Resources:Carbon.r', None)
@@ -529,6 +540,8 @@
529540
(':Modules:testcapi_long.h', None)
530541
(':Modules:threadmodule.c', None)
531542
(':Modules:timemodule.c', None)
543+
(':Modules:timemodule.c~0', None)
544+
(':Modules:timemodule.c~1', None)
532545
(':Modules:timing.h', None)
533546
(':Modules:timingmodule.c', None)
534547
(':Modules:tkappinit.c', None)
@@ -600,16 +613,3 @@
600613
(':readmefiles', None)
601614
(':setup.py', None)
602615
(':site-packages', None)
603-
(':Mac:Build:_CG.carbon.old.mcp', None)
604-
(':Mac:Build:_CG.carbon.mcp.exp', None)
605-
(':Mac:Build:_CG.carbon.mcp', None)
606-
(':Mac:Build:_CarbonEvt.carbon.mcp.xml', None)
607-
(':Mac:Build:_CarbonEvt.carbon.mcp.exp', None)
608-
(':Mac:Build:_CarbonEvt.carbon.mcp', None)
609-
(':Mac:ReadMe~0', None)
610-
(':Modules:timemodule.c~1', None)
611-
(':Modules:timemodule.c~0', None)
612-
(':Mac:Build:PythonStandSmall.old.mcp', None)
613-
(':Mac:Build:PythonInterpreter.old.mcp', None)
614-
(':Mac:Build:PythonCore.axp', None)
615-
(':Mac:Build:_dummy_tkinter.old.mcp', None)

‎Mac/Include/macbuildno.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define BUILD 121
1+
#define BUILD 124

‎Mac/Python/macglue.c‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,17 @@ Pstring(char *str)
392392
}
393393

394394
#if TARGET_API_MAC_OS8
395+
Point
396+
LMGetMouse(void)
397+
{
398+
return LMGetMouseLocation();
399+
}
400+
401+
long LMGetExpandMem(void)
402+
{
403+
return 0;
404+
}
405+
395406
void
396407
c2pstrcpy(unsigned char *dst, const char *src)
397408
{

‎Mac/ReadMe‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
How to install Python 2.2c1 on your Macintosh
1+
How to install Python 2.2 on your Macintosh
22
---------------------------------------------
33

4-
This is a release candidate for MacPython 2.2, please report any problems as
5-
soon as possible, by email to [email protected].
6-
74
This is a MacPython that can run on classic MacOS (from 8.1
85
onwards) and natively on MacOSX. The installer tries to work out whether you can
96
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
3229
now. The documentation is in HTML format, start with index.html.
3330

3431
This installer installs MacPython for classic PPC MacOS, MacPython for Carbon
35-
(OS X, OS 9 or OS8 with CarbonLib installed) or both, depending on your
32+
(OS X, OS 9 or OS 8 with CarbonLib installed) or both, depending on your
3633
configuration. By selecting custom install you can bypass these tests and
3734
install what you want.
3835

39-
If you want 68k support you will have to stay with MacPython 1.5.2.
36+
If you want 68k support you will have get MacPython 1.5.2.
4037

4138
Toolbox module reorganization and more
4239
--------------------------------------
4340

4441
You can safely skip this section if this is your first encounter with MacPython.
4542

46-
I am working on a new organization of the mac-specific modules, and in
47-
general bringing the MacPython folder structure more in line with
43+
This release has a new organization of the mac-specific modules, and in
44+
general brings the MacPython folder structure more in line with
4845
unix-Python. This is not only a good idea, it will also immensely
4946
facilitate moving MacPython functionality to an OSX Python that is based
5047
on Mach-O and the unix-Python distribution. But don't worry: MacPython
@@ -92,6 +89,8 @@ But:
9289
- this works only for input, and there's no way to find out what the original
9390
linefeed convention of the file was.
9491
- Windows \r\n linefeeds are not supported and get turned into \n\n.
92+
- in 2.3 this feature will be replaced by a more general, platform independent
93+
way of handling files with foreign newline conventions.
9594

9695
What to install
9796
---------------
@@ -169,20 +168,18 @@ ways.
169168
Uninstalling
170169
------------
171170

172-
Two items are installed in the system folder: the interpreter shared
173-
libraries PythonCore and PythonCoreCarbon lives in the Extensions
174-
folder and the "Python 2.2c1 Preferences" file in the Python subfolder
171+
Up to three items are installed in the system folder: the interpreter shared
172+
libraries PythonCore and PythonCoreCarbon live in the Extensions
173+
folder and the "Python 2.2 Preferences" file in the Python subfolder
175174
in the Preferences folder. All the rest of Python lives in the folder
176175
you installed in.
177176

178-
On OSX the libraries are installed in /Library/CFMSupport. There is a
179-
nasty bug in OSX that is triggered by Python: if any orphaned aliases
180-
are left in /Library/CFMSupport your machine will start to behave very
181-
badly. 2.1 beta installers triggered this problem if you simply threw
182-
away your Python folder, so if you installed a 2.1beta you should
183-
clean out the aliases in /Library/CFMSupport too. The final 2.1 and
184-
2.1.1 installers always copied the shared libraries on OSX, so it does
185-
not have the problem anymore.
177+
On OSX the libraries are installed in /Library/CFMSupport. The ConfigurePython
178+
applets will complain if you have no right to create the libraries there
179+
(you need Admin privileges). This has one consequence: you will not be able to
180+
run applets unless they reside in the MacPython folder (such as the IDE or
181+
EditPythonPrefs). If you try to run an applet stored elsewhere you will
182+
get a "Cannot locate PythonCore" error message.
186183

187184
Things to see
188185
-------------
@@ -221,9 +218,9 @@ this means you can keep your older version around if you are unsure
221218
whether to upgrade. The bad news is that your old preference settings
222219
are lost and you have to set them again.
223220

224-
After you are satisfied that 2.2c1 works as expected you can trash
221+
After you are satisfied that 2.2 works as expected you can trash
225222
anything in the system folder that has "python" in the name and not
226-
"2.2c1".
223+
"2.2".
227224

228225
The ConfigurePython... applets will try to detect incompatible
229226
preferences files and offer to remove them. This means that re-running
@@ -278,9 +275,9 @@ this purpose.
278275

279276

280277
Jack Jansen
281-
Oratrix Development BV
282-
Valeriusplein 30
283-
Amsterdam
278+
CWI
279+
Kruislaan 413
280+
1098 SJ Amsterdam
284281
the Netherlands
285282

286283
<[email protected]>, http://www.cwi.nl/~jack

‎Mac/Relnotes‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Changes in 2.2c1 since 2.1.1
1+
Changes in 2.2 since 2.1.1
22
----------------------------
33

44
These release notes refer to Mac-specific changes only. See NEWS (in the Misc folder)
5-
for machine-independent changes. Changes that are new in 2.2c1 are flagged as such.
5+
for machine-independent changes.
66

77

88
- 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
1111
some open questions and join the discussions on pythonmac-sig if you have anything
1212
to contribute. Aside from reducing clutter this change will also benefit the
1313
port to Mach-O/OSX Python later.
14-
- All toolbox modules have been updated to Universal Headers 3.4. [2.2c1]
14+
- All toolbox modules have been updated to Universal Headers 3.4.
1515
- Toolbox modules are weaklinked against InterfaceLib (for PPC builds) and raise
16-
an exception when you call an unimplemented one on an old MacOS. [2.2c1]
16+
an exception when you call an unimplemented one on an old MacOS.
1717
- On input MacPython now accepts either \n (unix style) or \r (mac style) newlines
1818
for text files. This behaviour can be turned off with a preference.
1919
This is an experimental feature; again: feedback is requested.
20-
- The IDE looks better on OS X, but still not as good as on OS9. [2.2c1]
20+
- The IDE looks better on OS X, but still not as good as on OS9.
2121
- Command-dot handling has been improved a lot: scripts are now much easier to interrupt,
2222
and they only scan for cmd-. while in the foreground.
2323
- "Copy" from the MacPython console window was always disabled. Fixed.
2424
- This release should run on MacOS 8.1 again.
2525
- A new, rather different GUSI I/O library is used.
26-
- time.time() returns positive values again. [2.2c1]
26+
- time.time() returns positive values again.
2727
- There is a new module macresource which makes it easier to open a resource file
2828
accompanying your script when the script is not (yet) converted to an applet.
2929
This module will later also do the right thing in Mach-O/OSX Python.
3030
- (Carbon only) experimental modules Carbon.CG (CoreGraphics) and CarbonEvt have
31-
been added. [2.2c1]
31+
been added.
3232
- A new, experimental module hfsplus is included, which gives access to some of the
3333
functionality of the HFS+ API.
34-
- A new, experimental module gives access to Carbon Events. [2.2c1]
34+
- A new, experimental module gives access to Carbon Events.
3535
- Threads had a stack that was too small for many serious Python applications (20K).
3636
They now get 64K. There is still no overflow check, though.
3737
- 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
5252
- Contrib:morefindertools is gone, the functionality has been integrated into
5353
the standard module findertools.py.
5454

55-
What is not in this distribution
56-
--------------------------------
57-
58-
- The toolbox modules have not all been updated to Universal Header 3.4 or CarbonLib 1.4 yet.
59-
6055
Known problems
6156
--------------
6257

@@ -65,7 +60,8 @@ http://www.cwi.nl/~jack/macpython.html.
6560

6661
- MacPython 2.2 (and MacPython 2.1) will not run correctly on a multiprocessor MacOS X
6762
machine, it will quickly deadlock during I/O operations. The GUSI I/O library is suspected,
68-
hints/clues/workarounds are solicited.
63+
hints/clues/workarounds are solicited. This problem also occurs intermittently on fast
64+
OS X single-processor machines.
6965
- Tkinter does not work under Carbon.
7066
- The IDE and Tkinter do not work together. Run tkinter programs under PythonInterpreter.
7167
- Tkinter file events do not work, unless you have opened the file through Tcl (but then

0 commit comments

Comments
 (0)