Skip to content

Fix new 3.14 C API deprecation for _Py_HashPointer #2602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −2
Open

Fix new 3.14 C API deprecation for _Py_HashPointer #2602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions win32/src/PyHANDLE.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,11 @@ Py_hash_t PyHANDLE::hashFunc(PyObject *ob) { return ((PyHANDLE *)ob)->hash(); }
Py_hash_t PyHANDLE::hash(void)
{
// Just use the address.
#if PY_VERSION_HEX >= 0x03130000
return Py_HashPointer(this);
#else
return _Py_HashPointer(this);
#endif
}

int PyHANDLE::print(FILE *fp, int flags)
Expand Down
8 changes: 6 additions & 2 deletions win32/src/PyOVERLAPPED.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ PYWINTYPES_EXPORT PyTypeObject PyOVERLAPPEDType = {
{"Offset", T_ULONG,
OFF(m_overlapped.Offset)}, // @prop integer|Offset|Specifies a file position at which to start the transfer. The
// file position is a byte offset from the start of the file. The calling process sets
// this member before calling the ReadFile�or WriteFile function. This member is
// this member before calling the ReadFile or WriteFile function. This member is
// ignored when reading from or writing to named pipes and communications devices.
{"OffsetHigh", T_ULONG, OFF(m_overlapped.OffsetHigh)}, // @prop integer|OffsetHigh|Specifies the high word of the
// byte offset at which to start the transfer.
Expand All @@ -123,7 +123,7 @@ PYWINTYPES_EXPORT PyTypeObject PyOVERLAPPEDType = {
{"hEvent", T_OBJECT, OFF(obDummy)}, // @prop <o PyHANDLE>|hEvent|Identifies an event set to the signaled state when
// the transfer has been completed. The calling process sets this member before
// calling the <om win32file.ReadFile>, <om win32file.WriteFile>, <om
// win32pipe.ConnectNamedPipe>, or <om win32pipe.TransactNamedPipe>�function.
// win32pipe.ConnectNamedPipe>, or <om win32pipe.TransactNamedPipe> function.
{"Internal", T_OBJECT,
OFF(obDummy)}, // @prop integer|Internal|Reserved for operating system use. (pointer-sized value)
{"InternalHigh", T_OBJECT,
Expand Down Expand Up @@ -251,7 +251,11 @@ int PyOVERLAPPED::setattro(PyObject *self, PyObject *obname, PyObject *v)
/*static*/ Py_hash_t PyOVERLAPPED::hashFunc(PyObject *ob)
{
// Just use the address.
#if PY_VERSION_HEX >= 0x03130000
return Py_HashPointer(ob);
#else
return _Py_HashPointer(ob);
#endif
}

/*static*/ void PyOVERLAPPED::deallocFunc(PyObject *ob) { delete (PyOVERLAPPED *)ob; }