Issue #11118: Fix bogus export of None in python3.dll.

diff --git a/Misc/NEWS b/Misc/NEWS
index 44a71d8145a38358e54ae6374da3d47d367187ea..5df056d827ab994905eede237366d47b7ac4e0a2 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@ What's New in Python 3.2?
 Core and Builtins
 -----------------
 
+- Issue #11118: Fix bogus export of None in python3.dll.
+
 Library
 -------
 

diff --git a/PC/python3.def b/PC/python3.def
index 582e433c1041701a6b8229fd9a0dbebae346ed0b..b8f483ce3cb551e67fad36c0acdd99d4c0d8e5cd 100644 (file)
--- a/PC/python3.def
+++ b/PC/python3.def
@@ -681,7 +681,7 @@ EXPORTS
   _Py_Dealloc=python32._Py_Dealloc\r
   _Py_EllipsisObject=python32._Py_EllipsisObject DATA\r
   _Py_FalseStruct=python32._Py_FalseStruct DATA\r
-  _Py_NoneStruct=python32.Py_GetCopyright\r
+  _Py_NoneStruct=python32._Py_NoneStruct DATA\r
   _Py_NotImplementedStruct=python32._Py_NotImplementedStruct DATA\r
   _Py_SwappedOp=python32._Py_SwappedOp DATA\r
   _Py_TrueStruct=python32._Py_TrueStruct DATA\r

diff --git a/PC/python32stub.def b/PC/python32stub.def
index ad1967caee45f4021a5854de6f1715824c6f583c..e5850c0dcb252299dad9274032a3c1495c53b863 100644 (file)
--- a/PC/python32stub.def
+++ b/PC/python32stub.def
@@ -10,13 +10,6 @@ PyArg_ValidateKeywordArguments
 PyBaseObject_Type\r
 PyBool_FromLong\r
 PyBool_Type\r
-PyBuffer_FillContiguousStrides\r
-PyBuffer_FillInfo\r
-PyBuffer_FromContiguous\r
-PyBuffer_GetPointer\r
-PyBuffer_IsContiguous\r
-PyBuffer_Release\r
-PyBuffer_ToContiguous\r
 PyByteArrayIter_Type\r
 PyByteArray_AsString\r
 PyByteArray_Concat\r
@@ -317,7 +310,6 @@ PyMem_Free
 PyMem_Malloc\r
 PyMem_Realloc\r
 PyMemberDescr_Type\r
-PyMemoryView_FromBuffer\r
 PyMemoryView_FromObject\r
 PyMemoryView_GetContiguous\r
 PyMemoryView_Type\r
@@ -399,7 +391,6 @@ PyObject_CallMethodObjArgs
 PyObject_CallObject\r
 PyObject_CheckReadBuffer\r
 PyObject_ClearWeakRefs\r
-PyObject_CopyData\r
 PyObject_DelItem\r
 PyObject_DelItemString\r
 PyObject_Dir\r
@@ -412,7 +403,6 @@ PyObject_GenericGetAttr
 PyObject_GenericSetAttr\r
 PyObject_GetAttr\r
 PyObject_GetAttrString\r
-PyObject_GetBuffer\r
 PyObject_GetItem\r
 PyObject_GetIter\r
 PyObject_HasAttr\r
@@ -691,7 +681,7 @@ _Py_CheckRecursiveCall
 _Py_Dealloc\r
 _Py_EllipsisObject\r
 _Py_FalseStruct\r
-Py_GetCopyright\r
+_Py_NoneStruct\r
 _Py_NotImplementedStruct\r
 _Py_SwappedOp\r
 _Py_TrueStruct\r