Skip to content

Make type of 'env' more flexible #1091

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
JelleZijlstra merged 1 commit into from
Mar 24, 2017
Merged

Make type of 'env' more flexible #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions stdlib/2/subprocess.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ from typing import Sequence, Any, AnyStr, Mapping, Callable, Tuple, IO, Union, O
_FILE = Union[int, IO[Any]]
_TXT = Union[bytes, Text]
_CMD = Union[_TXT, Sequence[_TXT]]
_ENV = Union[Mapping[bytes, _TXT], Mapping[Text, _TXT]]

# Same args as Popen.__init__
def call(args: _CMD,
Expand All @@ -19,7 +20,7 @@ def call(args: _CMD,
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...) -> int: ...
Expand All @@ -34,7 +35,7 @@ def check_call(args: _CMD,
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...) -> int: ...
Expand All @@ -49,7 +50,7 @@ def check_output(args: _CMD,
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...) -> bytes: ...
Expand Down Expand Up @@ -87,7 +88,7 @@ class Popen:
close_fds: bool = ...,
shell: bool = ...,
cwd: Optional[_TXT] = ...,
env: Optional[Mapping[_TXT, _TXT]] = ...,
env: Optional[_ENV] = ...,
universal_newlines: bool = ...,
startupinfo: Optional[Any] = ...,
creationflags: int = ...) -> None: ...
Expand Down
23 changes: 12 additions & 11 deletions stdlib/3/subprocess.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ from types import TracebackType
_FILE = Union[int, IO[Any]]
_TXT = Union[bytes, Text]
_CMD = Union[_TXT, Sequence[_TXT]]
_ENV = Union[Mapping[bytes, _TXT], Mapping[Text, _TXT]]

if sys.version_info >= (3, 5):
class CompletedProcess:
Expand Down Expand Up @@ -38,7 +39,7 @@ if sys.version_info >= (3, 5):
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...,
Expand All @@ -62,7 +63,7 @@ if sys.version_info >= (3, 5):
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...,
Expand All @@ -83,7 +84,7 @@ if sys.version_info >= (3, 3):
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...,
Expand All @@ -102,7 +103,7 @@ else:
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...,
Expand All @@ -123,7 +124,7 @@ if sys.version_info >= (3, 3):
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...,
Expand All @@ -142,7 +143,7 @@ else:
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...,
Expand All @@ -161,7 +162,7 @@ if sys.version_info >= (3, 4):
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...,
Expand All @@ -182,7 +183,7 @@ elif sys.version_info >= (3, 3):
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...,
Expand All @@ -202,7 +203,7 @@ else:
close_fds: bool = ...,
shell: bool = ...,
cwd: _TXT = ...,
env: Mapping[_TXT, _TXT] = ...,
env: _ENV = ...,
universal_newlines: bool = ...,
startupinfo: Any = ...,
creationflags: int = ...,
Expand Down Expand Up @@ -258,7 +259,7 @@ class Popen:
close_fds: bool = ...,
shell: bool = ...,
cwd: Optional[_TXT] = ...,
env: Optional[Mapping[_TXT, _TXT]] = ...,
env: Optional[_ENV] = ...,
universal_newlines: bool = ...,
startupinfo: Optional[Any] = ...,
creationflags: int = ...,
Expand All @@ -279,7 +280,7 @@ class Popen:
close_fds: bool = ...,
shell: bool = ...,
cwd: Optional[_TXT] = ...,
env: Optional[Mapping[_TXT, _TXT]] = ...,
env: Optional[_ENV] = ...,
universal_newlines: bool = ...,
startupinfo: Optional[Any] = ...,
creationflags: int = ...,
Expand Down