Merge pull request #78 from CabbageDevelopment/dev

Merging lastest dev changes to master

Author: hosaka

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-20.04, windows-latest]
         python: ["3.6", "3.7", "3.8", "3.9"]
         qt:
           - package: PyQt5
@@ -20,8 +20,10 @@ jobs:
             qt_api: "pyside2"
           - package: PySide6
             qt_api: "pyside6"
-        # exclude:
-        #   - {os: windows-latest, qt: {package: PySide2}}
+        exclude:
+          - os: windows-latest
+            python: "3.6"
+            qt: { package: PyQt6, qt_api: "pyqt6" }
 
     steps:
       - name: Checkout
@@ -43,13 +45,13 @@ jobs:
           pipenv run --python ${{ matrix.python }} pip install ${{ matrix.qt.package }} pytest
 
       - name: Install Libxcb dependencies
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-20.04'
         run: |
           sudo apt-get update
           sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev
 
       - name: Run headless test
-        uses: GabrielBB/xvfb-action@v1.6
+        uses: coactions/setup-xvfb@v1
         env:
           QT_API: ${{ matrix.qt.qt_api }}
         with:

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
 # Black formats the Python code.
 -   repo: https://github.com/psf/black
-    rev: stable
+    rev: 23.3.0
     hooks:
     - id: black
       language_version: python3

README.md

@@ -1,6 +1,6 @@
 # qasync
 
-[![Maintenance](https://img.shields.io/maintenance/yes/2022)](https://pypi.org/project/qasync)
+[![Maintenance](https://img.shields.io/maintenance/yes/2023)](https://pypi.org/project/qasync)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/qasync)](https://pypi.org/project/qasync)
 [![PyPI - License](https://img.shields.io/pypi/l/qasync)](/LICENSE)
 [![PyPI](https://img.shields.io/pypi/v/qasync)](https://pypi.org/project/qasync)

qasync/__init__.py

@@ -23,6 +23,7 @@
 import contextlib
 import functools
 import importlib
+import inspect
 import itertools
 import logging
 import os
@@ -373,6 +374,7 @@ def run_forever(self):
 
         try:
             self.__log_debug("Starting Qt event loop")
+            asyncio.events._set_running_loop(self)
             rslt = -1
             try:
                 rslt = self.__app.exec_()
@@ -381,6 +383,7 @@ def run_forever(self):
             self.__log_debug("Qt event loop ended with result %s", rslt)
             return rslt
         finally:
+            asyncio.events._set_running_loop(None)
             self._after_run_forever()
             self.__is_running = False
 
@@ -785,8 +788,25 @@ def outer_decorator(fn):
         @Slot(*args, **kwargs)
         @functools.wraps(fn)
         def wrapper(*args, **kwargs):
-            task = asyncio.ensure_future(fn(*args, **kwargs))
-            task.add_done_callback(_error_handler)
+            # Qt ignores trailing args from a signal but python does
+            # not so inspect the slot signature and if it's not
+            # callable try removing args until it is.
+            task = None
+            while len(args):
+                try:
+                    inspect.signature(fn).bind(*args, **kwargs)
+                except TypeError:
+                    if len(args):
+                        # Only convert args to a list if we need to pop()
+                        args = list(args)
+                        args.pop()
+                        continue
+                else:
+                    task = asyncio.ensure_future(fn(*args, **kwargs))
+                    task.add_done_callback(_error_handler)
+                    break
+            if task is None:
+                raise TypeError("asyncSlot was not callable from Signal. Potential signature mismatch.")
             return task
 
         return wrapper

tests/test_qeventloop.py

@@ -221,6 +221,28 @@ def test_loop_not_running(loop):
     assert not loop.is_running()
 
 
+def test_get_running_loop_fails_after_completion(loop):
+    """Verify that after loop stops, asyncio._get_running_loop() correctly returns None."""
+
+    async def is_running_loop():
+        nonlocal loop
+        assert asyncio._get_running_loop() == loop
+
+    loop.run_until_complete(is_running_loop())
+    assert asyncio._get_running_loop() is None
+
+
+def test_loop_can_run_twice(loop):
+    """Verify that loop is correctly reset as asyncio._get_running_loop() when restarted."""
+
+    async def is_running_loop():
+        nonlocal loop
+        assert asyncio._get_running_loop() == loop
+
+    loop.run_until_complete(is_running_loop())
+    loop.run_until_complete(is_running_loop())
+
+
 def test_can_function_as_context_manager(application):
     """Verify that a QEventLoop can function as its own context manager."""
     with qasync.QEventLoop(application) as loop: