projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11308: Fix bytes vs. str problems.
[arvados.git]
/
sdk
/
python
/
arvados
/
events.py
diff --git
a/sdk/python/arvados/events.py
b/sdk/python/arvados/events.py
index cf26f9e8addb7b6e45e2af87a2504947878c7c6c..c58abe52be48730e56edb70d5e5109a0e3847592 100644
(file)
--- 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 arvados
-import config
-import errors
-from retry import RetryLoop
+
from .
import config
+
from .
import errors
+from
.
retry import RetryLoop
import logging
import json
import logging
import json
-import thread
+import
_
thread
import threading
import time
import os
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.")
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():
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()
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):
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()
_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"])]]
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.")
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:
if items["items_available"] > len(items["items"]):
moreitems = True
if not moreitems: