First set of changes for 2.1.1. MacPython builds and

passes the selftest with these.

4 files changed, 208 insertions, 208 deletions

diff --git a/Mac/Build/PythonCore.exp b/Mac/Build/PythonCore.exp
index ee15d8b2e2..48373e72b7 100644
--- a/Mac/Build/PythonCore.exp
+++ b/Mac/Build/PythonCore.exp
@@ -22,7 +22,6 @@ __dt__15GUSISIOUXSocketFv		# GUSISIOUXSocket::~GUSISIOUXSocket()
 Initialize__15GUSISIOUXSocketFv		# GUSISIOUXSocket::Initialize()
 __ct__15GUSISIOUXSocketFv		# GUSISIOUXSocket::GUSISIOUXSocket()
 Instance__15GUSISIOUXSocketFv		# GUSISIOUXSocket::Instance()
-Py_FileSystemDefaultEncoding
 _PyBuiltin_Init
 _PyEval_SliceIndex
 PyEval_CallObjectWithKeywords
@@ -218,8 +217,6 @@ PyNode_CompileSymtable
 PyNode_CompileFlags
 PyNode_Compile
 PyCode_New
-PyIter_Next
-PyObject_GetIter
 PyObject_IsSubclass
 PyObject_IsInstance
 PyObject_CallMethod
@@ -235,7 +232,6 @@ PyMapping_Check
 PySequence_Index
 PySequence_In
 PySequence_Contains
-_PySequence_IterContains
 PySequence_Count
 PySequence_Fast
 PySequence_List
@@ -325,7 +321,6 @@ _Py_c_neg
 _Py_c_diff
 _Py_c_sum
 PyDict_Type
-PyDictIter_Type
 PyDict_DelItemString
 PyDict_SetItemString
 PyDict_GetItemString
@@ -353,7 +348,6 @@ PyFile_Name
 PyFile_AsFile
 PyFloat_Type
 PyFloat_Fini
-PyFloat_AsReprString
 PyFloat_AsString
 PyFloat_AsStringEx
 PyFloat_AsDouble
@@ -487,10 +481,7 @@ PyString_AsStringAndSize
 PyString_AsString
 PyString_Size
 PyString_AsEncodedString
-PyString_AsEncodedObject
 PyString_Encode
-PyString_AsDecodedString
-PyString_AsDecodedObject
 PyString_Decode
 PyString_FromString
 PyString_FromStringAndSize
@@ -570,7 +561,6 @@ open_doc_upp
 open_app_upp
 not_upp
 PyMac_GetArgv
-PyMac_GetFullPath
 PyMac_init_process_location
 strdup
 Py_GetCompiler
@@ -583,6 +573,98 @@ Py_GetPlatform
 PyMac_ConsoleIsDead
 PyMac_AppearanceCompliant
 PyMac_OSErrException
+PyMacGluePtr_AEDesc_New
+PyMacGluePtr_AEDesc_Convert
+PyMacGluePtr_CmpObj_New
+PyMacGluePtr_CmpObj_Convert
+PyMacGluePtr_CmpInstObj_New
+PyMacGluePtr_CmpInstObj_Convert
+PyMacGluePtr_CtlObj_New
+PyMacGluePtr_CtlObj_Convert
+PyMacGluePtr_DlgObj_New
+PyMacGluePtr_DlgObj_Convert
+PyMacGluePtr_DlgObj_WhichDialog
+PyMacGluePtr_DragObj_New
+PyMacGluePtr_DragObj_Convert
+PyMacGluePtr_ListObj_New
+PyMacGluePtr_ListObj_Convert
+PyMacGluePtr_MenuObj_New
+PyMacGluePtr_MenuObj_Convert
+PyMacGluePtr_GrafObj_New
+PyMacGluePtr_GrafObj_Convert
+PyMacGluePtr_BMObj_New
+PyMacGluePtr_BMObj_Convert
+PyMacGluePtr_QdRGB_New
+PyMacGluePtr_QdRGB_Convert
+PyMacGluePtr_GWorldObj_New
+PyMacGluePtr_GWorldObj_Convert
+PyMacGluePtr_TrackObj_New
+PyMacGluePtr_TrackObj_Convert
+PyMacGluePtr_MovieObj_New
+PyMacGluePtr_MovieObj_Convert
+PyMacGluePtr_MovieCtlObj_New
+PyMacGluePtr_MovieCtlObj_Convert
+PyMacGluePtr_TimeBaseObj_New
+PyMacGluePtr_TimeBaseObj_Convert
+PyMacGluePtr_UserDataObj_New
+PyMacGluePtr_UserDataObj_Convert
+PyMacGluePtr_MediaObj_New
+PyMacGluePtr_MediaObj_Convert
+PyMacGluePtr_ResObj_New
+PyMacGluePtr_ResObj_Convert
+PyMacGluePtr_OptResObj_New
+PyMacGluePtr_OptResObj_Convert
+PyMacGluePtr_TEObj_New
+PyMacGluePtr_TEObj_Convert
+PyMacGluePtr_WinObj_New
+PyMacGluePtr_WinObj_Convert
+PyMacGluePtr_WinObj_WhichWindow
+WinObj_WhichWindow
+WinObj_Convert
+WinObj_New
+TEObj_Convert
+TEObj_New
+OptResObj_Convert
+OptResObj_New
+ResObj_Convert
+ResObj_New
+MediaObj_Convert
+MediaObj_New
+UserDataObj_Convert
+UserDataObj_New
+TimeBaseObj_Convert
+TimeBaseObj_New
+MovieCtlObj_Convert
+MovieCtlObj_New
+MovieObj_Convert
+MovieObj_New
+TrackObj_Convert
+TrackObj_New
+GWorldObj_Convert
+GWorldObj_New
+QdRGB_Convert
+QdRGB_New
+BMObj_Convert
+BMObj_New
+GrafObj_Convert
+GrafObj_New
+MenuObj_Convert
+MenuObj_New
+ListObj_Convert
+ListObj_New
+DragObj_Convert
+DragObj_New
+DlgObj_WhichDialog
+DlgObj_Convert
+DlgObj_New
+CtlObj_Convert
+CtlObj_New
+CmpInstObj_Convert
+CmpInstObj_New
+CmpObj_Convert
+CmpObj_New
+AEDesc_Convert
+AEDesc_New
 PyMac_Buildwide
 PyMac_Getwide
 PyMac_BuildFixed
@@ -592,8 +674,6 @@ PyMac_BuildPoint
 PyMac_GetPoint
 PyMac_BuildRect
 PyMac_GetRect
-PyMac_BuildFSSpec
-PyMac_GetFSSpec
 PyMac_BuildOptStr255
 PyMac_BuildStr255
 PyMac_GetStr255
@@ -630,6 +710,7 @@ PLstrcpy
 PyMac_StopGUSISpin
 RotateCursor
 SpinCursor
+PyMac_GetFullPath
 PyMac_getscript
 PyMac_AppRefNum
 PyMac_options
@@ -657,8 +738,12 @@ macstat
 sync
 initgestalt
 initmacfs
+PyMac_BuildFSSpec
+PyMac_BuildFSRef
+PyMac_GetFSRef
+newmfsrobject
 newmfssobject
-mfs_GetFSSpecFSSpec
+PyMac_GetFSSpec
 initmac
 initMacOS
 Pcre_Type
@@ -692,9 +777,9 @@ _CtlObj_New
 DlgObj_chain
 Dialog_Type
 initDlg
-DlgObj_Convert
-DlgObj_New
-DlgObj_WhichDialog
+_DlgObj_Convert
+_DlgObj_New
+_DlgObj_WhichDialog
 MenuObj_chain
 Menu_Type
 initMenu
@@ -723,9 +808,9 @@ _ResObj_New
 WinObj_chain
 Window_Type
 initWin
-WinObj_WhichWindow
-WinObj_Convert
-WinObj_New
+_WinObj_WhichWindow
+_WinObj_Convert
+_WinObj_New
 PyBuffer_Type
 PyBuffer_New
 PyBuffer_FromReadWriteMemory
@@ -832,7 +917,6 @@ PyThread_get_thread_ident
 PyThread_start_new_thread
 PyThread_init_thread
 PyExc_Exception
-PyExc_StopIteration
 PyExc_StandardError
 PyExc_ArithmeticError
 PyExc_LookupError
@@ -898,90 +982,6 @@ PyCell_New
 PySymtableEntry_Type
 PySymtableEntry_New
 PyNode_Future
-PySeqIter_Type
-PyCallIter_Type
-PyCallIter_New
-PySeqIter_New
-PyMacGluePtr_AEDesc_New
-PyMacGluePtr_AEDesc_Convert
-PyMacGluePtr_CmpObj_New
-PyMacGluePtr_CmpObj_Convert
-PyMacGluePtr_CmpInstObj_New
-PyMacGluePtr_CmpInstObj_Convert
-PyMacGluePtr_CtlObj_New
-PyMacGluePtr_CtlObj_Convert
-PyMacGluePtr_DragObj_New
-PyMacGluePtr_DragObj_Convert
-PyMacGluePtr_ListObj_New
-PyMacGluePtr_ListObj_Convert
-PyMacGluePtr_MenuObj_New
-PyMacGluePtr_MenuObj_Convert
-PyMacGluePtr_GrafObj_New
-PyMacGluePtr_GrafObj_Convert
-PyMacGluePtr_BMObj_New
-PyMacGluePtr_BMObj_Convert
-PyMacGluePtr_QdRGB_New
-PyMacGluePtr_QdRGB_Convert
-PyMacGluePtr_GWorldObj_New
-PyMacGluePtr_GWorldObj_Convert
-PyMacGluePtr_TrackObj_New
-PyMacGluePtr_TrackObj_Convert
-PyMacGluePtr_MovieObj_New
-PyMacGluePtr_MovieObj_Convert
-PyMacGluePtr_MovieCtlObj_New
-PyMacGluePtr_MovieCtlObj_Convert
-PyMacGluePtr_TimeBaseObj_New
-PyMacGluePtr_TimeBaseObj_Convert
-PyMacGluePtr_UserDataObj_New
-PyMacGluePtr_UserDataObj_Convert
-PyMacGluePtr_MediaObj_New
-PyMacGluePtr_MediaObj_Convert
-PyMacGluePtr_ResObj_New
-PyMacGluePtr_ResObj_Convert
-PyMacGluePtr_OptResObj_New
-PyMacGluePtr_OptResObj_Convert
-PyMacGluePtr_TEObj_New
-PyMacGluePtr_TEObj_Convert
-TEObj_Convert
-TEObj_New
-OptResObj_Convert
-OptResObj_New
-ResObj_Convert
-ResObj_New
-MediaObj_Convert
-MediaObj_New
-UserDataObj_Convert
-UserDataObj_New
-TimeBaseObj_Convert
-TimeBaseObj_New
-MovieCtlObj_Convert
-MovieCtlObj_New
-MovieObj_Convert
-MovieObj_New
-TrackObj_Convert
-TrackObj_New
-GWorldObj_Convert
-GWorldObj_New
-QdRGB_Convert
-QdRGB_New
-BMObj_Convert
-BMObj_New
-GrafObj_Convert
-GrafObj_New
-MenuObj_Convert
-MenuObj_New
-ListObj_Convert
-ListObj_New
-DragObj_Convert
-DragObj_New
-CtlObj_Convert
-CtlObj_New
-CmpInstObj_Convert
-CmpInstObj_New
-CmpObj_Convert
-CmpObj_New
-AEDesc_Convert
-AEDesc_New
 GUSISetupConsoleStdio
 GUSIStdioFlush
 GUSIStdioClose
diff --git a/Mac/Build/PythonCore.mcp b/Mac/Build/PythonCore.mcp
index 1d49980f65..3ea76798ba 100644
--- a/Mac/Build/PythonCore.mcp
+++ b/Mac/Build/PythonCore.mcp
diff --git a/Mac/Build/PythonCoreCarbon.exp b/Mac/Build/PythonCoreCarbon.exp
index 4d336822ad..9defe6c421 100644
--- a/Mac/Build/PythonCoreCarbon.exp
+++ b/Mac/Build/PythonCoreCarbon.exp
@@ -22,7 +22,6 @@ __dt__15GUSISIOUXSocketFv		# GUSISIOUXSocket::~GUSISIOUXSocket()
 Initialize__15GUSISIOUXSocketFv		# GUSISIOUXSocket::Initialize()
 __ct__15GUSISIOUXSocketFv		# GUSISIOUXSocket::GUSISIOUXSocket()
 Instance__15GUSISIOUXSocketFv		# GUSISIOUXSocket::Instance()
-Py_FileSystemDefaultEncoding
 _PyBuiltin_Init
 _PyEval_SliceIndex
 PyEval_CallObjectWithKeywords
@@ -218,8 +217,6 @@ PyNode_CompileSymtable
 PyNode_CompileFlags
 PyNode_Compile
 PyCode_New
-PyIter_Next
-PyObject_GetIter
 PyObject_IsSubclass
 PyObject_IsInstance
 PyObject_CallMethod
@@ -235,7 +232,6 @@ PyMapping_Check
 PySequence_Index
 PySequence_In
 PySequence_Contains
-_PySequence_IterContains
 PySequence_Count
 PySequence_Fast
 PySequence_List
@@ -325,7 +321,6 @@ _Py_c_neg
 _Py_c_diff
 _Py_c_sum
 PyDict_Type
-PyDictIter_Type
 PyDict_DelItemString
 PyDict_SetItemString
 PyDict_GetItemString
@@ -353,7 +348,6 @@ PyFile_Name
 PyFile_AsFile
 PyFloat_Type
 PyFloat_Fini
-PyFloat_AsReprString
 PyFloat_AsString
 PyFloat_AsStringEx
 PyFloat_AsDouble
@@ -487,10 +481,7 @@ PyString_AsStringAndSize
 PyString_AsString
 PyString_Size
 PyString_AsEncodedString
-PyString_AsEncodedObject
 PyString_Encode
-PyString_AsDecodedString
-PyString_AsDecodedObject
 PyString_Decode
 PyString_FromString
 PyString_FromStringAndSize
@@ -570,7 +561,6 @@ open_doc_upp
 open_app_upp
 not_upp
 PyMac_GetArgv
-PyMac_GetFullPath
 PyMac_init_process_location
 strdup
 Py_GetCompiler
@@ -583,6 +573,98 @@ Py_GetPlatform
 PyMac_ConsoleIsDead
 PyMac_AppearanceCompliant
 PyMac_OSErrException
+PyMacGluePtr_AEDesc_New
+PyMacGluePtr_AEDesc_Convert
+PyMacGluePtr_CmpObj_New
+PyMacGluePtr_CmpObj_Convert
+PyMacGluePtr_CmpInstObj_New
+PyMacGluePtr_CmpInstObj_Convert
+PyMacGluePtr_CtlObj_New
+PyMacGluePtr_CtlObj_Convert
+PyMacGluePtr_DlgObj_New
+PyMacGluePtr_DlgObj_Convert
+PyMacGluePtr_DlgObj_WhichDialog
+PyMacGluePtr_DragObj_New
+PyMacGluePtr_DragObj_Convert
+PyMacGluePtr_ListObj_New
+PyMacGluePtr_ListObj_Convert
+PyMacGluePtr_MenuObj_New
+PyMacGluePtr_MenuObj_Convert
+PyMacGluePtr_GrafObj_New
+PyMacGluePtr_GrafObj_Convert
+PyMacGluePtr_BMObj_New
+PyMacGluePtr_BMObj_Convert
+PyMacGluePtr_QdRGB_New
+PyMacGluePtr_QdRGB_Convert
+PyMacGluePtr_GWorldObj_New
+PyMacGluePtr_GWorldObj_Convert
+PyMacGluePtr_TrackObj_New
+PyMacGluePtr_TrackObj_Convert
+PyMacGluePtr_MovieObj_New
+PyMacGluePtr_MovieObj_Convert
+PyMacGluePtr_MovieCtlObj_New
+PyMacGluePtr_MovieCtlObj_Convert
+PyMacGluePtr_TimeBaseObj_New
+PyMacGluePtr_TimeBaseObj_Convert
+PyMacGluePtr_UserDataObj_New
+PyMacGluePtr_UserDataObj_Convert
+PyMacGluePtr_MediaObj_New
+PyMacGluePtr_MediaObj_Convert
+PyMacGluePtr_ResObj_New
+PyMacGluePtr_ResObj_Convert
+PyMacGluePtr_OptResObj_New
+PyMacGluePtr_OptResObj_Convert
+PyMacGluePtr_TEObj_New
+PyMacGluePtr_TEObj_Convert
+PyMacGluePtr_WinObj_New
+PyMacGluePtr_WinObj_Convert
+PyMacGluePtr_WinObj_WhichWindow
+WinObj_WhichWindow
+WinObj_Convert
+WinObj_New
+TEObj_Convert
+TEObj_New
+OptResObj_Convert
+OptResObj_New
+ResObj_Convert
+ResObj_New
+MediaObj_Convert
+MediaObj_New
+UserDataObj_Convert
+UserDataObj_New
+TimeBaseObj_Convert
+TimeBaseObj_New
+MovieCtlObj_Convert
+MovieCtlObj_New
+MovieObj_Convert
+MovieObj_New
+TrackObj_Convert
+TrackObj_New
+GWorldObj_Convert
+GWorldObj_New
+QdRGB_Convert
+QdRGB_New
+BMObj_Convert
+BMObj_New
+GrafObj_Convert
+GrafObj_New
+MenuObj_Convert
+MenuObj_New
+ListObj_Convert
+ListObj_New
+DragObj_Convert
+DragObj_New
+DlgObj_WhichDialog
+DlgObj_Convert
+DlgObj_New
+CtlObj_Convert
+CtlObj_New
+CmpInstObj_Convert
+CmpInstObj_New
+CmpObj_Convert
+CmpObj_New
+AEDesc_Convert
+AEDesc_New
 PyMac_Buildwide
 PyMac_Getwide
 PyMac_BuildFixed
@@ -592,8 +674,6 @@ PyMac_BuildPoint
 PyMac_GetPoint
 PyMac_BuildRect
 PyMac_GetRect
-PyMac_BuildFSSpec
-PyMac_GetFSSpec
 PyMac_BuildOptStr255
 PyMac_BuildStr255
 PyMac_GetStr255
@@ -624,6 +704,7 @@ Pstring
 PyMac_StopGUSISpin
 RotateCursor
 SpinCursor
+PyMac_GetFullPath
 PyMac_getscript
 PyMac_AppRefNum
 PyMac_options
@@ -650,8 +731,12 @@ macstat
 sync
 initgestalt
 initmacfs
+PyMac_BuildFSSpec
+PyMac_BuildFSRef
+PyMac_GetFSRef
+newmfsrobject
 newmfssobject
-mfs_GetFSSpecFSSpec
+PyMac_GetFSSpec
 initmac
 initMacOS
 Pcre_Type
@@ -685,9 +770,9 @@ _CtlObj_New
 DlgObj_chain
 Dialog_Type
 initDlg
-DlgObj_Convert
-DlgObj_New
-DlgObj_WhichDialog
+_DlgObj_Convert
+_DlgObj_New
+_DlgObj_WhichDialog
 MenuObj_chain
 Menu_Type
 initMenu
@@ -716,9 +801,9 @@ _ResObj_New
 WinObj_chain
 Window_Type
 initWin
-WinObj_WhichWindow
-WinObj_Convert
-WinObj_New
+_WinObj_WhichWindow
+_WinObj_Convert
+_WinObj_New
 PyBuffer_Type
 PyBuffer_New
 PyBuffer_FromReadWriteMemory
@@ -825,7 +910,6 @@ PyThread_get_thread_ident
 PyThread_start_new_thread
 PyThread_init_thread
 PyExc_Exception
-PyExc_StopIteration
 PyExc_StandardError
 PyExc_ArithmeticError
 PyExc_LookupError
@@ -891,90 +975,6 @@ PyCell_New
 PySymtableEntry_Type
 PySymtableEntry_New
 PyNode_Future
-PySeqIter_Type
-PyCallIter_Type
-PyCallIter_New
-PySeqIter_New
-PyMacGluePtr_AEDesc_New
-PyMacGluePtr_AEDesc_Convert
-PyMacGluePtr_CmpObj_New
-PyMacGluePtr_CmpObj_Convert
-PyMacGluePtr_CmpInstObj_New
-PyMacGluePtr_CmpInstObj_Convert
-PyMacGluePtr_CtlObj_New
-PyMacGluePtr_CtlObj_Convert
-PyMacGluePtr_DragObj_New
-PyMacGluePtr_DragObj_Convert
-PyMacGluePtr_ListObj_New
-PyMacGluePtr_ListObj_Convert
-PyMacGluePtr_MenuObj_New
-PyMacGluePtr_MenuObj_Convert
-PyMacGluePtr_GrafObj_New
-PyMacGluePtr_GrafObj_Convert
-PyMacGluePtr_BMObj_New
-PyMacGluePtr_BMObj_Convert
-PyMacGluePtr_QdRGB_New
-PyMacGluePtr_QdRGB_Convert
-PyMacGluePtr_GWorldObj_New
-PyMacGluePtr_GWorldObj_Convert
-PyMacGluePtr_TrackObj_New
-PyMacGluePtr_TrackObj_Convert
-PyMacGluePtr_MovieObj_New
-PyMacGluePtr_MovieObj_Convert
-PyMacGluePtr_MovieCtlObj_New
-PyMacGluePtr_MovieCtlObj_Convert
-PyMacGluePtr_TimeBaseObj_New
-PyMacGluePtr_TimeBaseObj_Convert
-PyMacGluePtr_UserDataObj_New
-PyMacGluePtr_UserDataObj_Convert
-PyMacGluePtr_MediaObj_New
-PyMacGluePtr_MediaObj_Convert
-PyMacGluePtr_ResObj_New
-PyMacGluePtr_ResObj_Convert
-PyMacGluePtr_OptResObj_New
-PyMacGluePtr_OptResObj_Convert
-PyMacGluePtr_TEObj_New
-PyMacGluePtr_TEObj_Convert
-TEObj_Convert
-TEObj_New
-OptResObj_Convert
-OptResObj_New
-ResObj_Convert
-ResObj_New
-MediaObj_Convert
-MediaObj_New
-UserDataObj_Convert
-UserDataObj_New
-TimeBaseObj_Convert
-TimeBaseObj_New
-MovieCtlObj_Convert
-MovieCtlObj_New
-MovieObj_Convert
-MovieObj_New
-TrackObj_Convert
-TrackObj_New
-GWorldObj_Convert
-GWorldObj_New
-QdRGB_Convert
-QdRGB_New
-BMObj_Convert
-BMObj_New
-GrafObj_Convert
-GrafObj_New
-MenuObj_Convert
-MenuObj_New
-ListObj_Convert
-ListObj_New
-DragObj_Convert
-DragObj_New
-CtlObj_Convert
-CtlObj_New
-CmpInstObj_Convert
-CmpInstObj_New
-CmpObj_Convert
-CmpObj_New
-AEDesc_Convert
-AEDesc_New
 GUSISetupConsoleStdio
 GUSIStdioFlush
 GUSIStdioClose
diff --git a/Mac/Build/PythonStandSmall.mcp b/Mac/Build/PythonStandSmall.mcp
index dd73e7a81b..c6b6189e93 100644
--- a/Mac/Build/PythonStandSmall.mcp
+++ b/Mac/Build/PythonStandSmall.mcp