From 9eca23559d74fce99bc094aacbb0bf1f7bbe8f78 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 19 Jan 2001 23:47:21 +0000
Subject: [PATCH] Various tweaks for Python 2.1a1.

---
 Mac/Build/PythonCore.exp       |  25 +++++++++++++++++--------
 Mac/Build/PythonCore.mcp       | Bin 157180 -> 157180 bytes
 Mac/Build/PythonStandSmall.mcp | Bin 289397 -> 289397 bytes
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Mac/Build/PythonCore.exp b/Mac/Build/PythonCore.exp
index 75c57b8226..87f58fdae7 100644
--- a/Mac/Build/PythonCore.exp
+++ b/Mac/Build/PythonCore.exp
@@ -37,6 +37,7 @@ PyArg_GetFloat
 PyArg_GetShort
 PyArg_GetLong
 PyArg_GetObject
+PyErr_Warn
 PyErr_WriteUnraisable
 PyErr_NewException
 PyErr_Format
@@ -163,6 +164,8 @@ PySys_WriteStdout
 PySys_SetArgv
 PySys_SetPath
 _PySys_Init
+PySys_AddWarnOption
+PySys_ResetWarnOptions
 PySys_SetObject
 PySys_GetFile
 PySys_GetObject
@@ -213,22 +216,22 @@ PyNumber_Positive
 PyNumber_Negative
 PyNumber_InPlacePower
 PyNumber_InPlaceRemainder
-PyNumber_InPlaceDivide
 PyNumber_InPlaceMultiply
-PyNumber_InPlaceSubtract
 PyNumber_InPlaceAdd
+PyNumber_InPlaceDivide
+PyNumber_InPlaceSubtract
 PyNumber_InPlaceRshift
 PyNumber_InPlaceLshift
 PyNumber_InPlaceAnd
 PyNumber_InPlaceXor
 PyNumber_InPlaceOr
 PyNumber_Power
-PyNumber_Divmod
 PyNumber_Remainder
+PyNumber_Add
+PyNumber_Divmod
 PyNumber_Divide
 PyNumber_Multiply
 PyNumber_Subtract
-PyNumber_Add
 PyNumber_Rshift
 PyNumber_Lshift
 PyNumber_And
@@ -253,8 +256,6 @@ PyMethod_Class
 PyMethod_Self
 PyMethod_Function
 PyMethod_New
-PyInstance_HalfBinOp
-PyInstance_DoBinOp
 PyInstance_New
 PyClass_IsSubclass
 PyClass_New
@@ -372,12 +373,11 @@ PyModule_GetName
 PyModule_GetDict
 PyModule_New
 _Py_NoneStruct
+_Py_NotImplementedStruct
 _Py_cobject_hack
 _Py_abstract_hack
-_PyCompareState_Key
 _PyTrash_delete_later
 _PyTrash_delete_nesting
-_PyCompareState_nesting
 _PyTrash_destroy_chain
 _PyTrash_deposit_object
 Py_ReprLeave
@@ -402,7 +402,11 @@ PyObject_GetAttrString
 PyObject_Hash
 _Py_HashPointer
 _Py_HashDouble
+PyObject_RichCompareBool
+PyObject_RichCompare
+do_richcmp
 PyObject_Compare
+PyObject_Unicode
 PyObject_Str
 PyObject_Repr
 PyObject_Print
@@ -802,6 +806,11 @@ PyExc_TypeError
 PyExc_ValueError
 PyExc_ZeroDivisionError
 PyExc_MemoryErrorInst
+PyExc_Warning
+PyExc_UserWarning
+PyExc_DeprecationWarning
+PyExc_SyntaxWarning
+PyExc_RuntimeWarning
 fini_exceptions
 init_exceptions
 initNav
diff --git a/Mac/Build/PythonCore.mcp b/Mac/Build/PythonCore.mcp
index 382e40c7b16628eabd9e87f355ae0a712430b0f7..8994105c0b0640b660b48cdcd5a5e0a97e4c7c57 100644
GIT binary patch
delta 1563
zcmex!n)A<T&J6+5vU3<17*;bfFfcGOFdS!KU;y)37#J8>7#I$1&XpErV(;ti`2T<6
z$IYFx8<`n7Hk&K%V`5_D-27SDk5P@0i-Cbrfq{Xqn1Mk6WC|C<ZFOtLhWCsN+c@>U
zF*bZ)WY~IpbH3_933=zlqNMyh$K>SH;^O?GV!eEZfXb4L{5<FUqEx-qiph-sWj8nE
z6f<tVZ=bFp#23WCz{tq}27D<D42)cx69a`ACvVumvN=C-37h6IsEe5y7#O}VGBEIf
zm4XNskY^aaZR>0M#=wv(viW26Z^p^SSz_#c-5US@|G5Pg*zBEih-JHQ2;*DE&Hsv=
zwHfD3bd27-vr&L?@`7NV>9b`SeJ8Kor?^>tfldSGK~QLb@I=Sh?K>41k7%<V137Q{
zhJB3U6MZ>3AZ}sgn!aEIqxj~$8A(hahcZe}*YIc5kzr(DsCD!7aph!SI1QzlKr~3#
z^a6iI<$6X21{SCYE0kt~((|CSB$Q@{(yO2}2bAW7(p*rQ8%py)X<jJJ2c`L;w1AtZ
zkC!VW1H)9PfFP6>g3`iJS_DdqLTNE5Ee@rZgX!rp0gUn>|44zk3=Hj1S{h2rKxtVh
zEeECLp|k>&R)o?@P+A#Et3YX0D6Iyi)uFV8o2QQv$UmA;0WB!44W)IUv@VpM52mN<
z1TxB5GBPmefw>F}`cT>cN*h9HBPeYQrA@%}^z-2mZ<~R+3=HN_+5$>jLg`W{T?VDC
zptLoVwt>>NP}&Yk+e2vwDD4QPouG8Fo2O4b$lE1Q0cR-f0;OG{v>TLmhtfNsv<H;-
zgwkG6+8atQgVH`wdN!1v1EuG>d2;)J9Iy^7Fnx6pqf#Iv1A{M^%fK)VO8Y@+e<&RQ
zr30aK5R?vq(xFhg3QSLz3ue?3WMp870CO1_BEj_Z$Y4fgMMegOXfT(7AqGmvLg_d#
zJ$-I4qq-v_1H&3Hmw}-kN;g31Lr{7Hlx~F5O;EZSOivGtVpIg#wg=2*VAu<#_d)6X
zV0yZH2%{Dw<K%+EUPg{-p^W;B$F^&PG8!}5&qyl(6;uoi3=Zrw_BJrwy?Ymi*(WU%
zfU$AW+rt7FS=qKPk72x%&3X`A5M4OPsLXl@R7_4^uph?UzTpI80Mq0%tz6rUPBUKY
qW-OS_63(=kQDXXva3*8MhUs_0nY0;GrgKCvO=c|EJ|}`HffoQ3^l*#-

delta 696
zcmex!n)A<T&J6+5va=Z&7*;bfFfcGOFdSuIU;y)37#J8>7#I$0&XpErVsF1;&A=cq
zd2^@iM&`|Sio2OM|5f&3oEX5N#>m0Iz^K5$z!${8AOJFhgF%LY(RvO8lLrHXO~+0K
z28$X7hRyk^2PGym|Cip}kTZpG^L_hth0W=Ks*IC2Y+%`(pSXmL@#tiU3|aQ}>$d;@
zw>{hZvHCaTWb-UBh`^);V1dp4Ifqy#2Cz&Q4q+7DtWqeeJNbHn)x-d$%{v<f7$+|X
z=9xZQmeF_e+I@<f)febAFdmqEp}=usfXeor3XDgzS&uR>FtSfyuz^v0a^4J14v24|
zBAfGOBr$<p!zeXf!=F({hLeGz*3Hw$m6L(tG?Zon(I8#Z3;Y?C>p2-1SU@723=FJL
znhi?NgVK^vnjK27g3=sNniEQML1}I%%>$)*p)?<q=7-V(Zk|3~Ag4`*3J5}JAt)^j
zrA45$D3lh1(&A8hIhdXv6Tm3H{dgGT16E%{1_lO(|3^;MKMVk|7#J8F*c+~FK(>s%
z?t}q|kIynRgZC7&9)N`Yenw>kQ(^Oj2N6t@&$M!FH#*IDv70exI!idyVn&haE5ezK
b86BqI31`w~Oqk9Q!8DmMXZxH8rUYI9@-?`p

diff --git a/Mac/Build/PythonStandSmall.mcp b/Mac/Build/PythonStandSmall.mcp
index 86122814d2755a1c1b00e16d1942644926d2a975..0639dd41897751497fe6504b1d33741a8ad05126 100644
GIT binary patch
delta 66
zcmex*Meyqt!3`|R?0s$8|Np<~Y35dL=T>Ii&aKQ8(<FE%fB^}x&q$l@IFV6qVgO6~
OtffrbXDwyEeFOj>2NrVx

delta 75
zcmex*Meyqt!3`|R?9D&j7#IXLG;=Grb1O4$=T>HlX;RYsz<>nUHB}0bxD4#p8i(3D
NmojbdT+00B2mt?061xBZ