bpo-31893: Fix a backporting error in 8cbf4e10. (#4219)

ce518908 · Serhiy Storchaka · GitHub · 87c66e46 · ce518908
Commit ce518908 authored Nov 01, 2017 by Serhiy Storchaka Committed by GitHub Nov 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

Modules/selectmodule.c Modules/selectmodule.c +6 -3

No files found.
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1352,9 +1352,12 @@ kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds)
    if (PyInt_Check(pfd)) {
        self->e.ident = PyInt_AsUnsignedLongMask(pfd);
    }
-    else {
+    else if (PyLong_Check(pfd)) {
-    if (PyInt_Check(pfd) || PyLong_Check(pfd)) {
+#if defined(HAVE_LONG_LONG) && (SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG)
-        self->e.ident = PyLong_AsSize_t(pfd);
+        self->e.ident = PyLong_AsUnsignedLongLongMask(pfd);
+#else
+        self->e.ident = PyLong_AsUnsignedLongMask(pfd);
+#endif
    }
    else {
        self->e.ident = PyObject_AsFileDescriptor(pfd);