summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2011-02-04 19:09:02 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2011-02-04 19:09:02 (GMT)
commitd77520a426769a2d255433750822040830554658 (patch)
tree8c45f735e3ba342f1d26f061ea3bbe9becf7c35d
parent4b0c24a3aeb9f58e4fc91b813f90b55df8c5fc0e (diff)
downloadcpython-d77520a426769a2d255433750822040830554658.zip
cpython-d77520a426769a2d255433750822040830554658.tar.gz
cpython-d77520a426769a2d255433750822040830554658.tar.bz2
Issue #11118: Fix bogus export of None in python3.dll.
-rw-r--r--Misc/NEWS2
-rw-r--r--PC/python3.def2
-rw-r--r--PC/python32stub.def12
3 files changed, 4 insertions, 12 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 44a71d8..5df056d 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 582e433..b8f483c 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 ad1967c..e5850c0 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