Bump Cython to 3.2.9, restore py_string aliases

Author: linesight

pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
     "scikit-build-core>=0.9",
-    "cython>=3.2",
+    "cython==3.2.9",
 ]
 build-backend = "scikit_build_core.build"
 

src/browser.pyx

@@ -232,7 +232,7 @@ cdef class PyBrowser:
         if self.imageBuffer:
             free(self.imageBuffer)
 
-    cpdef py_void SetClientCallback(self, object name, object callback):
+    cpdef py_void SetClientCallback(self, py_string name, object callback):
         if not self.allowedClientCallbacks:
             # DisplayHandler
             self.allowedClientCallbacks += [
@@ -290,7 +290,7 @@ cdef class PyBrowser:
             raise Exception("Browser.SetClientHandler() failed: __class__ "
                             "attribute missing")
         cdef dict methods = {}
-        cdef object key
+        cdef py_string key
         cdef object method
         cdef tuple value
         for value in inspect.getmembers(clientHandler,
@@ -300,7 +300,7 @@ cdef class PyBrowser:
             if key and key[0] != '_':
                 self.SetClientCallback(key, method)
 
-    cpdef object GetClientCallback(self, object name):
+    cpdef object GetClientCallback(self, py_string name):
         if name in self.clientCallbacks:
             return self.clientCallbacks[name]
 
@@ -346,7 +346,7 @@ cdef class PyBrowser:
             NonCriticalError("GetImage not implemented on this platform")
             return None
 
-    cpdef object GetSetting(self, object key):
+    cpdef object GetSetting(self, py_string key):
         cdef int browser_id = self.GetIdentifier()
         if browser_id in g_browser_settings:
             if key in g_browser_settings[browser_id]:
@@ -357,7 +357,7 @@ cdef class PyBrowser:
     # CEF API.
     # --------------
 
-    cpdef py_void AddWordToDictionary(self, object word):
+    cpdef py_void AddWordToDictionary(self, py_string word):
         cdef CefString cef_word
         PyToCefString(word, cef_word)
         self.GetCefBrowserHost().get().AddWordToDictionary(cef_word)
@@ -410,13 +410,11 @@ cdef class PyBrowser:
     def ExecuteFunction(self, *args):
         self.GetMainFrame().ExecuteFunction(*args)
 
-    cpdef py_void ExecuteJavascript(self, object jsCode,
-            object scriptUrl=None, int startLine=1):
-        if scriptUrl is None:
-            scriptUrl = u""
+    cpdef py_void ExecuteJavascript(self, py_string jsCode,
+            py_string scriptUrl="", int startLine=1):
         self.GetMainFrame().ExecuteJavascript(jsCode, scriptUrl, startLine)
 
-    cpdef py_void Find(self, object searchText,
+    cpdef py_void Find(self, py_string searchText,
                        py_bool forward, py_bool matchCase,
                        py_bool findNext):
         cdef CefString cefSearchText
@@ -429,14 +427,14 @@ cdef class PyBrowser:
                 "Browser.GetFocusedFrame() may only be called on UI thread")
         return GetPyFrame(self.GetCefBrowser().get().GetFocusedFrame())
 
-    cpdef PyFrame GetFrameByName(self, object name):
+    cpdef PyFrame GetFrameByName(self, py_string 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, object identifier):
+    cpdef object GetFrameByIdentifier(self, py_string identifier):
         cdef CefString cefIdentifier
         PyToCefString(identifier, cefIdentifier)
         return GetPyFrame(self.GetCefBrowser().get().GetFrameByIdentifier(
@@ -483,7 +481,7 @@ cdef class PyBrowser:
         else:
             return self.GetWindowHandle()
 
-    cpdef object GetUrl(self):
+    cpdef py_string GetUrl(self):
         return self.GetMainFrame().GetUrl()
 
     cpdef object GetUserData(self, object key):
@@ -526,10 +524,10 @@ cdef class PyBrowser:
     cpdef py_bool IsWindowRenderingDisabled(self):
         return self.GetCefBrowserHost().get().IsWindowRenderingDisabled()
 
-    cpdef object LoadUrl(self, object url):
+    cpdef py_string LoadUrl(self, py_string url):
         self.GetMainFrame().LoadUrl(url)
 
-    cpdef py_void Navigate(self, object url):
+    cpdef py_void Navigate(self, py_string url):
         self.LoadUrl(url)
 
     cpdef py_void NotifyMoveOrResizeStarted(self):
@@ -544,7 +542,7 @@ cdef class PyBrowser:
     cpdef py_void ReloadIgnoreCache(self):
         self.GetCefBrowser().get().ReloadIgnoreCache()
 
-    cpdef py_void ReplaceMisspelling(self, object word):
+    cpdef py_void ReplaceMisspelling(self, py_string word):
         cdef CefString cef_word
         PyToCefString(word, cef_word)
         self.GetCefBrowserHost().get().ReplaceMisspelling(cef_word)
@@ -740,7 +738,7 @@ cdef class PyBrowser:
     cpdef py_void SendCaptureLostEvent(self):
         self.GetCefBrowserHost().get().SendCaptureLostEvent()
 
-    cpdef py_void StartDownload(self, object url):
+    cpdef py_void StartDownload(self, py_string url):
         self.GetCefBrowserHost().get().StartDownload(PyToCefStringValue(
                 url))
 

src/cefpython.pyx

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

src/command_line.pyx

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

src/cookie.pyx

@@ -90,7 +90,7 @@ cdef class Cookie:
             "priority": self.GetPriority(),
         }
 
-    cpdef py_void SetName(self, object name):
+    cpdef py_void SetName(self, py_string name):
         # This works:
         # | CefString(&self.cefCookie.name).FromString(name)
         # This does not work:
@@ -114,7 +114,7 @@ cdef class Cookie:
         cefString.Attach(&self.cefCookie.name, False)
         return CefToPyString(cefString)
 
-    cpdef py_void SetValue(self, object value):
+    cpdef py_void SetValue(self, py_string value):
         cdef CefString cefString
         cefString.Attach(&self.cefCookie.value, False)
         PyToCefString(value, cefString)
@@ -124,7 +124,7 @@ cdef class Cookie:
         cefString.Attach(&self.cefCookie.value, False)
         return CefToPyString(cefString)
 
-    cpdef py_void SetDomain(self, object domain):
+    cpdef py_void SetDomain(self, py_string domain):
         cdef CefString cefString
         cefString.Attach(&self.cefCookie.domain, False)
         PyToCefString(domain, cefString)
@@ -134,7 +134,7 @@ cdef class Cookie:
         cefString.Attach(&self.cefCookie.domain, False)
         return CefToPyString(cefString)
 
-    cpdef py_void SetPath(self, object path):
+    cpdef py_void SetPath(self, py_string path):
         cdef CefString cefString
         cefString.Attach(&self.cefCookie.path, False)
         PyToCefString(path, cefString)
@@ -239,7 +239,7 @@ cdef class PyCookieManager:
         return self.cefCookieManager.get().VisitAllCookies(
                 cefCookieVisitor)
 
-    cpdef py_bool VisitUrlCookies(self, object url, 
+    cpdef py_bool VisitUrlCookies(self, py_string url,
             py_bool includeHttpOnly, object userCookieVisitor):
         self.ValidateUserCookieVisitor(userCookieVisitor)
         cdef int cookieVisitorId = StoreUserCookieVisitor(userCookieVisitor)
@@ -250,14 +250,14 @@ cdef class PyCookieManager:
                 PyToCefStringValue(url), bool(includeHttpOnly), 
                 cefCookieVisitor)
 
-    cpdef py_void SetCookie(self, object url, PyCookie cookie):
+    cpdef py_void SetCookie(self, py_string 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, object url, object cookie_name):
+    cpdef py_void DeleteCookies(self, py_string url, py_string cookie_name):
         CefPostTask(TID_IO, CreateTask_DeleteCookies(
                 self.cefCookieManager.get(),
                 PyToCefStringValue(url), PyToCefStringValue(cookie_name),

src/drag_data.pyx

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

src/frame.pyx

@@ -11,10 +11,10 @@ cdef dict g_pyFrames = {}
 # it shouldn't be kept global anymore.
 cdef list g_unreferenced_frames = []  # [str unique identifier, ..]
 
-cdef str GetUniqueFrameId(int browserId, object frameId):
+cdef str GetUniqueFrameId(int browserId, py_string frameId):
     return str(browserId) +"#"+ frameId
 
-cdef PyFrame GetPyFrameById(int browserId, object frameId):
+cdef PyFrame GetPyFrameById(int browserId, py_string frameId):
     cdef str uniqueFrameId = GetUniqueFrameId(browserId, frameId)
     if uniqueFrameId in g_pyFrames:
         return g_pyFrames[uniqueFrameId]
@@ -146,7 +146,7 @@ cdef class PyFrame:
             return self.cefFrame
         raise Exception("PyFrame.GetCefFrame() failed: CefFrame was destroyed")
 
-    def __init__(self, int browserId, object frameId):
+    def __init__(self, int browserId, py_string frameId):
         self.browserId = browserId
         self.frameId = frameId
 
@@ -180,10 +180,8 @@ cdef class PyFrame:
         code += ")"
         self.ExecuteJavascript(code)
 
-    cpdef py_void ExecuteJavascript(self, object jsCode,
-            object scriptUrl=None, int startLine=1):
-        if scriptUrl is None:
-            scriptUrl = u""
+    cpdef py_void ExecuteJavascript(self, py_string jsCode,
+            py_string scriptUrl="", int startLine=1):
         self.GetCefFrame().get().ExecuteJavaScript(PyToCefStringValue(jsCode),
                 PyToCefStringValue(scriptUrl), startLine)
 
@@ -222,7 +220,7 @@ cdef class PyFrame:
     cpdef py_bool IsMain(self):
         return self.GetCefFrame().get().IsMain()
 
-    cpdef py_void LoadUrl(self, object url):
+    cpdef py_void LoadUrl(self, py_string url):
         cdef CefString cefUrl
         PyToCefString(url, cefUrl)
         self.GetCefFrame().get().LoadURL(cefUrl)
@@ -243,7 +241,7 @@ cdef class PyFrame:
         self.GetCefFrame().get().ViewSource()
 
     cpdef py_void SendProcessMessage(self, cef_process_id_t targetProcess,
-            object frameId, object messageName, list pyArguments
+            py_string frameId, py_string messageName, list pyArguments
             ) :
         cdef CefRefPtr[CefProcessMessage] message = \
                 CefProcessMessage_Create(PyToCefStringValue(messageName))