X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/17ac6b9f8462d63b1162a96f4c182ccc29217c5c..0e0c1400b57d5de8aa8c18dd4897527f905a4b42:/sdk/python/arvados/events.py diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py index cf26f9e8ad..c58abe52be 100644 --- a/sdk/python/arvados/events.py +++ b/sdk/python/arvados/events.py @@ -1,11 +1,16 @@ +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() +from builtins import str +from builtins import object import arvados -import config -import errors -from retry import RetryLoop +from . import config +from . import errors +from .retry import RetryLoop import logging import json -import thread +import _thread import threading import time import os @@ -115,7 +120,7 @@ class EventClient(object): self.on_event_cb(m) except Exception as e: _logger.exception("Unexpected exception from event callback.") - thread.interrupt_main() + _thread.interrupt_main() def on_closed(self): if not self.is_closed.is_set(): @@ -130,7 +135,7 @@ class EventClient(object): if tries_left == 0: _logger.exception("EventClient thread could not contact websocket server.") self.is_closed.set() - thread.interrupt_main() + _thread.interrupt_main() return def run_forever(self): @@ -225,7 +230,7 @@ class PollClient(threading.Thread): _logger.exception("PollClient thread could not contact API server.") with self._closing_lock: self._closing.set() - thread.interrupt_main() + _thread.interrupt_main() return for i in items["items"]: skip_old_events = [["id", ">", str(i["id"])]] @@ -236,7 +241,7 @@ class PollClient(threading.Thread): self.on_event(i) except Exception as e: _logger.exception("Unexpected exception from event callback.") - thread.interrupt_main() + _thread.interrupt_main() if items["items_available"] > len(items["items"]): moreitems = True if not moreitems: