RepoMirrors
/
syncplay
mirror of https://github.com/Syncplay/syncplay
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade qt5reactor to version 0.5

This commit is contained in:
Alberto Sottile 2019-05-06 17:21:52 +02:00 committed by albertosottile
parent de194d92ca
commit cf35fd73fe
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
syncplay/vendor/qt5reactor.py vendored
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright (c) 2001-2017 # Copyright (c) 2001-2018
# Allen Short # Allen Short
# Andy Gayton # Andy Gayton
# Andrew Bennetts # Andrew Bennetts
@ -113,7 +113,6 @@ from twisted.internet.interfaces import IReactorFDSet
from twisted.python import log, runtime from twisted.python import log, runtime
from zope.interface import implementer from zope.interface import implementer
class TwistedSocketNotifier(QObject): class TwistedSocketNotifier(QObject):
"""Connection between an fd event and reader/writer callbacks.""" """Connection between an fd event and reader/writer callbacks."""
@ -123,7 +122,7 @@ class TwistedSocketNotifier(QObject):
QObject.__init__(self, parent) QObject.__init__(self, parent)
self.reactor = reactor self.reactor = reactor
self.watcher = watcher self.watcher = watcher
fd = self.watcher.fileno() fd = watcher.fileno()
self.notifier = QSocketNotifier(fd, socketType, parent) self.notifier = QSocketNotifier(fd, socketType, parent)
self.notifier.setEnabled(True) self.notifier.setEnabled(True)
if socketType == QSocketNotifier.Read: if socketType == QSocketNotifier.Read:
@ -251,10 +250,10 @@ class QtReactor(posixbase.PosixReactorBase):
return self._removeAll(self._reads, self._writes) return self._removeAll(self._reads, self._writes)
def getReaders(self): def getReaders(self):
return list(self._reads.keys()) return self._reads.keys()
def getWriters(self): def getWriters(self):
return list(self._writes.keys()) return self._writes.keys()
def callLater(self, howlong, *args, **kargs): def callLater(self, howlong, *args, **kargs):
rval = super(QtReactor, self).callLater(howlong, *args, **kargs) rval = super(QtReactor, self).callLater(howlong, *args, **kargs)
@ -286,13 +285,10 @@ class QtReactor(posixbase.PosixReactorBase):
delay = max(delay, 1) delay = max(delay, 1)
if not fromqt: if not fromqt:
self.qApp.processEvents(QEventLoop.AllEvents, delay * 1000) self.qApp.processEvents(QEventLoop.AllEvents, delay * 1000)
t = self.timeout() timeout = self.timeout()
if t is None: if timeout is not None:
timeout = 0.01 self._timer.setInterval(timeout * 1000)
else: self._timer.start()
timeout = min(t, 0.01)
self._timer.setInterval(timeout * 1000)
self._timer.start()
def runReturn(self, installSignalHandlers=True): def runReturn(self, installSignalHandlers=True):
self.startRunning(installSignalHandlers=installSignalHandlers) self.startRunning(installSignalHandlers=installSignalHandlers)
@ -337,7 +333,7 @@ class QtEventReactor(QtReactor):
del self._events[event] del self._events[event]
def doEvents(self): def doEvents(self):
handles = list(self._events.keys()) handles = self._events.keys()
if len(handles) > 0: if len(handles) > 0:
val = None val = None
while val != WAIT_TIMEOUT: while val != WAIT_TIMEOUT: