From 12cbdcf3377eb9ccbad5c3c495f02d89d009bfd6 Mon Sep 17 00:00:00 2001 From: Shantanu Date: Wed, 5 Feb 2020 07:21:03 -0800 Subject: [PATCH] os: mark positional-only args (#3719) Also remove unnecessary branch for os.urandom --- stdlib/3/os/__init__.pyi | 94 ++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/stdlib/3/os/__init__.pyi b/stdlib/3/os/__init__.pyi index 446812cc2..f65130e6d 100644 --- a/stdlib/3/os/__init__.pyi +++ b/stdlib/3/os/__init__.pyi @@ -322,8 +322,8 @@ def get_exec_path(env: Optional[Mapping[str, str]] = ...) -> List[str]: ... def getlogin() -> str: ... def getpid() -> int: ... def getppid() -> int: ... -def strerror(code: int) -> str: ... -def umask(mask: int) -> int: ... +def strerror(__code: int) -> str: ... +def umask(__mask: int) -> int: ... if sys.platform != 'win32': # Unix only @@ -341,19 +341,19 @@ if sys.platform != 'win32': def getresuid() -> Tuple[int, int, int]: ... def getresgid() -> Tuple[int, int, int]: ... def getuid() -> int: ... - def setegid(egid: int) -> None: ... - def seteuid(euid: int) -> None: ... - def setgid(gid: int) -> None: ... - def setgroups(groups: Sequence[int]) -> None: ... + def setegid(__egid: int) -> None: ... + def seteuid(__euid: int) -> None: ... + def setgid(__gid: int) -> None: ... + def setgroups(__groups: Sequence[int]) -> None: ... def setpgrp() -> None: ... - def setpgid(pid: int, pgrp: int) -> None: ... - def setregid(rgid: int, egid: int) -> None: ... + def setpgid(__pid: int, __pgrp: int) -> None: ... + def setregid(__rgid: int, __egid: int) -> None: ... def setresgid(rgid: int, egid: int, sgid: int) -> None: ... def setresuid(ruid: int, euid: int, suid: int) -> None: ... - def setreuid(ruid: int, euid: int) -> None: ... - def getsid(pid: int) -> int: ... + def setreuid(__ruid: int, __euid: int) -> None: ... + def getsid(__pid: int) -> int: ... def setsid() -> None: ... - def setuid(uid: int) -> None: ... + def setuid(__uid: int) -> None: ... from posix import uname_result def uname() -> uname_result: ... @@ -362,67 +362,67 @@ def getenv(key: Text) -> Optional[str]: ... @overload def getenv(key: Text, default: _T) -> Union[str, _T]: ... def getenvb(key: bytes, default: bytes = ...) -> bytes: ... -def putenv(key: Union[bytes, Text], value: Union[bytes, Text]) -> None: ... -def unsetenv(key: Union[bytes, Text]) -> None: ... +def putenv(__name: Union[bytes, Text], __value: Union[bytes, Text]) -> None: ... +def unsetenv(__name: Union[bytes, Text]) -> None: ... # Return IO or TextIO def fdopen(fd: int, mode: str = ..., buffering: int = ..., encoding: Optional[str] = ..., errors: str = ..., newline: str = ..., closefd: bool = ...) -> Any: ... def close(fd: int) -> None: ... -def closerange(fd_low: int, fd_high: int) -> None: ... +def closerange(__fd_low: int, __fd_high: int) -> None: ... def device_encoding(fd: int) -> Optional[str]: ... -def dup(fd: int) -> int: ... +def dup(__fd: int) -> int: ... if sys.version_info >= (3, 7): def dup2(fd: int, fd2: int, inheritable: bool = ...) -> int: ... else: def dup2(fd: int, fd2: int, inheritable: bool = ...) -> None: ... def fstat(fd: int) -> stat_result: ... def fsync(fd: int) -> None: ... -def lseek(fd: int, pos: int, how: int) -> int: ... +def lseek(__fd: int, __position: int, __how: int) -> int: ... def open(file: _PathType, flags: int, mode: int = ..., *, dir_fd: Optional[int] = ...) -> int: ... def pipe() -> Tuple[int, int]: ... -def read(fd: int, n: int) -> bytes: ... +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 fdatasync(fd: int) -> None: ... # Unix only, not Mac - def fpathconf(fd: int, name: Union[str, int]) -> int: ... - def fstatvfs(fd: int) -> statvfs_result: ... - def ftruncate(fd: int, length: int) -> None: ... - def get_blocking(fd: int) -> bool: ... - def set_blocking(fd: int, blocking: bool) -> None: ... - def isatty(fd: int) -> bool: ... - def lockf(__fd: int, __cmd: int, __length: int) -> None: ... + def fpathconf(__fd: int, __name: Union[str, int]) -> int: ... + def fstatvfs(__fd: int) -> statvfs_result: ... + def ftruncate(__fd: int, __length: int) -> None: ... + def get_blocking(__fd: int) -> bool: ... + def set_blocking(__fd: int, __blocking: bool) -> None: ... + def isatty(__fd: int) -> bool: ... + def lockf(__fd: int, __command: int, __length: int) -> None: ... def openpty() -> Tuple[int, int]: ... # some flavors of Unix def pipe2(flags: int) -> Tuple[int, int]: ... # some flavors of Unix def posix_fallocate(fd: int, offset: int, length: int) -> None: ... def posix_fadvise(fd: int, offset: int, length: int, advice: int) -> None: ... - def pread(fd: int, buffersize: int, offset: int) -> bytes: ... - def pwrite(fd: int, string: bytes, offset: int) -> int: ... + def pread(__fd: int, __length: int, __offset: int) -> bytes: ... + def pwrite(__fd: int, __buffer: bytes, __offset: int) -> int: ... @overload def sendfile(__out_fd: int, __in_fd: int, offset: Optional[int], count: int) -> int: ... @overload def sendfile(__out_fd: int, __in_fd: int, offset: int, count: int, headers: Sequence[bytes] = ..., trailers: Sequence[bytes] = ..., flags: int = ...) -> int: ... # FreeBSD and Mac OS X only - def readv(fd: int, buffers: Sequence[bytearray]) -> int: ... - def writev(fd: int, buffers: Sequence[bytes]) -> int: ... + def readv(__fd: int, __buffers: Sequence[bytearray]) -> int: ... + def writev(__fd: int, __buffers: Sequence[bytes]) -> int: ... class terminal_size(Tuple[int, int]): columns: int lines: int def get_terminal_size(fd: int = ...) -> terminal_size: ... -def get_inheritable(fd: int) -> bool: ... -def set_inheritable(fd: int, inheritable: bool) -> None: ... +def get_inheritable(__fd: int) -> bool: ... +def set_inheritable(__fd: int, __inheritable: bool) -> None: ... if sys.platform != 'win32': # Unix only - def tcgetpgrp(fd: int) -> int: ... - def tcsetpgrp(fd: int, pg: int) -> None: ... - def ttyname(fd: int) -> str: ... -def write(fd: int, string: bytes) -> int: ... + def tcgetpgrp(__fd: int) -> int: ... + def tcsetpgrp(__fd: int, __pgid: int) -> None: ... + def ttyname(__fd: int) -> str: ... +def write(__fd: int, __data: bytes) -> int: ... def access( path: _FdOrPathType, mode: int, @@ -460,9 +460,9 @@ if sys.platform != 'win32': def mkfifo(path: _PathType, mode: int = ..., *, dir_fd: Optional[int] = ...) -> None: ... # Unix only def makedirs(name: _PathType, mode: int = ..., exist_ok: bool = ...) -> None: ... def mknod(path: _PathType, mode: int = ..., device: int = ..., *, dir_fd: Optional[int] = ...) -> None: ... -def major(device: int) -> int: ... -def minor(device: int) -> int: ... -def makedev(major: int, minor: int) -> int: ... +def major(__device: int) -> int: ... +def minor(__device: int) -> int: ... +def makedev(__major: int, __minor: int) -> int: ... if sys.platform != 'win32': def pathconf(path: _FdOrPathType, name: Union[str, int]) -> int: ... # Unix only if sys.version_info >= (3, 6): @@ -574,19 +574,19 @@ def execlpe(file: _PathType, __arg0: Union[bytes, Text], *args: Any) -> NoReturn # The implementation enforces tuple or list so we can't use Sequence. _ExecVArgs = Union[Tuple[Union[bytes, Text], ...], List[bytes], List[Text], List[Union[bytes, Text]]] _ExecEnv = Union[Mapping[bytes, Union[bytes, str]], Mapping[str, Union[bytes, str]]] -def execv(path: _PathType, args: _ExecVArgs) -> NoReturn: ... +def execv(__path: _PathType, __argv: _ExecVArgs) -> NoReturn: ... def execve(path: _FdOrPathType, args: _ExecVArgs, env: _ExecEnv) -> NoReturn: ... def execvp(file: _PathType, args: _ExecVArgs) -> NoReturn: ... def execvpe(file: _PathType, args: _ExecVArgs, env: _ExecEnv) -> NoReturn: ... def _exit(n: int) -> NoReturn: ... -def kill(pid: int, sig: int) -> None: ... +def kill(__pid: int, __signal: int) -> None: ... if sys.platform != 'win32': # Unix only def fork() -> int: ... def forkpty() -> Tuple[int, int]: ... # some flavors of Unix - def killpg(pgid: int, sig: int) -> None: ... - def nice(increment: int) -> int: ... + def killpg(__pgid: int, __signal: int) -> None: ... + def nice(__increment: int) -> int: ... def plock(op: int) -> None: ... # ???op is int? class _wrap_close(_TextIOWrapper): @@ -601,7 +601,7 @@ def spawnve(mode: int, path: _PathType, args: List[Union[bytes, Text]], env: _ExecEnv) -> int: ... def system(command: _PathType) -> int: ... def times() -> times_result: ... -def waitpid(pid: int, options: int) -> Tuple[int, int]: ... +def waitpid(__pid: int, __options: int) -> Tuple[int, int]: ... if sys.platform == 'win32': def startfile(path: _PathType, operation: Optional[str] = ...) -> None: ... @@ -616,7 +616,7 @@ else: def waitid(idtype: int, ident: int, options: int) -> waitid_result: ... def wait3(options: int) -> Tuple[int, int, Any]: ... def wait4(pid: int, options: int) -> Tuple[int, int, Any]: ... - def WCOREDUMP(status: int) -> bool: ... + def WCOREDUMP(__status: int) -> bool: ... def WIFCONTINUED(status: int) -> bool: ... def WIFSTOPPED(status: int) -> bool: ... def WIFSIGNALED(status: int) -> bool: ... @@ -641,14 +641,12 @@ if sys.platform != 'win32': def cpu_count() -> Optional[int]: ... if sys.platform != 'win32': # Unix only - def confstr(name: Union[str, int]) -> Optional[str]: ... + def confstr(__name: Union[str, int]) -> Optional[str]: ... def getloadavg() -> Tuple[float, float, float]: ... - def sysconf(name: Union[str, int]) -> int: ... + def sysconf(__name: Union[str, int]) -> int: ... if sys.version_info >= (3, 6): def getrandom(size: int, flags: int = ...) -> bytes: ... - def urandom(size: int) -> bytes: ... -else: - def urandom(n: int) -> bytes: ... +def urandom(__size: int) -> bytes: ... if sys.version_info >= (3, 7): def register_at_fork(func: Callable[..., object], when: str) -> None: ...