Fix stubtest errors on macOS / Python 3.11 (#8743)

This commit is contained in:
Alex Waygood
2022-09-15 23:27:42 +01:00
committed by GitHub
parent 5a3595a5d6
commit 20bc8fa4e3
4 changed files with 18 additions and 13 deletions

View File

@@ -607,7 +607,6 @@ def pipe() -> tuple[int, int]: ...
def read(__fd: int, __length: int) -> bytes: ...
if sys.platform != "win32":
# Unix only
def fchmod(fd: int, mode: int) -> None: ...
def fchown(fd: int, uid: int, gid: int) -> None: ...
def fpathconf(__fd: int, __name: str | int) -> int: ...
@@ -624,11 +623,12 @@ if sys.platform != "win32":
def pread(__fd: int, __length: int, __offset: int) -> bytes: ...
def pwrite(__fd: int, __buffer: bytes, __offset: int) -> int: ...
# In CI, stubtest sometimes reports that these are available on MacOS, sometimes not
def preadv(__fd: int, __buffers: SupportsLenAndGetItem[WriteableBuffer], __offset: int, __flags: int = ...) -> int: ...
def pwritev(__fd: int, __buffers: SupportsLenAndGetItem[ReadableBuffer], __offset: int, __flags: int = ...) -> int: ...
if sys.platform != "darwin":
if sys.version_info >= (3, 10):
RWF_APPEND: int # docs say available on 3.7+, stubtest says otherwise
def preadv(__fd: int, __buffers: SupportsLenAndGetItem[WriteableBuffer], __offset: int, __flags: int = ...) -> int: ...
def pwritev(__fd: int, __buffers: SupportsLenAndGetItem[ReadableBuffer], __offset: int, __flags: int = ...) -> int: ...
RWF_DSYNC: int
RWF_SYNC: int
RWF_HIPRI: int

View File

@@ -309,17 +309,10 @@ if sys.platform != "win32":
copy_file_range as copy_file_range,
memfd_create as memfd_create,
)
from os import register_at_fork as register_at_fork
from os import preadv as preadv, pwritev as pwritev, register_at_fork as register_at_fork
if sys.platform != "darwin":
from os import (
RWF_DSYNC as RWF_DSYNC,
RWF_HIPRI as RWF_HIPRI,
RWF_NOWAIT as RWF_NOWAIT,
RWF_SYNC as RWF_SYNC,
preadv as preadv,
pwritev as pwritev,
)
from os import RWF_DSYNC as RWF_DSYNC, RWF_HIPRI as RWF_HIPRI, RWF_NOWAIT as RWF_NOWAIT, RWF_SYNC as RWF_SYNC
# Not same as os.environ or os.environb
# Because of this variable, we can't do "from posix import *" in os/__init__.pyi