Merge branch '2.1' into 2.2

Author: bitprophet

.circleci/config.yml

@@ -65,7 +65,7 @@ workflows:
           requires: ["Test"]
           matrix:
             parameters:
-              version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+              version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
       - orb/docs:
           name: "Docs"
           requires: ["Test"]

invoke/terminals.py

@@ -87,17 +87,18 @@ def _pty_size() -> Tuple[Optional[int], Optional[int]]:
         # Sentinel values to be replaced w/ defaults by caller
         size = (None, None)
         # 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!
-        buf = struct.pack(fmt, 0, 0)
+        buf = 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, termios.TIOCGWINSZ, buf)
             # Unpack buffer back into Python data types
             # NOTE: this unpack gives us rows x cols, but we return the
             # inverse.
-            rows, cols = struct.unpack(fmt, result)
+            rows, cols, *_ = struct.unpack(fmt, result)
             return (cols, rows)
         # Fallback to emptyish return value in various failure cases:
         # * sys.stdout being monkeypatched, such as in testing, and lacking

sites/www/changelog.rst

@@ -2,6 +2,15 @@
 Changelog
 =========
 
+- :bug:`1038` (fixed in :issue:`1040`) Python 3.14 tweaked the behavior of
+  `fcntl` to raise `SystemError` on buffer overflows, which our interpretation
+  of `termios.TIOCGWINSZ` technically was (we care only about the first two
+  fields in what is technically a four-field struct with half the fields
+  unused). This has been fixed by unpacking all 4 fields and then discarding
+  the unused fields during processing.
+
+  Thanks to ``@kasium`` for the original bug report and to ``@rathann`` and
+  ``@BradleyKirton`` for workshopping the patch into its final shape.
 - :release:`2.2.0 <2023-07-12>`
 - :feature:`-` Remove the somewhat inaccurate subclass requirement around
   `~invoke.config.Config`'s ``.clone(into=...)`` constructor call. It was