Skip to content

Account for Python 3.14 returning BlockingIOError instead of TypeError #31

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

Merged
makermelissa merged 2 commits into from
Dec 15, 2025
Merged

Account for Python 3.14 returning BlockingIOError instead of TypeError #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91ad8d3
Python 3.14 returns BlockingIOError instead of TypeError for read_stream
makermelissa Nov 19, 2025
3d7ee14
Fix check for PiTop OS
makermelissa Nov 19, 2025
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
10 changes: 5 additions & 5 deletions adafruit_shell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def read_stream(output):
fcntl.fcntl(file_descriptor, fcntl.F_SETFL, file_flags | os.O_NONBLOCK)
try:
return output.read()
except TypeError:
except (TypeError, BlockingIOError):
return ""

# Allow running as a different user if we are root
Expand Down Expand Up @@ -640,11 +640,11 @@ def get_os(self):
release = opsys
if release == "Debian" and os.path.exists("/etc/rpi-issue"):
release = "Raspbian"
if os.path.isdir(os.path.expanduser("~/.kano-settings")) or os.path.isdir(
os.path.expanduser("~/.kanoprofile")
):
if self.isdir("/etc/pi-top") or self.isdir("~/.config/pi-top"):
release = "PiTop"
if self.isdir("~/.kano-settings") or self.isdir("~/.kanoprofile"):
release = "Kano"
if os.path.isdir(os.path.expanduser("~/.config/ubuntu-mate")):
if self.isdir("~/.config/ubuntu-mate"):
release = "Mate"
if platform.system() == "Darwin":
release = "Darwin"
Expand Down