From eb0a62e1fa1768eda3494dd0acc5a1ca3afd7e33 Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Wed, 4 Apr 2018 16:35:17 -0700 Subject: [PATCH] removals in Python 3.7 Last part of #1965. --- stdlib/2and3/plistlib.pyi | 2 +- stdlib/2and3/tarfile.pyi | 6 +++++- stdlib/3/collections/__init__.pyi | 5 ++++- stdlib/3/os/__init__.pyi | 9 +++++---- stdlib/3/posixpath.pyi | 5 +++-- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/stdlib/2and3/plistlib.pyi b/stdlib/2and3/plistlib.pyi index 6b65496c271d..df8cdb7dba29 100644 --- a/stdlib/2and3/plistlib.pyi +++ b/stdlib/2and3/plistlib.pyi @@ -46,7 +46,7 @@ if sys.version_info < (3,): def readPlistFromString(data: str) -> DictT[str, Any]: ... def writePlistToString(rootObject: Mapping[str, Any]) -> str: ... -if sys.version_info >= (3,): +if sys.version_info < (3, 7): class Dict(dict): def __getattr__(self, attr: str) -> Any: ... def __setattr__(self, attr: str, value: Any) -> None: ... diff --git a/stdlib/2and3/tarfile.pyi b/stdlib/2and3/tarfile.pyi index 22fa951b3f74..02cb5797074d 100644 --- a/stdlib/2and3/tarfile.pyi +++ b/stdlib/2and3/tarfile.pyi @@ -119,7 +119,11 @@ class TarFile(Iterable[TarInfo]): path: _Path = ...) -> None: ... def extractfile(self, member: Union[str, TarInfo]) -> Optional[IO[bytes]]: ... - if sys.version_info >= (3,): + if sys.version_info >= (3, 7): + def add(self, name: str, arcname: Optional[str] = ..., + recursive: bool = ..., *, + filter: Optional[Callable[[TarInfo], Optional[TarInfo]]] = ...) -> None: ... + elif sys.version_info >= (3,): def add(self, name: str, arcname: Optional[str] = ..., recursive: bool = ..., exclude: Optional[Callable[[str], bool]] = ..., *, diff --git a/stdlib/3/collections/__init__.pyi b/stdlib/3/collections/__init__.pyi index 29eed2e3255a..cad3de72834a 100644 --- a/stdlib/3/collections/__init__.pyi +++ b/stdlib/3/collections/__init__.pyi @@ -52,7 +52,10 @@ _VT = TypeVar('_VT') # namedtuple is special-cased in the type checker; the initializer is ignored. -if sys.version_info >= (3, 6): +if sys.version_info >= (3, 7): + def namedtuple(typename: str, field_names: Union[str, Iterable[str]], *, + rename: bool = ..., module: Optional[str] = ...) -> Type[tuple]: ... +elif sys.version_info >= (3, 6): def namedtuple(typename: str, field_names: Union[str, Iterable[str]], *, verbose: bool = ..., rename: bool = ..., module: Optional[str] = ...) -> Type[tuple]: ... else: diff --git a/stdlib/3/os/__init__.pyi b/stdlib/3/os/__init__.pyi index 33686542b8d5..2dc9b5a1f461 100644 --- a/stdlib/3/os/__init__.pyi +++ b/stdlib/3/os/__init__.pyi @@ -471,10 +471,11 @@ if sys.version_info >= (3, 3): follow_symlinks: bool = ...) -> stat_result: ... else: def stat(path: _PathType) -> stat_result: ... -@overload -def stat_float_times() -> bool: ... -@overload -def stat_float_times(__newvalue: bool) -> None: ... +if sys.version_info < (3, 7): + @overload + def stat_float_times() -> bool: ... + @overload + def stat_float_times(__newvalue: bool) -> None: ... def statvfs(path: _FdOrPathType) -> statvfs_result: ... # Unix only if sys.version_info >= (3, 3): def symlink(source: _PathType, link_name: _PathType, diff --git a/stdlib/3/posixpath.pyi b/stdlib/3/posixpath.pyi index 7d8bb0948d92..05e0c2094257 100644 --- a/stdlib/3/posixpath.pyi +++ b/stdlib/3/posixpath.pyi @@ -2,7 +2,7 @@ # Ron Murawski # based on http://docs.python.org/3.2/library/os.path.html - +import sys from typing import Any, List, Tuple, IO # ----- os.path variables ----- @@ -43,4 +43,5 @@ def sameopenfile(fp1: IO[Any], fp2: IO[Any]) -> bool: ... def split(path: str) -> Tuple[str, str]: ... def splitdrive(path: str) -> Tuple[str, str]: ... def splitext(path: str) -> Tuple[str, str]: ... -# def splitunc(path: str) -> Tuple[str, str] : ... # Windows only, deprecated +if sys.version_info < (3, 7) and sys.platform == 'win32': + def splitunc(path: str) -> Tuple[str, str]: ...