Update int range detection for Python 3 (cztomczak#603)

bryan-koroleski-fivestars · cztomczak · web-flow · commit 054ff3ca5210 · 2021-02-14T17:09:52.000+01:00
* Update int range detection for Python 3

Python 3 unified ints and longs into a single int type. The long type
is still available in Cython as an alias to int.

* Update javascript_bindings.pyx

* Update process_message_utils.pyx

Co-authored-by: Czarek Tomczak &lt;cztomczak@users.noreply.github.com&gt;
diff --git a/Authors b/Authors
@@ -19,3 +19,4 @@ Contributors:
     Dónal McMullan <https://github.com/donalm>
     nobodyguy <https://github.com/nobodyguy>
     Elliot Woods <https://github.com/elliotwoods>
+    Bryan Koroleski <https://github.com/bryan-koroleski-fivestars>
diff --git a/src/javascript_bindings.pyx b/src/javascript_bindings.pyx
@@ -140,6 +140,8 @@ cdef class JavascriptBindings:
             return True
         elif valueType == int:
             return True
+        elif valueType == long:
+            return True
         elif valueType == type(None):
             return True
         elif IsFunctionOrMethod(valueType):
diff --git a/src/process_message_utils.pyx b/src/process_message_utils.pyx
@@ -238,14 +238,9 @@ cdef CefRefPtr[CefListValue] PyListToCefListValue(
             ret.get().SetNull(index)
         elif valueType == bool:
             ret.get().SetBool(index, bool(value))
-        elif valueType == int:
-            ret.get().SetInt(index, int(value))
-        elif valueType == long:
-            # Int32 range is -2147483648..2147483647, we've increased the
-            # minimum size by one as Cython was throwing a warning:
-            # "unary minus operator applied to unsigned type, result still
-            # unsigned".
-            if -2147483647 <= value <= 2147483647:
+        elif valueType == int or valueType == long:  # In Py3 int and long types are the same type.
+            # Int32 range is -2147483648..2147483647
+            if INT_MIN <= value <= INT_MAX:
                 ret.get().SetInt(index, int(value))
             else:
                 # Long values become strings.
@@ -297,14 +292,9 @@ cdef void PyListToExistingCefListValue(
             cefListValue.get().SetNull(index)
         elif valueType == bool:
             cefListValue.get().SetBool(index, bool(value))
-        elif valueType == int:
-            cefListValue.get().SetInt(index, int(value))
-        elif valueType == long:
-            # Int32 range is -2147483648..2147483647, we've increased the
-            # minimum size by one as Cython was throwing a warning:
-            # "unary minus operator applied to unsigned type, result still
-            # unsigned".
-            if -2147483647 <= value <= 2147483647:
+        elif valueType == int or valueType == long:  # In Py3 int and long types are the same type.
+            # Int32 range is -2147483648..2147483647
+            if INT_MIN <= value <= INT_MAX:
                 cefListValue.get().SetInt(index, int(value))
             else:
                 # Long values become strings.
@@ -357,14 +347,9 @@ cdef CefRefPtr[CefDictionaryValue] PyDictToCefDictionaryValue(
             ret.get().SetNull(cefKey)
         elif valueType == bool:
             ret.get().SetBool(cefKey, bool(value))
-        elif valueType == int:
-            ret.get().SetInt(cefKey, int(value))
-        elif valueType == long:
-            # Int32 range is -2147483648..2147483647, we've increased the
-            # minimum size by one as Cython was throwing a warning:
-            # "unary minus operator applied to unsigned type, result still
-            # unsigned".
-            if -2147483647 <= value <= 2147483647:
+        elif valueType == int or valueType == long:  # In Py3 int and long types are the same type.
+            # Int32 range is -2147483648..2147483647
+            if INT_MIN <= value <= INT_MAX:
                 ret.get().SetInt(cefKey, int(value))
             else:
                 # Long values become strings.
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
@@ -470,6 +470,9 @@ def compile_time_constants():
         # A way around Python 3.2 bug: UNAME_SYSNAME is not set
         contents += 'DEF UNAME_SYSNAME = "%s"\n' % platform.uname()[0]
         contents += 'DEF PY_MAJOR_VERSION = %s\n' % sys.version_info.major
+        contents += 'cdef extern from "limits.h":\n'
+        contents += '    cdef int INT_MIN\n'
+        contents += '    cdef int INT_MAX\n'
         fo.write(contents.encode("utf-8"))
 
 
