Fixed builtin function scheduling on PyPY

agronholm · Nov 11, 2023 · db9b7e8 · db9b7e8
1 parent 1ecb343
commit db9b7e8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/apscheduler/_schedulers/async_.py b/src/apscheduler/_schedulers/async_.py
@@ -397,7 +397,11 @@ async def add_schedule(
         if ismethod(func_or_task_id):
             args = (func_or_task_id.__self__,) + args
             func_or_task_id = func_or_task_id.__func__
-        elif isbuiltin(func_or_task_id) and hasattr(func_or_task_id, "__self__"):
+        elif (
+            isbuiltin(func_or_task_id)
+            and func_or_task_id.__self__ is not None
+            and not ismodule(func_or_task_id.__self__)
+        ):
             args = (func_or_task_id.__self__,) + args
             method_class = type(func_or_task_id.__self__)
             func_or_task_id = getattr(method_class, func_or_task_id.__name__)
@@ -505,7 +509,11 @@ async def add_job(
         if ismethod(func_or_task_id):
             args = (func_or_task_id.__self__,) + args
             func_or_task_id = func_or_task_id.__func__
-        elif isbuiltin(func_or_task_id) and not ismodule(func_or_task_id.__self__):
+        elif (
+            isbuiltin(func_or_task_id)
+            and func_or_task_id.__self__ is not None
+            and not ismodule(func_or_task_id.__self__)
+        ):
             args = (func_or_task_id.__self__,) + args
             method_class = type(func_or_task_id.__self__)
             func_or_task_id = getattr(method_class, func_or_task_id.__name__)

diff --git a/tests/test_schedulers.py b/tests/test_schedulers.py
@@ -862,6 +862,10 @@ def test_uwsgi_threads_error(self, monkeypatch: MonkeyPatch) -> None:
         ):
             Scheduler().start_in_background()
 
+    @pytest.mark.skipif(
+        platform.python_implementation() != "CPython",
+        reason="May not work on other Python implementations",
+    )
     def test_uwsgi_threads_error_subprocess(self) -> None:
         prefix = ".exe" if platform.platform() == "Windows" else ""
         uwsgi_path = Path(sysconfig.get_path("scripts")) / f"uwsgi{prefix}"