mirror of
https://github.com/davidhalter/typeshed.git
synced 2025-12-07 04:34:28 +08:00
Make type of 'env' more flexible (#1091)
See https://github.com/python/typeshed/pull/1059#issuecomment-289150121
This commit is contained in:
committed by
Jelle Zijlstra
parent
420219f057
commit
fd77dd2e7a
@@ -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,
|
||||
@@ -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: ...
|
||||
@@ -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: ...
|
||||
@@ -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: ...
|
||||
@@ -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: ...
|
||||
|
||||
@@ -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:
|
||||
@@ -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 = ...,
|
||||
@@ -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 = ...,
|
||||
@@ -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 = ...,
|
||||
@@ -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 = ...,
|
||||
@@ -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 = ...,
|
||||
@@ -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 = ...,
|
||||
@@ -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 = ...,
|
||||
@@ -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 = ...,
|
||||
@@ -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 = ...,
|
||||
@@ -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 = ...,
|
||||
@@ -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 = ...,
|
||||
|
||||
Reference in New Issue
Block a user