Regenerated for new description stuff.

2 files changed, 456 insertions, 326 deletions

diff --git a/Mac/Build/PythonCore.exp b/Mac/Build/PythonCore.exp
index ee15d8b..142078b 100644
--- a/Mac/Build/PythonCore.exp
+++ b/Mac/Build/PythonCore.exp
@@ -25,15 +25,20 @@ Instance__15GUSISIOUXSocketFv		# GUSISIOUXSocket::Instance()
 Py_FileSystemDefaultEncoding
 _PyBuiltin_Init
 _PyEval_SliceIndex
+PyEval_GetFuncDesc
+PyEval_GetFuncName
 PyEval_CallObjectWithKeywords
 PyEval_CallObject
 Py_FlushLine
-PyEval_GetNestedScopes
+PyEval_MergeCompilerFlags
 PyEval_GetRestricted
 PyEval_GetFrame
 PyEval_GetGlobals
 PyEval_GetLocals
 PyEval_GetBuiltins
+PyEval_SetTrace
+PyEval_SetProfile
+PyEval_EvalCodeEx
 PyEval_EvalCode
 Py_SetRecursionLimit
 Py_GetRecursionLimit
@@ -141,6 +146,7 @@ Py_VerboseFlag
 Py_InteractiveFlag
 Py_NoSiteFlag
 Py_FrozenFlag
+Py_IgnoreEnvironmentFlag
 _PyThread_Started
 Py_UnicodeFlag
 PyOS_setsig
@@ -150,7 +156,9 @@ Py_Exit
 Py_AtExit
 Py_FatalError
 PyParser_SimpleParseString
+PyParser_SimpleParseStringFlags
 PyParser_SimpleParseFile
+PyParser_SimpleParseFileFlags
 Py_SymtableString
 Py_CompileStringFlags
 Py_CompileString
@@ -185,6 +193,10 @@ Py_Finalize
 Py_Initialize
 Py_IsInitialized
 _PyThreadState_Current
+PyThreadState_Next
+PyInterpreterState_ThreadHead
+PyInterpreterState_Next
+PyInterpreterState_Head
 PyThreadState_GetDict
 PyThreadState_Swap
 PyThreadState_Get
@@ -224,6 +236,7 @@ PyObject_IsSubclass
 PyObject_IsInstance
 PyObject_CallMethod
 PyObject_CallFunction
+PyObject_Call
 PyObject_CallObject
 PyMapping_HasKey
 PyMapping_HasKeyString
@@ -298,13 +311,10 @@ PyClass_Type
 PyInstance_Type
 PyMethod_Type
 PyMethod_Fini
-PyMethod_Class
-PyMethod_Self
-PyMethod_Function
 PyMethod_New
-PyInstance_New
 PyInstance_NewRaw
 PyClass_IsSubclass
+PyInstance_New
 PyClass_New
 PyCObject_Type
 PyCObject_Import
@@ -334,6 +344,7 @@ PyDict_Values
 PyDict_Keys
 PyDict_Size
 PyDict_Copy
+PyDict_Update
 PyDict_Next
 PyDict_Clear
 PyDict_DelItem
@@ -367,6 +378,10 @@ PyFrame_BlockPop
 PyFrame_BlockSetup
 PyFrame_New
 PyFunction_Type
+PyClassMethod_Type
+PyStaticMethod_Type
+PyStaticMethod_New
+PyClassMethod_New
 PyFunction_SetClosure
 PyFunction_GetClosure
 PyFunction_SetDefaults
@@ -401,6 +416,8 @@ PyLong_FromString
 PyLong_AsVoidPtr
 PyLong_FromVoidPtr
 PyLong_AsDouble
+_PyLong_AsByteArray
+_PyLong_FromByteArray
 PyLong_AsUnsignedLong
 PyLong_AsLong
 PyLong_FromDouble
@@ -415,6 +432,7 @@ PyCFunction_GetFlags
 PyCFunction_GetSelf
 PyCFunction_GetFunction
 PyCFunction_New
+module_members
 PyModule_Type
 _PyModule_Clear
 PyModule_GetFilename
@@ -443,6 +461,9 @@ PyNumber_Coerce
 PyNumber_CoerceEx
 PyObject_Not
 PyObject_IsTrue
+PyObject_GenericSetAttr
+PyObject_GenericGetAttr
+_PyObject_GetDictPtr
 PyObject_SetAttr
 PyObject_HasAttr
 PyObject_GetAttr
@@ -483,6 +504,8 @@ _PyString_FormatLong
 _PyString_Resize
 PyString_ConcatAndDel
 PyString_Concat
+_PyString_Join
+_PyString_Eq
 PyString_AsStringAndSize
 PyString_AsString
 PyString_Size
@@ -502,7 +525,14 @@ PyTuple_SetItem
 PyTuple_GetItem
 PyTuple_Size
 PyTuple_New
+type_getsets
 PyType_Type
+PyBaseObject_Type
+PyType_InitDict
+_PyType_Lookup
+PyType_IsSubtype
+PyType_GenericNew
+PyType_GenericAlloc
 PyGrammar_RemoveAccelerators
 PyGrammar_AddAccelerators
 PyGrammar_LabelRepr
@@ -519,7 +549,9 @@ PyParser_AddToken
 PyParser_Delete
 PyParser_New
 Py_TabcheckFlag
+PyParser_ParseFileFlags
 PyParser_ParseFile
+PyParser_ParseStringFlags
 PyParser_ParseString
 _PyParser_TokenNames
 PyTokenizer_Get
@@ -559,7 +591,13 @@ initrgbimg
 initrotor
 initselect
 gethostbyname_lock
+inet_ntop
+inet_pton
 init_socket
+getnameinfo
+getaddrinfo
+freeaddrinfo
+gai_strerror
 initstrop
 initstruct
 inittime
@@ -570,7 +608,6 @@ open_doc_upp
 open_app_upp
 not_upp
 PyMac_GetArgv
-PyMac_GetFullPath
 PyMac_init_process_location
 strdup
 Py_GetCompiler
@@ -583,6 +620,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 +721,6 @@ PyMac_BuildPoint
 PyMac_GetPoint
 PyMac_BuildRect
 PyMac_GetRect
-PyMac_BuildFSSpec
-PyMac_GetFSSpec
 PyMac_BuildOptStr255
 PyMac_BuildStr255
 PyMac_GetStr255
@@ -630,6 +757,7 @@ PLstrcpy
 PyMac_StopGUSISpin
 RotateCursor
 SpinCursor
+PyMac_GetFullPath
 PyMac_getscript
 PyMac_AppRefNum
 PyMac_options
@@ -657,8 +785,12 @@ macstat
 sync
 initgestalt
 initmacfs
+PyMac_BuildFSSpec
+PyMac_BuildFSRef
+PyMac_GetFSRef
+newmfsrobject
 newmfssobject
-mfs_GetFSSpecFSSpec
+PyMac_GetFSSpec
 initmac
 initMacOS
 Pcre_Type
@@ -692,9 +824,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 +855,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
@@ -750,73 +882,74 @@ PyCodec_Encoder
 _PyCodec_Lookup
 PyCodec_Register
 _PyUnicode_TypeRecords
-_PyUnicode_IsAlpha
-_PyUnicode_ToLowercase
-_PyUnicode_ToUppercase
-_PyUnicode_IsUppercase
-_PyUnicode_IsLowercase
-_PyUnicode_IsWhitespace
-_PyUnicode_IsNumeric
-_PyUnicode_ToNumeric
-_PyUnicode_IsDigit
-_PyUnicode_ToDigit
-_PyUnicode_IsDecimalDigit
-_PyUnicode_ToDecimalDigit
-_PyUnicode_IsTitlecase
-_PyUnicode_ToTitlecase
-_PyUnicode_IsLinebreak
+_PyUnicodeUCS2_IsAlpha
+_PyUnicodeUCS2_ToLowercase
+_PyUnicodeUCS2_ToUppercase
+_PyUnicodeUCS2_IsUppercase
+_PyUnicodeUCS2_IsLowercase
+_PyUnicodeUCS2_IsWhitespace
+_PyUnicodeUCS2_IsNumeric
+_PyUnicodeUCS2_ToNumeric
+_PyUnicodeUCS2_IsDigit
+_PyUnicodeUCS2_ToDigit
+_PyUnicodeUCS2_IsDecimalDigit
+_PyUnicodeUCS2_ToDecimalDigit
+_PyUnicodeUCS2_IsTitlecase
+_PyUnicodeUCS2_ToTitlecase
+_PyUnicodeUCS2_IsLinebreak
 PyUnicode_Type
-_PyUnicode_Fini
-_PyUnicode_Init
-PyUnicode_Format
-PyUnicode_Split
-PyUnicode_Replace
-PyUnicode_Concat
-PyUnicode_Contains
-PyUnicode_Compare
-PyUnicode_Splitlines
-PyUnicode_Join
-PyUnicode_Tailmatch
-PyUnicode_Find
-PyUnicode_Count
-PyUnicode_EncodeDecimal
-PyUnicode_Translate
-PyUnicode_TranslateCharmap
-PyUnicode_AsCharmapString
-PyUnicode_EncodeCharmap
-PyUnicode_DecodeCharmap
-PyUnicode_AsASCIIString
-PyUnicode_EncodeASCII
-PyUnicode_DecodeASCII
-PyUnicode_AsLatin1String
-PyUnicode_EncodeLatin1
-PyUnicode_DecodeLatin1
-PyUnicode_AsRawUnicodeEscapeString
-PyUnicode_EncodeRawUnicodeEscape
-PyUnicode_DecodeRawUnicodeEscape
-PyUnicode_AsUnicodeEscapeString
-PyUnicode_EncodeUnicodeEscape
-PyUnicode_DecodeUnicodeEscape
-PyUnicode_AsUTF16String
-PyUnicode_EncodeUTF16
-PyUnicode_DecodeUTF16
-PyUnicode_AsUTF8String
-PyUnicode_EncodeUTF8
-PyUnicode_DecodeUTF8
-PyUnicode_SetDefaultEncoding
-PyUnicode_GetDefaultEncoding
-PyUnicode_GetSize
-PyUnicode_AsUnicode
-_PyUnicode_AsDefaultEncodedString
-PyUnicode_AsEncodedString
-PyUnicode_Encode
-PyUnicode_Decode
-PyUnicode_FromEncodedObject
-PyUnicode_FromObject
-PyUnicode_AsWideChar
-PyUnicode_FromWideChar
-PyUnicode_FromUnicode
-PyUnicode_Resize
+_PyUnicodeUCS2_Fini
+_PyUnicodeUCS2_Init
+PyUnicodeUCS2_Format
+PyUnicodeUCS2_Split
+PyUnicodeUCS2_Replace
+PyUnicodeUCS2_Concat
+PyUnicodeUCS2_Contains
+PyUnicodeUCS2_Compare
+PyUnicodeUCS2_Splitlines
+PyUnicodeUCS2_Join
+PyUnicodeUCS2_Tailmatch
+PyUnicodeUCS2_Find
+PyUnicodeUCS2_Count
+PyUnicodeUCS2_EncodeDecimal
+PyUnicodeUCS2_Translate
+PyUnicodeUCS2_TranslateCharmap
+PyUnicodeUCS2_AsCharmapString
+PyUnicodeUCS2_EncodeCharmap
+PyUnicodeUCS2_DecodeCharmap
+PyUnicodeUCS2_AsASCIIString
+PyUnicodeUCS2_EncodeASCII
+PyUnicodeUCS2_DecodeASCII
+PyUnicodeUCS2_AsLatin1String
+PyUnicodeUCS2_EncodeLatin1
+PyUnicodeUCS2_DecodeLatin1
+PyUnicodeUCS2_AsRawUnicodeEscapeString
+PyUnicodeUCS2_EncodeRawUnicodeEscape
+PyUnicodeUCS2_DecodeRawUnicodeEscape
+PyUnicodeUCS2_AsUnicodeEscapeString
+PyUnicodeUCS2_EncodeUnicodeEscape
+PyUnicodeUCS2_DecodeUnicodeEscape
+PyUnicodeUCS2_AsUTF16String
+PyUnicodeUCS2_EncodeUTF16
+PyUnicodeUCS2_DecodeUTF16
+PyUnicodeUCS2_AsUTF8String
+PyUnicodeUCS2_EncodeUTF8
+PyUnicodeUCS2_DecodeUTF8
+PyUnicodeUCS2_SetDefaultEncoding
+PyUnicodeUCS2_GetDefaultEncoding
+PyUnicodeUCS2_GetSize
+PyUnicodeUCS2_AsUnicode
+_PyUnicodeUCS2_AsDefaultEncodedString
+PyUnicodeUCS2_AsEncodedString
+PyUnicodeUCS2_Encode
+PyUnicodeUCS2_Decode
+PyUnicodeUCS2_FromEncodedObject
+PyUnicodeUCS2_FromObject
+PyUnicodeUCS2_AsWideChar
+PyUnicodeUCS2_FromWideChar
+PyUnicodeUCS2_FromUnicode
+PyUnicodeUCS2_Resize
+PyUnicodeUCS2_GetMax
 initthread
 PyThread_up_sema
 PyThread_down_sema
@@ -868,8 +1001,8 @@ PyExc_UserWarning
 PyExc_DeprecationWarning
 PyExc_SyntaxWarning
 PyExc_RuntimeWarning
-fini_exceptions
-init_exceptions
+_PyExc_Fini
+_PyExc_Init
 initNav
 AEDesc_chain
 AEDesc_Type
@@ -902,86 +1035,18 @@ 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
+PyOS_vsnprintf
+PyOS_snprintf
+proxytype
+wrappertype
+PyWrapper_New
+PyDictProxy_New
+proxy_str
+PyDescr_IsData
+PyDescr_NewWrapper
+PyDescr_NewGetSet
+PyDescr_NewMember
+PyDescr_NewMethod
 GUSISetupConsoleStdio
 GUSIStdioFlush
 GUSIStdioClose
diff --git a/Mac/Build/PythonCoreCarbon.exp b/Mac/Build/PythonCoreCarbon.exp
index 4d33682..adaf913 100644
--- a/Mac/Build/PythonCoreCarbon.exp
+++ b/Mac/Build/PythonCoreCarbon.exp
@@ -25,15 +25,20 @@ Instance__15GUSISIOUXSocketFv		# GUSISIOUXSocket::Instance()
 Py_FileSystemDefaultEncoding
 _PyBuiltin_Init
 _PyEval_SliceIndex
+PyEval_GetFuncDesc
+PyEval_GetFuncName
 PyEval_CallObjectWithKeywords
 PyEval_CallObject
 Py_FlushLine
-PyEval_GetNestedScopes
+PyEval_MergeCompilerFlags
 PyEval_GetRestricted
 PyEval_GetFrame
 PyEval_GetGlobals
 PyEval_GetLocals
 PyEval_GetBuiltins
+PyEval_SetTrace
+PyEval_SetProfile
+PyEval_EvalCodeEx
 PyEval_EvalCode
 Py_SetRecursionLimit
 Py_GetRecursionLimit
@@ -141,6 +146,7 @@ Py_VerboseFlag
 Py_InteractiveFlag
 Py_NoSiteFlag
 Py_FrozenFlag
+Py_IgnoreEnvironmentFlag
 _PyThread_Started
 Py_UnicodeFlag
 PyOS_setsig
@@ -150,7 +156,9 @@ Py_Exit
 Py_AtExit
 Py_FatalError
 PyParser_SimpleParseString
+PyParser_SimpleParseStringFlags
 PyParser_SimpleParseFile
+PyParser_SimpleParseFileFlags
 Py_SymtableString
 Py_CompileStringFlags
 Py_CompileString
@@ -185,6 +193,10 @@ Py_Finalize
 Py_Initialize
 Py_IsInitialized
 _PyThreadState_Current
+PyThreadState_Next
+PyInterpreterState_ThreadHead
+PyInterpreterState_Next
+PyInterpreterState_Head
 PyThreadState_GetDict
 PyThreadState_Swap
 PyThreadState_Get
@@ -224,6 +236,7 @@ PyObject_IsSubclass
 PyObject_IsInstance
 PyObject_CallMethod
 PyObject_CallFunction
+PyObject_Call
 PyObject_CallObject
 PyMapping_HasKey
 PyMapping_HasKeyString
@@ -298,13 +311,10 @@ PyClass_Type
 PyInstance_Type
 PyMethod_Type
 PyMethod_Fini
-PyMethod_Class
-PyMethod_Self
-PyMethod_Function
 PyMethod_New
-PyInstance_New
 PyInstance_NewRaw
 PyClass_IsSubclass
+PyInstance_New
 PyClass_New
 PyCObject_Type
 PyCObject_Import
@@ -334,6 +344,7 @@ PyDict_Values
 PyDict_Keys
 PyDict_Size
 PyDict_Copy
+PyDict_Update
 PyDict_Next
 PyDict_Clear
 PyDict_DelItem
@@ -367,6 +378,10 @@ PyFrame_BlockPop
 PyFrame_BlockSetup
 PyFrame_New
 PyFunction_Type
+PyClassMethod_Type
+PyStaticMethod_Type
+PyStaticMethod_New
+PyClassMethod_New
 PyFunction_SetClosure
 PyFunction_GetClosure
 PyFunction_SetDefaults
@@ -401,6 +416,8 @@ PyLong_FromString
 PyLong_AsVoidPtr
 PyLong_FromVoidPtr
 PyLong_AsDouble
+_PyLong_AsByteArray
+_PyLong_FromByteArray
 PyLong_AsUnsignedLong
 PyLong_AsLong
 PyLong_FromDouble
@@ -415,6 +432,7 @@ PyCFunction_GetFlags
 PyCFunction_GetSelf
 PyCFunction_GetFunction
 PyCFunction_New
+module_members
 PyModule_Type
 _PyModule_Clear
 PyModule_GetFilename
@@ -443,6 +461,9 @@ PyNumber_Coerce
 PyNumber_CoerceEx
 PyObject_Not
 PyObject_IsTrue
+PyObject_GenericSetAttr
+PyObject_GenericGetAttr
+_PyObject_GetDictPtr
 PyObject_SetAttr
 PyObject_HasAttr
 PyObject_GetAttr
@@ -483,6 +504,8 @@ _PyString_FormatLong
 _PyString_Resize
 PyString_ConcatAndDel
 PyString_Concat
+_PyString_Join
+_PyString_Eq
 PyString_AsStringAndSize
 PyString_AsString
 PyString_Size
@@ -502,7 +525,14 @@ PyTuple_SetItem
 PyTuple_GetItem
 PyTuple_Size
 PyTuple_New
+type_getsets
 PyType_Type
+PyBaseObject_Type
+PyType_InitDict
+_PyType_Lookup
+PyType_IsSubtype
+PyType_GenericNew
+PyType_GenericAlloc
 PyGrammar_RemoveAccelerators
 PyGrammar_AddAccelerators
 PyGrammar_LabelRepr
@@ -519,7 +549,9 @@ PyParser_AddToken
 PyParser_Delete
 PyParser_New
 Py_TabcheckFlag
+PyParser_ParseFileFlags
 PyParser_ParseFile
+PyParser_ParseStringFlags
 PyParser_ParseString
 _PyParser_TokenNames
 PyTokenizer_Get
@@ -559,7 +591,13 @@ initrgbimg
 initrotor
 initselect
 gethostbyname_lock
+inet_ntop
+inet_pton
 init_socket
+getnameinfo
+getaddrinfo
+freeaddrinfo
+gai_strerror
 initstrop
 initstruct
 inittime
@@ -570,7 +608,6 @@ open_doc_upp
 open_app_upp
 not_upp
 PyMac_GetArgv
-PyMac_GetFullPath
 PyMac_init_process_location
 strdup
 Py_GetCompiler
@@ -583,6 +620,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 +721,6 @@ PyMac_BuildPoint
 PyMac_GetPoint
 PyMac_BuildRect
 PyMac_GetRect
-PyMac_BuildFSSpec
-PyMac_GetFSSpec
 PyMac_BuildOptStr255
 PyMac_BuildStr255
 PyMac_GetStr255
@@ -624,6 +751,7 @@ Pstring
 PyMac_StopGUSISpin
 RotateCursor
 SpinCursor
+PyMac_GetFullPath
 PyMac_getscript
 PyMac_AppRefNum
 PyMac_options
@@ -650,8 +778,12 @@ macstat
 sync
 initgestalt
 initmacfs
+PyMac_BuildFSSpec
+PyMac_BuildFSRef
+PyMac_GetFSRef
+newmfsrobject
 newmfssobject
-mfs_GetFSSpecFSSpec
+PyMac_GetFSSpec
 initmac
 initMacOS
 Pcre_Type
@@ -685,9 +817,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 +848,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
@@ -743,73 +875,74 @@ PyCodec_Encoder
 _PyCodec_Lookup
 PyCodec_Register
 _PyUnicode_TypeRecords
-_PyUnicode_IsAlpha
-_PyUnicode_ToLowercase
-_PyUnicode_ToUppercase
-_PyUnicode_IsUppercase
-_PyUnicode_IsLowercase
-_PyUnicode_IsWhitespace
-_PyUnicode_IsNumeric
-_PyUnicode_ToNumeric
-_PyUnicode_IsDigit
-_PyUnicode_ToDigit
-_PyUnicode_IsDecimalDigit
-_PyUnicode_ToDecimalDigit
-_PyUnicode_IsTitlecase
-_PyUnicode_ToTitlecase
-_PyUnicode_IsLinebreak
+_PyUnicodeUCS2_IsAlpha
+_PyUnicodeUCS2_ToLowercase
+_PyUnicodeUCS2_ToUppercase
+_PyUnicodeUCS2_IsUppercase
+_PyUnicodeUCS2_IsLowercase
+_PyUnicodeUCS2_IsWhitespace
+_PyUnicodeUCS2_IsNumeric
+_PyUnicodeUCS2_ToNumeric
+_PyUnicodeUCS2_IsDigit
+_PyUnicodeUCS2_ToDigit
+_PyUnicodeUCS2_IsDecimalDigit
+_PyUnicodeUCS2_ToDecimalDigit
+_PyUnicodeUCS2_IsTitlecase
+_PyUnicodeUCS2_ToTitlecase
+_PyUnicodeUCS2_IsLinebreak
 PyUnicode_Type
-_PyUnicode_Fini
-_PyUnicode_Init
-PyUnicode_Format
-PyUnicode_Split
-PyUnicode_Replace
-PyUnicode_Concat
-PyUnicode_Contains
-PyUnicode_Compare
-PyUnicode_Splitlines
-PyUnicode_Join
-PyUnicode_Tailmatch
-PyUnicode_Find
-PyUnicode_Count
-PyUnicode_EncodeDecimal
-PyUnicode_Translate
-PyUnicode_TranslateCharmap
-PyUnicode_AsCharmapString
-PyUnicode_EncodeCharmap
-PyUnicode_DecodeCharmap
-PyUnicode_AsASCIIString
-PyUnicode_EncodeASCII
-PyUnicode_DecodeASCII
-PyUnicode_AsLatin1String
-PyUnicode_EncodeLatin1
-PyUnicode_DecodeLatin1
-PyUnicode_AsRawUnicodeEscapeString
-PyUnicode_EncodeRawUnicodeEscape
-PyUnicode_DecodeRawUnicodeEscape
-PyUnicode_AsUnicodeEscapeString
-PyUnicode_EncodeUnicodeEscape
-PyUnicode_DecodeUnicodeEscape
-PyUnicode_AsUTF16String
-PyUnicode_EncodeUTF16
-PyUnicode_DecodeUTF16
-PyUnicode_AsUTF8String
-PyUnicode_EncodeUTF8
-PyUnicode_DecodeUTF8
-PyUnicode_SetDefaultEncoding
-PyUnicode_GetDefaultEncoding
-PyUnicode_GetSize
-PyUnicode_AsUnicode
-_PyUnicode_AsDefaultEncodedString
-PyUnicode_AsEncodedString
-PyUnicode_Encode
-PyUnicode_Decode
-PyUnicode_FromEncodedObject
-PyUnicode_FromObject
-PyUnicode_AsWideChar
-PyUnicode_FromWideChar
-PyUnicode_FromUnicode
-PyUnicode_Resize
+_PyUnicodeUCS2_Fini
+_PyUnicodeUCS2_Init
+PyUnicodeUCS2_Format
+PyUnicodeUCS2_Split
+PyUnicodeUCS2_Replace
+PyUnicodeUCS2_Concat
+PyUnicodeUCS2_Contains
+PyUnicodeUCS2_Compare
+PyUnicodeUCS2_Splitlines
+PyUnicodeUCS2_Join
+PyUnicodeUCS2_Tailmatch
+PyUnicodeUCS2_Find
+PyUnicodeUCS2_Count
+PyUnicodeUCS2_EncodeDecimal
+PyUnicodeUCS2_Translate
+PyUnicodeUCS2_TranslateCharmap
+PyUnicodeUCS2_AsCharmapString
+PyUnicodeUCS2_EncodeCharmap
+PyUnicodeUCS2_DecodeCharmap
+PyUnicodeUCS2_AsASCIIString
+PyUnicodeUCS2_EncodeASCII
+PyUnicodeUCS2_DecodeASCII
+PyUnicodeUCS2_AsLatin1String
+PyUnicodeUCS2_EncodeLatin1
+PyUnicodeUCS2_DecodeLatin1
+PyUnicodeUCS2_AsRawUnicodeEscapeString
+PyUnicodeUCS2_EncodeRawUnicodeEscape
+PyUnicodeUCS2_DecodeRawUnicodeEscape
+PyUnicodeUCS2_AsUnicodeEscapeString
+PyUnicodeUCS2_EncodeUnicodeEscape
+PyUnicodeUCS2_DecodeUnicodeEscape
+PyUnicodeUCS2_AsUTF16String
+PyUnicodeUCS2_EncodeUTF16
+PyUnicodeUCS2_DecodeUTF16
+PyUnicodeUCS2_AsUTF8String
+PyUnicodeUCS2_EncodeUTF8
+PyUnicodeUCS2_DecodeUTF8
+PyUnicodeUCS2_SetDefaultEncoding
+PyUnicodeUCS2_GetDefaultEncoding
+PyUnicodeUCS2_GetSize
+PyUnicodeUCS2_AsUnicode
+_PyUnicodeUCS2_AsDefaultEncodedString
+PyUnicodeUCS2_AsEncodedString
+PyUnicodeUCS2_Encode
+PyUnicodeUCS2_Decode
+PyUnicodeUCS2_FromEncodedObject
+PyUnicodeUCS2_FromObject
+PyUnicodeUCS2_AsWideChar
+PyUnicodeUCS2_FromWideChar
+PyUnicodeUCS2_FromUnicode
+PyUnicodeUCS2_Resize
+PyUnicodeUCS2_GetMax
 initthread
 PyThread_up_sema
 PyThread_down_sema
@@ -861,8 +994,8 @@ PyExc_UserWarning
 PyExc_DeprecationWarning
 PyExc_SyntaxWarning
 PyExc_RuntimeWarning
-fini_exceptions
-init_exceptions
+_PyExc_Fini
+_PyExc_Init
 initNav
 AEDesc_chain
 AEDesc_Type
@@ -895,86 +1028,18 @@ 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
+PyOS_vsnprintf
+PyOS_snprintf
+proxytype
+wrappertype
+PyWrapper_New
+PyDictProxy_New
+proxy_str
+PyDescr_IsData
+PyDescr_NewWrapper
+PyDescr_NewGetSet
+PyDescr_NewMember
+PyDescr_NewMethod
 GUSISetupConsoleStdio
 GUSIStdioFlush
 GUSIStdioClose