Merge pull request #97 from ploxiln/update_ci_py314

ci: add python-3.14 and debian 13 "trixie"
update flake8/pyflakes for newer python
handle TIOCGWINSZ struct correctly

Author: ploxiln

.github/workflows/linux.yml

@@ -28,10 +28,11 @@ jobs:
           - {imgtag: "3.10-bookworm", paramiko: "paramiko-ng==2.9.0"}
           - {imgtag: "3.11-bookworm", paramiko: "paramiko-ng==2.9.0"}
           - {imgtag: "3.12-bookworm", paramiko: "paramiko-ng==2.9.0"}
-          - {imgtag: "3.13-bookworm", paramiko: "paramiko-ng==2.9.0"}
+          - {imgtag: "3.13-trixie",   paramiko: "paramiko-ng==2.9.0"}
+          - {imgtag: "3.14-trixie",   paramiko: "paramiko-ng==2.9.0"}
           - {imgtag: "3.12-bookworm", paramiko: "paramiko==3.3.2"}
           - {imgtag: "3.12-bookworm", paramiko: "paramiko==3.5.1"}
-          - {imgtag: "3.12-bookworm", paramiko: "paramiko==4.0.0"}
+          - {imgtag: "3.13-trixie", paramiko: "paramiko==4.0.0"}
 
     container: "python:${{matrix.imgtag}}"
     steps:

dev-requirements.txt

@@ -6,4 +6,5 @@ https://github.com/ploxiln/fudge/archive/refs/heads/py3.tar.gz#egg=fudge
 # used in some tests
 jinja2 <4.0
 # flake8
-flake8 <6
+flake8==5.0.4; python_version<"3.9"
+flake8==7.3.0; python_version>="3.9"

fabric/utils.py

@@ -285,16 +285,17 @@ def _pty_size():
         import fcntl
         import termios
         # We want two short unsigned integers (rows, cols)
-        fmt = 'HH'
+        # Note: TIOCGWINSZ struct contains 4 unsigned shorts, 2 unused
+        fmt = 'HHHH'
         # Create an empty (zeroed) buffer for ioctl to map onto. Yay for C!
-        buffer = struct.pack(fmt, 0, 0)
+        buffer = struct.pack(fmt, 0, 0, 0, 0)
         # Call TIOCGWINSZ to get window size of stdout, returns our filled
         # buffer
         try:
             result = fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ,
                 buffer)
             # Unpack buffer back into Python data types
-            rows, cols = struct.unpack(fmt, result)
+            rows, cols, _, _ = struct.unpack(fmt, result)
             # Fall back to defaults if TIOCGWINSZ returns unreasonable values
             if rows == 0:
                 rows = default_rows