mirror of
https://github.com/davidhalter/typeshed.git
synced 2025-12-07 04:34:28 +08:00
merge 2 and 3 stubs for fileinput (#1319)
* merge 2 and 3 stubs for fileinput Plus some minor fixes. * pytype doesn't like generic type aliases
This commit is contained in:
committed by
Matthias Kramm
parent
3cfc146223
commit
c930e889ee
@@ -1,46 +0,0 @@
|
||||
from typing import Iterable, Callable, IO, Optional, Union, Iterator
|
||||
|
||||
class FileInput(Iterable[str]):
|
||||
def __init__(
|
||||
self,
|
||||
files: Optional[Union[str, Iterable[str]]] = None,
|
||||
inplace: bool = ...,
|
||||
backup: str = ...,
|
||||
bufsize: int = ...,
|
||||
mode: str = ...,
|
||||
openhook: Callable[[str, str], IO[str]] = ...
|
||||
) -> None: ...
|
||||
|
||||
def __del__(self) -> None: ...
|
||||
def close(self) -> None: ...
|
||||
def __iter__(self) -> Iterator[str]: ...
|
||||
def __getitem__(self, i: Union[int, slice]) -> str: ...
|
||||
def next(self) -> str: ...
|
||||
def nextfile(self) -> None: ...
|
||||
def readline(self) -> str: ...
|
||||
def filename(self) -> Optional[str]: ...
|
||||
def lineno(self) -> int: ...
|
||||
def filelineno(self) -> int: ...
|
||||
def fileno(self) -> int: ...
|
||||
def isfirstline(self) -> bool: ...
|
||||
def isstdin(self) -> bool: ...
|
||||
|
||||
def input(
|
||||
files: Optional[Union[str, Iterable[str]]] = None,
|
||||
inplace: bool = ...,
|
||||
backup: str = ...,
|
||||
bufsize: int = ...,
|
||||
mode: str = ...,
|
||||
openhook: Callable[[str, str], IO[str]] = ...) -> FileInput: ...
|
||||
|
||||
|
||||
def filename() -> Optional[str]: ...
|
||||
def lineno() -> int: ...
|
||||
def filelineno() -> int: ...
|
||||
def isfirstline() -> bool: ...
|
||||
def isstdin() -> bool: ...
|
||||
def nextfile() -> None: ...
|
||||
def close() -> None: ...
|
||||
|
||||
def hook_compressed(filename: str, mode: str) -> IO[str]: ...
|
||||
def hook_encoded(encoding: str) -> Callable[[str, str], IO[str]]: ...
|
||||
@@ -1,22 +1,21 @@
|
||||
from typing import Iterable, Callable, IO, AnyStr, Generic, Any, Union, Iterator, Optional
|
||||
from typing import Iterable, Callable, IO, AnyStr, Generic, Any, Text, Union, Iterator, Optional
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
if sys.version_info >= (3, 6):
|
||||
_Path = Union[str, bytes, os.PathLike[Any]]
|
||||
_Path = Union[Text, bytes, os.PathLike[Any]]
|
||||
else:
|
||||
_Path = Union[str, bytes]
|
||||
_Opener = Callable[[_Path, str], IO[AnyStr]]
|
||||
_Path = Union[Text, bytes]
|
||||
|
||||
|
||||
def input(
|
||||
files: Union[str, Iterable[str]]=None,
|
||||
inplace: bool=...,
|
||||
backup: str=...,
|
||||
bufsize: int=...,
|
||||
mode: str=...,
|
||||
openhook: Callable[[str, str], IO[AnyStr]]=...) -> Iterable[AnyStr]: ...
|
||||
files: Union[_Path, Iterable[_Path], None] = ...,
|
||||
inplace: bool = ...,
|
||||
backup: str = ...,
|
||||
bufsize: int = ...,
|
||||
mode: str = ...,
|
||||
openhook: Callable[[_Path, str], IO[AnyStr]] = ...) -> Iterable[AnyStr]: ...
|
||||
|
||||
|
||||
def close() -> None: ...
|
||||
@@ -34,13 +33,14 @@ class FileInput(Iterable[AnyStr], Generic[AnyStr]):
|
||||
backup: str = ...,
|
||||
bufsize: int = ...,
|
||||
mode: str = ...,
|
||||
openhook: _Opener[AnyStr] = ...
|
||||
openhook: Callable[[_Path, str], IO[AnyStr]] = ...
|
||||
) -> None: ...
|
||||
|
||||
def __del__(self) -> None: ...
|
||||
def close(self) -> None: ...
|
||||
def __enter__(self) -> 'FileInput[AnyStr]': ...
|
||||
def __exit__(self, type: Any, value: Any, traceback: Any) -> None: ...
|
||||
if sys.version_info >= (3, 2):
|
||||
def __enter__(self) -> FileInput[AnyStr]: ...
|
||||
def __exit__(self, type: Any, value: Any, traceback: Any) -> None: ...
|
||||
def __iter__(self) -> Iterator[AnyStr]: ...
|
||||
def __next__(self) -> AnyStr: ...
|
||||
def __getitem__(self, i: int) -> AnyStr: ...
|
||||
@@ -54,4 +54,7 @@ class FileInput(Iterable[AnyStr], Generic[AnyStr]):
|
||||
def isstdin(self) -> bool: ...
|
||||
|
||||
def hook_compressed(filename: _Path, mode: str) -> IO[Any]: ...
|
||||
def hook_encoded(encoding: str, errors: Optional[str] = ...) -> _Opener[Any]: ...
|
||||
if sys.version_info >= (3, 6):
|
||||
def hook_encoded(encoding: str, errors: Optional[str] = ...) -> Callable[[_Path, str], IO[Any]]: ...
|
||||
else:
|
||||
def hook_encoded(encoding: str) -> Callable[[_Path, str], IO[Any]]: ...
|
||||
Reference in New Issue
Block a user