Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace quamash with qasync

Browse Source 
Fixes QubesOS/qubes-issues#5873
This commit is contained in:
Marek Marczykowski-Górecki 2020-06-02 23:23:14 +02:00
parent e4be77b75b
commit 9a2daa4039
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/requirements.txt
View File

@ -8,4 +8,4 @@ lxml
pylint pylint
sphinx sphinx
PyYAML PyYAML
Quamash qasync

4
debian/control vendored
View File

@ -22,7 +22,7 @@ Depends:
python3-qubesadmin, python3-qubesadmin,
python3-pyqt5, python3-pyqt5,
python3-pyinotify, python3-pyinotify,
python3-quamash, python3-qasync,
qubes-desktop-linux-common, qubes-desktop-linux-common,
qubes-artwork, qubes-artwork,
pmount, pmount,
@ -32,4 +32,4 @@ Depends:
${misc:Depends} ${misc:Depends}
Conflicts: qubes-core-agent (<< 4.1.9) Conflicts: qubes-core-agent (<< 4.1.9)
Description: Qubes administrative tools Description: Qubes administrative tools
Tools to manage Qubes system using Admin API Tools to manage Qubes system using Admin API

4
qubesmanager/tests/__init__.py
View File

@ -1,7 +1,7 @@
import asyncio import asyncio
import sys import sys
import quamash import qasync
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
qtapp = None qtapp = None
@ -11,7 +11,7 @@ def init_qtapp():
global qtapp, loop global qtapp, loop
if qtapp is None: if qtapp is None:
qtapp = QtWidgets.QApplication(sys.argv) qtapp = QtWidgets.QApplication(sys.argv)
loop = quamash.QEventLoop(qtapp) loop = qasync.QEventLoop(qtapp)
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
qtapp.processEvents() qtapp.processEvents()
return qtapp, loop return qtapp, loop

4
qubesmanager/utils.py
View File

@ -29,7 +29,7 @@ import traceback
import asyncio import asyncio
from contextlib import suppress from contextlib import suppress
import sys import sys
import quamash import qasync
from qubesadmin import events from qubesadmin import events
from PyQt5 import QtWidgets, QtCore, QtGui # pylint: disable=import-error from PyQt5 import QtWidgets, QtCore, QtGui # pylint: disable=import-error
@ -484,7 +484,7 @@ def run_asynchronous(window_class):
qubes_app = qubesadmin.Qubes() qubes_app = qubesadmin.Qubes()
loop = quamash.QEventLoop(qt_app) loop = qasync.QEventLoop(qt_app)
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
dispatcher = events.EventsDispatcher(qubes_app) dispatcher = events.EventsDispatcher(qubes_app)

2
rpm_spec/qmgr.spec.in
View File

@ -11,7 +11,7 @@ Requires: python%{python3_pkgversion}
Requires: python%{python3_pkgversion}-PyQt5 Requires: python%{python3_pkgversion}-PyQt5
Requires: python%{python3_pkgversion}-inotify Requires: python%{python3_pkgversion}-inotify
Requires: python%{python3_pkgversion}-qubesadmin >= 4.1.1 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-desktop-linux-common >= 4.1.2
Requires: qubes-artwork Requires: qubes-artwork
Requires: pmount Requires: pmount