gh-36339: fix expect interface for newer ptyprocess

    
This will close #32147

ptyprocess 0.5.2+ included a change that broke our expect.py on macOS

Here we guard a bit more around thrown errors, and this appears to
suffice
    
URL: #36339
Reported by: Dima Pasechnik
Reviewer(s): Dima Pasechnik, Gonzalo Tornaría, Matthias Köppe

.github/workflows/ci-conda.yml

@@ -105,9 +105,6 @@ jobs:
           echo "::remove-matcher owner=configure-system-package-warning::"
           echo "::remove-matcher owner=configure-system-package-error::"
 
-          # Manually install ptyprocess for now, until https://github.com/sagemath/sage/issues/32147 is fixed
-          pip install --no-build-isolation -v -v ptyprocess==0.5.1
-
       - name: Build
         shell: bash -l {0}
         run: |

build/pkgs/ptyprocess/checksums.ini

@@ -1,5 +1,5 @@
 tarball=ptyprocess-VERSION.tar.gz
-sha1=3290062d67ef8a2f136bff9c2cd106673ff21316
-md5=94e537122914cc9ec9c1eadcd36e73a1
-cksum=1748633415
+sha1=2d8830d1025c8e33149c7723c2f283122f9488c1
+md5=9da200c397cb1752209a6b718b6cfc68
+cksum=2094263560
 upstream_url=https://pypi.io/packages/source/p/ptyprocess/ptyprocess-VERSION.tar.gz

build/pkgs/ptyprocess/install-requires.txt

@@ -1,3 +1 @@
-ptyprocess ==0.5.1
-# https://github.com/sagemath/sage/issues/31280#comment:42 and following
-# sagelib is not compatible with ptyprocess 0.5.2, 0.6, and 0.7
+ptyprocess > 0.5

build/pkgs/ptyprocess/package-version.txt

@@ -1 +1 @@
-0.5.1.p0
+0.7.0

src/sage/interfaces/expect.py

@@ -561,7 +561,7 @@ def _close(self, force=True):
         try:
             if self._expect is not None:
                 self._expect.close(force=force)
-        except ExceptionPexpect:
+        except (ExceptionPexpect, OSError):
             self._expect.ptyproc.fd = -1
             self._expect.ptyproc.closed = True
             self._expect.child_fd = -1