Skip to content

Commit 9d68b01

Browse files
authored
Merge branch 'main' into fix-ctypes-_endian
2 parents db29e15 + fa0c14f commit 9d68b01

File tree

5 files changed

+12
-18
lines changed

5 files changed

+12
-18
lines changed

stdlib/@tests/stubtest_allowlists/darwin-py313.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,10 @@ fcntl.F_OFD_SETLK
55
fcntl.F_OFD_SETLKW
66
fcntl.F_RDAHEAD
77
fcntl.F_SETNOSIGPIPE
8-
mmap.MAP_HASSEMAPHORE
9-
mmap.MAP_JIT
10-
mmap.MAP_NOCACHE
11-
mmap.MAP_NOEXTEND
12-
mmap.MAP_NORESERVE
13-
mmap.MAP_RESILIENT_CODESIGN
14-
mmap.MAP_RESILIENT_MEDIA
15-
mmap.MAP_TRANSLATED_ALLOW_EXECUTE
16-
mmap.MAP_UNIX03
178
os.grantpt
189
os.posix_openpt
1910
os.ptsname
2011
os.unlockpt
21-
os.waitid
22-
os.waitid_result
2312
posix.grantpt
2413
posix.posix_openpt
2514
posix.ptsname

stdlib/@tests/stubtest_allowlists/py313.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ _thread.interrupt_main
77
_thread.lock
88
_thread.start_joinable_thread
99
_tkinter.create
10-
ctypes.c_char_p.from_param
11-
ctypes.c_void_p.from_param
12-
ctypes.c_wchar_p.from_param
13-
ctypes.wintypes.PCHAR.from_param
14-
ctypes.wintypes.PWCHAR.from_param
1510
doctest.TestResults.__doc__
1611
doctest.TestResults.__new__
1712
filecmp.dircmp.__init__

stdlib/_ctypes.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class _CData(metaclass=_CDataMeta):
7171
@classmethod
7272
def from_address(cls, address: int) -> Self: ...
7373
@classmethod
74-
def from_param(cls, obj: Any) -> Self | _CArgObject: ...
74+
def from_param(cls, value: Any, /) -> Self | _CArgObject: ...
7575
@classmethod
7676
def in_dll(cls, library: CDLL, name: str) -> Self: ...
7777
def __buffer__(self, flags: int, /) -> memoryview: ...

stdlib/mmap.pyi

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,13 @@ if sys.version_info >= (3, 13) and sys.platform != "win32":
118118
MAP_32BIT: Final = 32768
119119

120120
if sys.version_info >= (3, 13) and sys.platform == "darwin":
121+
MAP_NORESERVE: Final = 64
122+
MAP_NOEXTEND: Final = 256
123+
MAP_HASSEMAPHORE: Final = 512
124+
MAP_NOCACHE: Final = 1024
125+
MAP_JIT: Final = 2048
126+
MAP_RESILIENT_CODESIGN: Final = 8192
127+
MAP_RESILIENT_MEDIA: Final = 16384
128+
MAP_TRANSLATED_ALLOW_EXECUTE: Final = 131072
129+
MAP_UNIX03: Final = 262144
121130
MAP_TPRO: Final = 524288

stdlib/os/__init__.pyi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,8 @@ else:
971971
def spawnvp(mode: int, file: StrOrBytesPath, args: _ExecVArgs) -> int: ...
972972
def spawnvpe(mode: int, file: StrOrBytesPath, args: _ExecVArgs, env: _ExecEnv) -> int: ...
973973
def wait() -> tuple[int, int]: ... # Unix only
974-
if sys.platform != "darwin":
974+
# Added to MacOS in 3.13
975+
if sys.platform != "darwin" or sys.version_info >= (3, 13):
975976
@final
976977
class waitid_result(structseq[int], tuple[int, int, int, int, int]):
977978
if sys.version_info >= (3, 10):

0 commit comments

Comments
 (0)