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 75c57b8226c..87f58fdae73 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
zcmZ|P{Yz6(7zgnC+&1@;nx?6>rmj_+ZfR*`Wu<FnX_=eT)Y3@Hib}VfMK6T2=nYA*
zQCCPyC@gwoaj6y5WFstCQ2km-e?gQK{*tuLz5DuOgL6OUe(yPF&ojoIj%uc(nt(&6
zAL2OfA+ZY^ZyEBvf=$?nh#k6lysH1|<ydTBQoN#nI*Zg|i6O-Eq!E7^chFMOvYojc
zm+a-Z6t;`qe=(Jk?+0<uH3d`T`$^ohFQR)%I4j5A+STUnwC&s1?)AF6yajH~ajN@}
zyVLIOYA<L%>8F@p^d0q*_^s?<?%d>BcAADA$v(;ZrIW>0XBznf0fp#py_=9Xj*4fo
z1;5!mQC=!t6jC$X)bsv}QykZkE>52LL;m8!8LIw1b1XLfSq{W)M<a@0S{;2S@o$&i
zLPG<#-QvsM6!MR_5`~+3s`ft)8AQ{F)u#zdzlJmhY%Rf;x%9@O9GA)y0wKyAsMe_C
zwUAaA2~eikIoQTag_2G%*N}A~dwRB_a{Ff1P89Nz(k{VML&hF9Qy@{o1b7S1hbs60
zs-XsI;cS=)lVCEO15=n)QYqIFq{6u{4W`3+Fau`7d$K~agL0&P79hR^b#Nin!)%xX
zbD;q)f=0L)E`dv-37VNjQa^bJ@}UJ<;WBtzR<JrLdkx!GfVdDYhbv$aEQTv(g%1t!
zwpSr8fve#fcpRR9Yhfu|2iL<5und+%8{7!J%pR%jZUlC?32ufJa0`3^x57$T1-HRb
zxE<bvLvXmFa<=@Jej*3L!&+M8Wc5_z`3<-O)<6ez!dh4d>)~lxA=^dysqENB#7*(I
z$wfv3i+3Y#hAnVUeA%#zOg6Uc5#k=`gAo{jz3?17FDp2AkwN;lSBPK35FCpy+fqmQ
zM1Ie)tE9eBPlYrdG}luxl?@*7;B8f|8hq{JCMG6khU(gA%FO(K26sA0nGn3!Oka;E
z!}5#hW0;J}i1eBiM#g5Q!N5Cm@c#D~w85e%ed;5RplIOlP?m7NfiEVX@U?-r(0)PP
O$ot6?9BSnECjA2y^l*#-

delta 696
zcmex!n)A<T&J6+5va=Z&7*;a^2_QZSq`-U@AOnaGY|fPyWnyo?Va>oGFnM#Q>_+Cz
zc8a^1Hvd)jVVoGip~lDo)Th9}z!wBm0MrBI%P=rn&tYKlU|_K6*vY_PQNzHnIbZdl
z#AN3G(wiG{rZ8^4Z=bHPIXzI7aq@-@ESvKam#{G&oh*?d%iez7_W%F3XPZA(|7M(Q
zo+Snmn6v;au-QN75X-~>mg&MFjKZ5$3T1UCUoWtl7@)LyXQKe)<ORVz(`U;v`c7WE
zPjR#Q0-XlN1CuWlI8F>u*}hYO@rX7n&~J?F(-&-D6rY?ogOdZ|Td2t9yctPMAlEQT
zP1o>e)REz2V5oKT^l=5!r=c_xhz9AJUf|EDTo06Cfy%H#X*MW54@yfyX?7^R3QBW8
zX-+831*N&6G!K;Kh0=UbnjcCF0BJ9f)22cN1fjGLlop24B2ZcsN{c~haVWhUOizyq
zV3gl}JdE)HtFIw24jKL*IaU8K0K@_U2lj?58;~tyuRCD?;^VUn&EP$StOp>Wzn@VV
z!Bp5h;Xwq`<TI^Y+l@{$UhHPfna&c<w3tz3`igKSV@8MRcfy&p855>+02MLjY@ZXs
Hl)wuB@-?`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