From 9a2daa403988887abeab887a9917e9d1e633c81f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 2 Jun 2020 23:23:14 +0200
Subject: [PATCH] Replace quamash with qasync

Fixes QubesOS/qubes-issues#5873
---
 ci/requirements.txt            | 2 +-
 debian/control                 | 4 ++--
 qubesmanager/tests/__init__.py | 4 ++--
 qubesmanager/utils.py          | 4 ++--
 rpm_spec/qmgr.spec.in          | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ci/requirements.txt b/ci/requirements.txt
index fb71e4f..70b29c1 100644
--- a/ci/requirements.txt
+++ b/ci/requirements.txt
@@ -8,4 +8,4 @@ lxml
 pylint
 sphinx
 PyYAML
-Quamash
+qasync
diff --git a/debian/control b/debian/control
index d5bdd5b..3d827fb 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Depends:
   python3-qubesadmin,
   python3-pyqt5,
   python3-pyinotify,
-  python3-quamash,
+  python3-qasync,
   qubes-desktop-linux-common,
   qubes-artwork,
   pmount,
@@ -32,4 +32,4 @@ Depends:
   ${misc:Depends}
 Conflicts: qubes-core-agent (<< 4.1.9)
 Description: Qubes administrative tools
-  Tools to manage Qubes system using Admin API
\ No newline at end of file
+  Tools to manage Qubes system using Admin API
diff --git a/qubesmanager/tests/__init__.py b/qubesmanager/tests/__init__.py
index 3fb4909..5590f56 100644
--- a/qubesmanager/tests/__init__.py
+++ b/qubesmanager/tests/__init__.py
@@ -1,7 +1,7 @@
 import asyncio
 import sys
 
-import quamash
+import qasync
 from PyQt5 import QtWidgets
 
 qtapp = None
@@ -11,7 +11,7 @@ def init_qtapp():
     global qtapp, loop
     if qtapp is None:
         qtapp = QtWidgets.QApplication(sys.argv)
-        loop = quamash.QEventLoop(qtapp)
+        loop = qasync.QEventLoop(qtapp)
         asyncio.set_event_loop(loop)
     qtapp.processEvents()
     return qtapp, loop
diff --git a/qubesmanager/utils.py b/qubesmanager/utils.py
index 4fe2606..2436e4b 100644
--- a/qubesmanager/utils.py
+++ b/qubesmanager/utils.py
@@ -29,7 +29,7 @@ import traceback
 import asyncio
 from contextlib import suppress
 import sys
-import quamash
+import qasync
 from qubesadmin import events
 
 from PyQt5 import QtWidgets, QtCore, QtGui  # pylint: disable=import-error
@@ -484,7 +484,7 @@ def run_asynchronous(window_class):
 
     qubes_app = qubesadmin.Qubes()
 
-    loop = quamash.QEventLoop(qt_app)
+    loop = qasync.QEventLoop(qt_app)
     asyncio.set_event_loop(loop)
     dispatcher = events.EventsDispatcher(qubes_app)
 
diff --git a/rpm_spec/qmgr.spec.in b/rpm_spec/qmgr.spec.in
index a157aba..2a82221 100644
--- a/rpm_spec/qmgr.spec.in
+++ b/rpm_spec/qmgr.spec.in
@@ -11,7 +11,7 @@ Requires:	python%{python3_pkgversion}
 Requires:	python%{python3_pkgversion}-PyQt5
 Requires:	python%{python3_pkgversion}-inotify
 Requires:	python%{python3_pkgversion}-qubesadmin >= 4.1.1
-Requires:	python%{python3_pkgversion}-Quamash
+Requires:	python%{python3_pkgversion}-qasync
 Requires:	qubes-desktop-linux-common >= 4.1.2
 Requires:	qubes-artwork
 Requires:	pmount