Skip to content

Commit a2b11ba

Browse files
committed
Merge pull request #3 from ska-sa/katcp-compat
Update for katcp thread daemonization API changes
2 parents 6a6821f + 3718442 commit a2b11ba

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/katcp_fpga.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,15 @@ def connect(self, timeout=1):
6363
:return:
6464
"""
6565
if not self.is_connected():
66-
self.start(daemon=True)
66+
# Implement backward / forwards compabitlity for change in daemonization APIs
67+
# in upstream katcp package.
68+
try:
69+
# New style
70+
self.setDaemon(True)
71+
self.start()
72+
except AttributeError:
73+
# Old style
74+
self.start(daemon=True)
6775
self.wait_connected(timeout)
6876
if not self.is_connected():
6977
raise RuntimeError('Could not connect to KATCP server %s' % self.host)
@@ -474,4 +482,4 @@ def unhandled_inform(self, msg):
474482
if self.unhandled_inform_handler is not None:
475483
self.unhandled_inform_handler(msg)
476484

477-
# end
485+
# end

0 commit comments

Comments
 (0)