Skip to content

fix: make timeouterror more compatible with future versions of Python #2991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: make timeouterror more compatible with future versions of Python #2991

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/py/src/transport/TSocket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ def open(self):
def read(self, sz):
try:
buff = self.handle.recv(sz)
except socket.timeout as e:
# TODO: remove socket.timeout when 3.10 becomes the earliest version of python supported.
except (socket.timeout, TimeoutError) as e:
raise TTransportException(type=TTransportException.TIMED_OUT, message="read timeout", inner=e)
except socket.error as e:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

similarly socket.error is also going to be a deprecated alias to OSError so we probably want to do something similar here.

if (e.args[0] == errno.ECONNRESET and
Expand Down