mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 19:25:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-43414: os.get_terminal_size() now uses the actual file descriptor on Windows instead of mapping to standard handles (#93203)

Browse source
This commit is contained in:
Raghunandan Bhat 2022-07-28 18:48:33 -04:00 • committed by GitHub
parent 390847922c
commit edb72047f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/test_os.py
View file

@ -3665,6 +3665,19 @@ class TermsizeTests(unittest.TestCase):
raise
self.assertEqual(expected, actual)
@unittest.skipUnless(sys.platform == 'win32', 'Windows specific test')
def test_windows_fd(self):
"""Check if get_terminal_size() returns a meaningful value in Windows"""
try:
conout = open('conout$', 'w')
except OSError:
self.skipTest('failed to open conout$')
with conout:
size = os.get_terminal_size(conout.fileno())
self.assertGreaterEqual(size.columns, 0)
self.assertGreaterEqual(size.lines, 0)
@unittest.skipUnless(hasattr(os, 'memfd_create'), 'requires os.memfd_create')
@support.requires_linux_version(3, 17)

2
Misc/NEWS.d/next/Windows/2022-05-28-19-36-13.gh-issue-43414.NGMJ3g.rst Normal file
View file

@ -0,0 +1,2 @@
:func:`os.get_terminal_size` now attempts to read the size from any provided
handle, rather than only supporting file descriptors 0, 1 and 2.

17
Modules/posixmodule.c
View file

@ -13247,24 +13247,11 @@ os_get_terminal_size_impl(PyObject *module, int fd)
#ifdef TERMSIZE_USE_CONIO
{
DWORD nhandle;
HANDLE handle;
CONSOLE_SCREEN_BUFFER_INFO csbi;
switch (fd) {
case 0: nhandle = STD_INPUT_HANDLE;
break;
case 1: nhandle = STD_OUTPUT_HANDLE;
break;
case 2: nhandle = STD_ERROR_HANDLE;
break;
default:
return PyErr_Format(PyExc_ValueError, "bad file descriptor");
}
handle = GetStdHandle(nhandle);
if (handle == NULL)
return PyErr_Format(PyExc_OSError, "handle cannot be retrieved");
handle = _Py_get_osfhandle(fd);
if (handle == INVALID_HANDLE_VALUE)
return PyErr_SetFromWindowsErr(0);
return NULL;
if (!GetConsoleScreenBufferInfo(handle, &csbi))
return PyErr_SetFromWindowsErr(0);