Also check for presence of 'threadCallQueue' in reactor

This commit is contained in:
Erik Johnston 2015-08-18 11:51:08 +01:00
parent d3da63f766
commit 6e7d36a72c

View File

@ -184,7 +184,14 @@ def runUntilCurrentTimer(func):
return f return f
if hasattr(reactor, "runUntilCurrent") and hasattr(reactor, "_newTimedCalls"): try:
# Ensure the reactor has all the attributes we expect
reactor.runUntilCurrent
reactor._newTimedCalls
reactor.threadCallQueue
# runUntilCurrent is called when we have pending calls. It is called once # runUntilCurrent is called when we have pending calls. It is called once
# per iteratation after fd polling. # per iteratation after fd polling.
reactor.runUntilCurrent = runUntilCurrentTimer(reactor.runUntilCurrent) reactor.runUntilCurrent = runUntilCurrentTimer(reactor.runUntilCurrent)
except AttributeError:
pass