diff --git a/requirements.txt b/requirements.txt index f33a851ad61ff13189369876aa6029646c2680d1..c4379dc46caef502b33db85fe8b273c1058bd20a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ ucoinpy>=0.13 -git+https://github.com/Insoleet/quamash.git@qeventloop +git+https://github.com/harvimt/quamash.git@gh45 asynctest git+https://github.com/networkx/networkx.git@v1.11 \ No newline at end of file diff --git a/src/sakia/main.py b/src/sakia/main.py index 07e123a3564df1677321b198a4197f1bd80d12b0..8058c3324f3d79366edcf76c175031a18bd8ba19 100755 --- a/src/sakia/main.py +++ b/src/sakia/main.py @@ -16,7 +16,7 @@ import jsonschema # To force cx_freeze import import PyQt5.QtSvg -from quamash import QEventLoopSelector +from quamash import QSelectorEventLoop from PyQt5.QtWidgets import QApplication from sakia.gui.mainwindow import MainWindow from sakia.core.app import Application @@ -61,7 +61,7 @@ if __name__ == '__main__': #Â activate ctrl-c interrupt signal.signal(signal.SIGINT, signal.SIG_DFL) sakia = QApplication(sys.argv) - loop = QEventLoopSelector(sakia) + loop = QSelectorEventLoop(sakia) loop.set_exception_handler(async_exception_handler) asyncio.set_event_loop(loop) diff --git a/src/sakia/tests/quamash_utils.py b/src/sakia/tests/quamash_utils.py index a359319d252f0b79c8d054cf6090e3a87195ddbe..7c11293ca4cbacbda7815318d3923c4b91eca84f 100644 --- a/src/sakia/tests/quamash_utils.py +++ b/src/sakia/tests/quamash_utils.py @@ -9,7 +9,7 @@ _application_ = [] class QuamashTest: def setUpQuamash(self): self.qapplication = get_application() - self.lp = quamash.QEventLoopSelector(self.qapplication) + self.lp = quamash.QSelectorEventLoop(self.qapplication) asyncio.set_event_loop(self.lp) self.lp.set_exception_handler(lambda l, c: unitttest_exception_handler(self, l, c)) self.exceptions = []