From ce51890894be46f8f9d991a1d0ea1455fc41ccdc Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 1 Nov 2017 17:43:07 +0200
Subject: [PATCH] bpo-31893: Fix a backporting error in
 8cbf4e10646c3f5b8f0d274c2d7dea5bb6305f57. (#4219)

---
 Modules/selectmodule.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 6cd32cd8a93..1dec6a120d0 100644
--- 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 {
-    if (PyInt_Check(pfd) || PyLong_Check(pfd)) {
-        self->e.ident = PyLong_AsSize_t(pfd);
+    else if (PyLong_Check(pfd)) {
+#if defined(HAVE_LONG_LONG) && (SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG)
+        self->e.ident = PyLong_AsUnsignedLongLongMask(pfd);
+#else
+        self->e.ident = PyLong_AsUnsignedLongMask(pfd);
+#endif
     }
     else {
         self->e.ident = PyObject_AsFileDescriptor(pfd);