Skip to content

Add encoding & errors parameters to fileinput#5558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srittau merged 3 commits into from
May 31, 2021
Merged

Add encoding & errors parameters to fileinput #5558

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81bea27
Add encoding & errors params to fileinput
lancelote May 31, 2021
5e3df7f
Use PEP 604 instead of Optional
lancelote May 31, 2021
c99d084
Mark keyword-only `hook_compressed()` params
lancelote May 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 36 additions & 5 deletions stdlib/fileinput.pyi
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
import sys
from _typeshed import StrOrBytesPath
from typing import IO, Any, AnyStr, Callable, Generic, Iterable, Iterator, Optional, Union
from typing import IO, Any, AnyStr, Callable, Generic, Iterable, Iterator, Union

if sys.version_info >= (3, 8):
if sys.version_info >= (3, 10):
def input(
files: Union[StrOrBytesPath, Iterable[StrOrBytesPath], None] = ...,
inplace: bool = ...,
backup: str = ...,
*,
mode: str = ...,
openhook: Callable[[StrOrBytesPath, str], IO[AnyStr]] = ...,
encoding: str | None = ...,
errors: str | None = ...,
) -> FileInput[AnyStr]: ...

elif sys.version_info >= (3, 8):
def input(
files: Union[StrOrBytesPath, Iterable[StrOrBytesPath], None] = ...,
inplace: bool = ...,
Expand DownExpand Up@@ -32,7 +44,19 @@ def isfirstline() -> bool: ...
def isstdin() -> bool: ...

class FileInput(Iterable[AnyStr], Generic[AnyStr]):
if sys.version_info >= (3, 8):
if sys.version_info >= (3, 10):
def __init__(
self,
files: Union[None, StrOrBytesPath, Iterable[StrOrBytesPath]] = ...,
inplace: bool = ...,
backup: str = ...,
*,
mode: str = ...,
openhook: Callable[[StrOrBytesPath, str], IO[AnyStr]] = ...,
encoding: str | None = ...,
errors: str | None = ...,
) -> None: ...
elif sys.version_info >= (3, 8):
def __init__(
self,
files: Union[None, StrOrBytesPath, Iterable[StrOrBytesPath]] = ...,
Expand DownExpand Up@@ -68,5 +92,12 @@ class FileInput(Iterable[AnyStr], Generic[AnyStr]):
def isfirstline(self) -> bool: ...
def isstdin(self) -> bool: ...

def hook_compressed(filename: StrOrBytesPath, mode: str) -> IO[Any]: ...
def hook_encoded(encoding: str, errors: Optional[str] = ...) -> Callable[[StrOrBytesPath, str], IO[Any]]: ...
if sys.version_info >= (3, 10):
def hook_compressed(
filename: StrOrBytesPath, mode: str, *, encoding: str | None = ..., errors: str | None = ...
) -> IO[Any]: ...

else:
def hook_compressed(filename: StrOrBytesPath, mode: str) -> IO[Any]: ...

def hook_encoded(encoding: str, errors: str | None = ...) -> Callable[[StrOrBytesPath, str], IO[Any]]: ...