From 739890471d707a14674b5d1fd43277752d0eed34 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 6 Jun 2022 11:37:39 -0400 Subject: [PATCH] Support newer python that removes fromstring Python 3.9 does not understand the fromstring function anymore. --- confluent_client/confluent/tlvdata.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/confluent_client/confluent/tlvdata.py b/confluent_client/confluent/tlvdata.py index 5c75e376..e0d3d9f4 100644 --- a/confluent_client/confluent/tlvdata.py +++ b/confluent_client/confluent/tlvdata.py @@ -240,8 +240,12 @@ def recv(handle): cdata = cmsgarr[CMSG_LEN(0).value:] data = rawbuffer[:i] if cmsg.cmsg_level == socket.SOL_SOCKET and cmsg.cmsg_type == SCM_RIGHTS: - filehandles.fromstring(bytes( - cdata[:len(cdata) - len(cdata) % filehandles.itemsize])) + try: + filehandles.fromstring(bytes( + cdata[:len(cdata) - len(cdata) % filehandles.itemsize])) + except AttributeError: + filehandles.frombytes(bytes( + cdata[:len(cdata) - len(cdata) % filehandles.itemsize])) data = json.loads(bytes(data)) return ClientFile(data['filename'], data['mode'], filehandles[0]) else: