From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 4 Feb 2011 19:09:02 +0000 (+0000)
Subject: Issue #11118: Fix bogus export of None in python3.dll.
X-Git-Tag: v3.2rc3~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d77520a426769a2d255433750822040830554658;p=python

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 44a71d8145..5df056d827 100644
--- 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 582e433c10..b8f483ce3c 100644
--- a/PC/python3.def
+++ b/PC/python3.def
@@ -681,7 +681,7 @@ EXPORTS
   _Py_Dealloc=python32._Py_Dealloc
   _Py_EllipsisObject=python32._Py_EllipsisObject DATA
   _Py_FalseStruct=python32._Py_FalseStruct DATA
-  _Py_NoneStruct=python32.Py_GetCopyright
+  _Py_NoneStruct=python32._Py_NoneStruct DATA
   _Py_NotImplementedStruct=python32._Py_NotImplementedStruct DATA
   _Py_SwappedOp=python32._Py_SwappedOp DATA
   _Py_TrueStruct=python32._Py_TrueStruct DATA
diff --git a/PC/python32stub.def b/PC/python32stub.def
index ad1967caee..e5850c0dcb 100644
--- a/PC/python32stub.def
+++ b/PC/python32stub.def
@@ -10,13 +10,6 @@ PyArg_ValidateKeywordArguments
 PyBaseObject_Type
 PyBool_FromLong
 PyBool_Type
-PyBuffer_FillContiguousStrides
-PyBuffer_FillInfo
-PyBuffer_FromContiguous
-PyBuffer_GetPointer
-PyBuffer_IsContiguous
-PyBuffer_Release
-PyBuffer_ToContiguous
 PyByteArrayIter_Type
 PyByteArray_AsString
 PyByteArray_Concat
@@ -317,7 +310,6 @@ PyMem_Free
 PyMem_Malloc
 PyMem_Realloc
 PyMemberDescr_Type
-PyMemoryView_FromBuffer
 PyMemoryView_FromObject
 PyMemoryView_GetContiguous
 PyMemoryView_Type
@@ -399,7 +391,6 @@ PyObject_CallMethodObjArgs
 PyObject_CallObject
 PyObject_CheckReadBuffer
 PyObject_ClearWeakRefs
-PyObject_CopyData
 PyObject_DelItem
 PyObject_DelItemString
 PyObject_Dir
@@ -412,7 +403,6 @@ PyObject_GenericGetAttr
 PyObject_GenericSetAttr
 PyObject_GetAttr
 PyObject_GetAttrString
-PyObject_GetBuffer
 PyObject_GetItem
 PyObject_GetIter
 PyObject_HasAttr
@@ -691,7 +681,7 @@ _Py_CheckRecursiveCall
 _Py_Dealloc
 _Py_EllipsisObject
 _Py_FalseStruct
-Py_GetCopyright
+_Py_NoneStruct
 _Py_NotImplementedStruct
 _Py_SwappedOp
 _Py_TrueStruct