From 55fbb0b990de00e1904dbea9e2566f7d8f9fafac Mon Sep 17 00:00:00 2001 From: Amin Alaee Date: Fri, 22 Sep 2023 12:43:00 +0200 Subject: [PATCH 1/3] Update os.EX_OK --- stdlib/os/__init__.pyi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stdlib/os/__init__.pyi b/stdlib/os/__init__.pyi index 961858ce3c19..f3424b480261 100644 --- a/stdlib/os/__init__.pyi +++ b/stdlib/os/__init__.pyi @@ -252,12 +252,14 @@ environ: _Environ[str] if sys.platform != "win32": environb: _Environ[bytes] +if sys.version_info >= (3, 11) or sys.platform != "win32": + EX_OK: int + if sys.platform != "win32": confstr_names: dict[str, int] pathconf_names: dict[str, int] sysconf_names: dict[str, int] - EX_OK: int EX_USAGE: int EX_DATAERR: int EX_NOINPUT: int From 599d1ccae784f34047e61b584596a30071ad6c78 Mon Sep 17 00:00:00 2001 From: AlexWaygood Date: Fri, 22 Sep 2023 12:37:07 +0100 Subject: [PATCH 2/3] Remove unused allowlist entries --- tests/stubtest_allowlists/win32-py311.txt | 1 - tests/stubtest_allowlists/win32-py312.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/stubtest_allowlists/win32-py311.txt b/tests/stubtest_allowlists/win32-py311.txt index 4721e015dbe8..3e0b0f0237fa 100644 --- a/tests/stubtest_allowlists/win32-py311.txt +++ b/tests/stubtest_allowlists/win32-py311.txt @@ -2,7 +2,6 @@ asyncio.IocpProactor.recvfrom_into asyncio.windows_events.IocpProactor.recvfrom_into msvcrt.GetErrorMode -os.EX_OK # pathlib methods that exist on Windows, but always raise NotImplementedError, # so are omitted from the stub diff --git a/tests/stubtest_allowlists/win32-py312.txt b/tests/stubtest_allowlists/win32-py312.txt index 2012b686baba..7df0faeaa256 100644 --- a/tests/stubtest_allowlists/win32-py312.txt +++ b/tests/stubtest_allowlists/win32-py312.txt @@ -5,7 +5,6 @@ asyncio.windows_events.IocpProactor.finish_socket_func asyncio.windows_events.IocpProactor.recvfrom_into msvcrt.GetErrorMode ntpath.isdir -os.EX_OK os.get_blocking os.listdrives os.listmounts From 23e4f4d26784231aea17328adc99a05e9c40dde8 Mon Sep 17 00:00:00 2001 From: Amin Alaee Date: Fri, 22 Sep 2023 12:43:00 +0200 Subject: [PATCH 3/3] Update os.EX_OK --- stdlib/os/__init__.pyi | 4 +++- tests/stubtest_allowlists/win32-py311.txt | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/stdlib/os/__init__.pyi b/stdlib/os/__init__.pyi index 961858ce3c19..f3424b480261 100644 --- a/stdlib/os/__init__.pyi +++ b/stdlib/os/__init__.pyi @@ -252,12 +252,14 @@ environ: _Environ[str] if sys.platform != "win32": environb: _Environ[bytes] +if sys.version_info >= (3, 11) or sys.platform != "win32": + EX_OK: int + if sys.platform != "win32": confstr_names: dict[str, int] pathconf_names: dict[str, int] sysconf_names: dict[str, int] - EX_OK: int EX_USAGE: int EX_DATAERR: int EX_NOINPUT: int diff --git a/tests/stubtest_allowlists/win32-py311.txt b/tests/stubtest_allowlists/win32-py311.txt index 4721e015dbe8..3e0b0f0237fa 100644 --- a/tests/stubtest_allowlists/win32-py311.txt +++ b/tests/stubtest_allowlists/win32-py311.txt @@ -2,7 +2,6 @@ asyncio.IocpProactor.recvfrom_into asyncio.windows_events.IocpProactor.recvfrom_into msvcrt.GetErrorMode -os.EX_OK # pathlib methods that exist on Windows, but always raise NotImplementedError, # so are omitted from the stub