Upgrade Cython 0.29.36 to 3.2.4 for Python 3.13 compatibility

Cython 0.29.36 generates code using CPython internals removed in
Python 3.13 (_PyDict_SetItem_KnownHash, _PyInterpreterState_GetConfig,
_PyLong_AsByteArray), causing CI build failures on Python 3.13+.

- requirements.txt: Cython == 0.29.36 -> == 3.2.4
- cython_setup.py: language_level 2 -> "3str"; remove c_string_type /
  c_string_encoding directives
- All .pyx files: py_string type annotations -> object (Cython 3.x
  rejects string literals assigned to ctypedef object aliases)
- All .pyx files: iteritems() -> items(), basestring -> (str, bytes),
  long -> int (Python 2 builtins removed under language_level=3str)
- cefpython_app.cpp: remove extern "C" forward declarations that
  conflicted with Cython 3.x extern "C++" default in _fixed.h
- build.py: fix_cefpython_api_header_file to write #pragma only to
  _fixed.h so Cython 3.x can overwrite its own output on rebuilds

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: linesight

src/browser.pyx

@@ -232,7 +232,7 @@ cdef class PyBrowser:
         if self.imageBuffer:
             free(self.imageBuffer)
 
-    cpdef py_void SetClientCallback(self, py_string name, object callback):
+    cpdef py_void SetClientCallback(self, object name, object callback):
         if not self.allowedClientCallbacks:
             # DisplayHandler
             self.allowedClientCallbacks += [
@@ -291,7 +291,7 @@ cdef class PyBrowser:
             raise Exception("Browser.SetClientHandler() failed: __class__ "
                             "attribute missing")
         cdef dict methods = {}
-        cdef py_string key
+        cdef object key
         cdef object method
         cdef tuple value
         for value in inspect.getmembers(clientHandler,
@@ -301,7 +301,7 @@ cdef class PyBrowser:
             if key and key[0] != '_':
                 self.SetClientCallback(key, method)
 
-    cpdef object GetClientCallback(self, py_string name):
+    cpdef object GetClientCallback(self, object name):
         if name in self.clientCallbacks:
             return self.clientCallbacks[name]
 
@@ -347,7 +347,7 @@ cdef class PyBrowser:
             NonCriticalError("GetImage not implemented on this platform")
             return None
 
-    cpdef object GetSetting(self, py_string key):
+    cpdef object GetSetting(self, object key):
         cdef int browser_id = self.GetIdentifier()
         if browser_id in g_browser_settings:
             if key in g_browser_settings[browser_id]:
@@ -358,7 +358,7 @@ cdef class PyBrowser:
     # CEF API.
     # --------------
 
-    cpdef py_void AddWordToDictionary(self, py_string word):
+    cpdef py_void AddWordToDictionary(self, object word):
         cdef CefString cef_word
         PyToCefString(word, cef_word)
         self.GetCefBrowserHost().get().AddWordToDictionary(cef_word)
@@ -411,11 +411,13 @@ cdef class PyBrowser:
     def ExecuteFunction(self, *args):
         self.GetMainFrame().ExecuteFunction(*args)
 
-    cpdef py_void ExecuteJavascript(self, py_string jsCode,
-            py_string scriptUrl="", int startLine=1):
+    cpdef py_void ExecuteJavascript(self, object jsCode,
+            object scriptUrl=None, int startLine=1):
+        if scriptUrl is None:
+            scriptUrl = u""
         self.GetMainFrame().ExecuteJavascript(jsCode, scriptUrl, startLine)
 
-    cpdef py_void Find(self, py_string searchText,
+    cpdef py_void Find(self, object searchText,
                        py_bool forward, py_bool matchCase,
                        py_bool findNext):
         cdef CefString cefSearchText
@@ -428,14 +430,14 @@ cdef class PyBrowser:
                 "Browser.GetFocusedFrame() may only be called on UI thread")
         return GetPyFrame(self.GetCefBrowser().get().GetFocusedFrame())
 
-    cpdef PyFrame GetFrameByName(self, py_string name):
+    cpdef PyFrame GetFrameByName(self, object name):
         assert IsThread(TID_UI), (
                 "Browser.GetFrameByName() may only be called on the UI thread")
         cdef CefString cefName
         PyToCefString(name, cefName)
         return GetPyFrame(self.GetCefBrowser().get().GetFrameByName(cefName))
 
-    cpdef object GetFrameByIdentifier(self, py_string identifier):
+    cpdef object GetFrameByIdentifier(self, object identifier):
         cdef CefString cefIdentifier
         PyToCefString(identifier, cefIdentifier)
         return GetPyFrame(self.GetCefBrowser().get().GetFrameByIdentifier(
@@ -482,7 +484,7 @@ cdef class PyBrowser:
         else:
             return self.GetWindowHandle()
 
-    cpdef py_string GetUrl(self):
+    cpdef object GetUrl(self):
         return self.GetMainFrame().GetUrl()
 
     cpdef object GetUserData(self, object key):
@@ -525,10 +527,10 @@ cdef class PyBrowser:
     cpdef py_bool IsWindowRenderingDisabled(self):
         return self.GetCefBrowserHost().get().IsWindowRenderingDisabled()
 
-    cpdef py_string LoadUrl(self, py_string url):
+    cpdef object LoadUrl(self, object url):
         self.GetMainFrame().LoadUrl(url)
 
-    cpdef py_void Navigate(self, py_string url):
+    cpdef py_void Navigate(self, object url):
         self.LoadUrl(url)
 
     cpdef py_void NotifyMoveOrResizeStarted(self):
@@ -543,7 +545,7 @@ cdef class PyBrowser:
     cpdef py_void ReloadIgnoreCache(self):
         self.GetCefBrowser().get().ReloadIgnoreCache()
 
-    cpdef py_void ReplaceMisspelling(self, py_string word):
+    cpdef py_void ReplaceMisspelling(self, object word):
         cdef CefString cef_word
         PyToCefString(word, cef_word)
         self.GetCefBrowserHost().get().ReplaceMisspelling(cef_word)
@@ -739,7 +741,7 @@ cdef class PyBrowser:
     cpdef py_void SendCaptureLostEvent(self):
         self.GetCefBrowserHost().get().SendCaptureLostEvent()
 
-    cpdef py_void StartDownload(self, py_string url):
+    cpdef py_void StartDownload(self, object url):
         self.GetCefBrowserHost().get().StartDownload(PyToCefStringValue(
                 url))
 

src/cefpython.pyx

@@ -403,15 +403,15 @@ cdef public void cefpython_GetDebugOptions(
 cdef public cpp_bool ApplicationSettings_GetBool(const char* key
         ) except * with gil:
     # Called from client_handler/client_handler.cpp for example
-    cdef py_string pyKey = CharToPyString(key)
+    cdef object pyKey = CharToPyString(key)
     if pyKey in g_applicationSettings:
         return bool(g_applicationSettings[pyKey])
     return False
 
 cdef public cpp_bool ApplicationSettings_GetBoolFromDict(const char* key1,
         const char* key2) except * with gil:
-    cdef py_string pyKey1 = CharToPyString(key1)
-    cdef py_string pyKey2 = CharToPyString(key2)
+    cdef object pyKey1 = CharToPyString(key1)
+    cdef object pyKey2 = CharToPyString(key2)
     cdef object dictValue # Yet to be checked whether it is `dict`
     if pyKey1 in g_applicationSettings:
         dictValue = g_applicationSettings[pyKey1]
@@ -423,14 +423,14 @@ cdef public cpp_bool ApplicationSettings_GetBoolFromDict(const char* key1,
 
 cdef public cpp_string ApplicationSettings_GetString(const char* key
         ) except * with gil:
-    cdef py_string pyKey = CharToPyString(key)
+    cdef object pyKey = CharToPyString(key)
     cdef cpp_string cppString
     if pyKey in g_applicationSettings:
         cppString = PyStringToChar(AnyToPyString(g_applicationSettings[pyKey]))
     return cppString
 
 cdef public int CommandLineSwitches_GetInt(const char* key) except * with gil:
-    cdef py_string pyKey = CharToPyString(key)
+    cdef object pyKey = CharToPyString(key)
     if pyKey in g_commandLineSwitches:
         return int(g_commandLineSwitches[pyKey])
     return 0
@@ -1006,7 +1006,7 @@ def SetOsModalLoop(py_bool modalLoop):
     with nogil:
         CefSetOSModalLoop(cefModalLoop)
 
-cpdef py_void SetGlobalClientCallback(py_string name, object callback):
+cpdef py_void SetGlobalClientCallback(object name, object callback):
     global g_globalClientCallbacks
     # Global callbacks are prefixed with "_" in documentation.
     # Accept both with and without a prefix.
@@ -1024,7 +1024,7 @@ cpdef py_void SetGlobalClientHandler(object clientHandler):
         raise Exception("SetGlobalClientHandler() failed: __class__ "
                         "attribute missing")
     cdef dict methods = {}
-    cdef py_string key
+    cdef object key
     cdef object method
     cdef tuple value
     for value in inspect.getmembers(clientHandler,
@@ -1034,14 +1034,14 @@ cpdef py_void SetGlobalClientHandler(object clientHandler):
         if key and key[0:2] != '__':
             SetGlobalClientCallback(key, method)
 
-cpdef object GetGlobalClientCallback(py_string name):
+cpdef object GetGlobalClientCallback(object name):
     global g_globalClientCallbacks
     if name in g_globalClientCallbacks:
         return g_globalClientCallbacks[name]
     else:
         return None
 
-cpdef object GetAppSetting(py_string key):
+cpdef object GetAppSetting(object key):
     global g_applicationSettings
     if key in g_applicationSettings:
         return g_applicationSettings[key]
@@ -1060,7 +1060,7 @@ cpdef dict GetVersion():
         cef_commit_number=__cef_commit_number__,
     )
 
-cpdef LoadCrlSetsFile(py_string path):
+cpdef LoadCrlSetsFile(object path):
     CefLoadCRLSetsFile(PyToCefStringValue(path))
 
 cpdef GetDataUrl(data, mediatype="html"):

src/command_line.pyx

@@ -12,10 +12,10 @@ cdef void AppendSwitchesToCommandLine(
     # 1. App_OnBeforeCommandLineProcessing_BrowserProcess()
     # 2. BrowserProcessHandler_OnRenderProcessThreadCreated()
     cdef PyCommandLine pyCommandLine = CreatePyCommandLine(cefCommandLine)
-    cdef py_string switch
-    cdef py_string value
-    for switch, value in switches.iteritems():
-        if not isinstance(switch, basestring) or switch[0] == '-':
+    cdef object switch
+    cdef object value
+    for switch, value in switches.items():
+        if not isinstance(switch, (str, bytes)) or switch[0] == '-':
             Debug("Invalid command line switch: %s" % switch)
             continue
         if value:
@@ -39,27 +39,27 @@ cdef PyCommandLine CreatePyCommandLine(
 cdef class PyCommandLine:
     cdef CefRefPtr[CefCommandLine] cefCommandLine
 
-    cdef py_void AppendSwitch(self, py_string switch):
+    cdef py_void AppendSwitch(self, object switch):
         cdef CefString cefSwitch
         cefSwitch = PyToCefStringValue(switch)
         self.cefCommandLine.get().AppendSwitch(cefSwitch)
 
-    cdef py_void AppendSwitchWithValue(self, py_string switch, py_string value):
+    cdef py_void AppendSwitchWithValue(self, object switch, object value):
         cdef CefString cefSwitch
         cdef CefString cefValue
         cefSwitch = PyToCefStringValue(switch)
         cefValue = PyToCefStringValue(value)
         self.cefCommandLine.get().AppendSwitchWithValue(cefSwitch, cefValue)
 
-    cdef py_string GetCommandLineString(self):
+    cdef object GetCommandLineString(self):
         return CefToPyString(self.cefCommandLine.get().GetCommandLineString())
 
-    cdef py_bool HasSwitch(self, py_string switch):
+    cdef py_bool HasSwitch(self, object switch):
         cdef CefString cefSwitch
         cefSwitch = PyToCefStringValue(switch)
         return self.cefCommandLine.get().HasSwitch(cefSwitch)
 
-    cdef py_string GetSwitchValue(self, py_string switch):
+    cdef object GetSwitchValue(self, object switch):
         cdef CefString cefValue
         cdef CefString cefSwitch
         cefSwitch = PyToCefStringValue(switch)

src/cookie.pyx

@@ -84,7 +84,7 @@ cdef class Cookie:
             "expires": self.GetExpires(),
         }
 
-    cpdef py_void SetName(self, py_string name):
+    cpdef py_void SetName(self, object name):
         # This works:
         # | CefString(&self.cefCookie.name).FromString(name)
         # This does not work:
@@ -108,7 +108,7 @@ cdef class Cookie:
         cefString.Attach(&self.cefCookie.name, False)
         return CefToPyString(cefString)
 
-    cpdef py_void SetValue(self, py_string value):
+    cpdef py_void SetValue(self, object value):
         cdef CefString cefString
         cefString.Attach(&self.cefCookie.value, False)
         PyToCefString(value, cefString)
@@ -118,7 +118,7 @@ cdef class Cookie:
         cefString.Attach(&self.cefCookie.value, False)
         return CefToPyString(cefString)
 
-    cpdef py_void SetDomain(self, py_string domain):
+    cpdef py_void SetDomain(self, object domain):
         pattern = re.compile(r"^(?:[a-z0-9](?:[a-z0-9-_]{0,61}[a-z0-9])?\.)"
                              r"+[a-z0-9][a-z0-9-_]{0,61}[a-z]$")
         if PY_MAJOR_VERSION == 2:
@@ -144,7 +144,7 @@ cdef class Cookie:
         cefString.Attach(&self.cefCookie.domain, False)
         return CefToPyString(cefString)
 
-    cpdef py_void SetPath(self, py_string path):
+    cpdef py_void SetPath(self, object path):
         cdef CefString cefString
         cefString.Attach(&self.cefCookie.path, False)
         PyToCefString(path, cefString)
@@ -240,7 +240,7 @@ cdef class PyCookieManager:
         return self.cefCookieManager.get().VisitAllCookies(
                 cefCookieVisitor)
 
-    cpdef py_bool VisitUrlCookies(self, py_string url, 
+    cpdef py_bool VisitUrlCookies(self, object url, 
             py_bool includeHttpOnly, object userCookieVisitor):
         self.ValidateUserCookieVisitor(userCookieVisitor)
         cdef int cookieVisitorId = StoreUserCookieVisitor(userCookieVisitor)
@@ -251,14 +251,14 @@ cdef class PyCookieManager:
                 PyToCefStringValue(url), bool(includeHttpOnly), 
                 cefCookieVisitor)
 
-    cpdef py_void SetCookie(self, py_string url, PyCookie cookie):
+    cpdef py_void SetCookie(self, object url, PyCookie cookie):
         assert isinstance(cookie, Cookie), "cookie object is invalid"
         CefPostTask(TID_IO, CreateTask_SetCookie(
                 self.cefCookieManager.get(),
                 PyToCefStringValue(url), cookie.cefCookie,
                 <CefRefPtr[CefSetCookieCallback]?>nullptr))
 
-    cpdef py_void DeleteCookies(self, py_string url, py_string cookie_name):
+    cpdef py_void DeleteCookies(self, object url, object cookie_name):
         CefPostTask(TID_IO, CreateTask_DeleteCookies(
                 self.cefCookieManager.get(),
                 PyToCefStringValue(url), PyToCefStringValue(cookie_name),

src/dpi_aware_win.pyx

@@ -41,7 +41,7 @@ class DpiAware:
         #   modern displays have equal horizontal and vertical resolution.
         default_dpix = 96
         scale = MulDiv(dpix, 100, default_dpix)
-        if isinstance(arg, (int, long)):
+        if isinstance(arg, int):
             v = arg
             new_value = MulDiv(v, scale, 100)
             return new_value

src/drag_data.pyx

@@ -24,16 +24,16 @@ cdef class DragData:
     cpdef py_bool IsFragment(self):
         return self.cef_drag_data.get().IsFragment()
 
-    cpdef py_string GetLinkUrl(self):
+    cpdef object GetLinkUrl(self):
         return CefToPyString(self.cef_drag_data.get().GetLinkURL())
 
-    cpdef py_string GetLinkTitle(self):
+    cpdef object GetLinkTitle(self):
         return CefToPyString(self.cef_drag_data.get().GetLinkTitle())
 
-    cpdef py_string GetFragmentText(self):
+    cpdef object GetFragmentText(self):
         return CefToPyString(self.cef_drag_data.get().GetFragmentText())
 
-    cpdef py_string GetFragmentHtml(self):
+    cpdef object GetFragmentHtml(self):
         return CefToPyString(self.cef_drag_data.get().GetFragmentHtml())
 
     cpdef PyImage GetImage(self):