Skip to content

Make python 2 subprocess consistent with python 3 #3132

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.

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
merged 1 commit into from
Jul 19, 2019
Merged
Changes from all commits
Commits
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
19 changes: 12 additions & 7 deletions stdlib/2/subprocess.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

# Based on http://docs.python.org/2/library/subprocess.html and Python 3 stub

from typing import Sequence, Any, Mapping, Callable, Tuple, IO, Union, Optional, List, Text
from typing import (
Sequence, Any, Mapping, Callable, Tuple, IO, Union, Optional, List, Text, TypeVar, Generic,
)

# This is a dummy type variable used to make Popen generic like it is in python 3
_T = TypeVar('_T', bound=bytes)

_FILE = Union[None, int, IO[Any]]
_TXT = Union[bytes, Text]
Expand Down Expand Up @@ -63,17 +68,17 @@ class CalledProcessError(Exception):
# morally: _CMD
cmd: Any
# morally: Optional[bytes]
output: Any
output: bytes

def __init__(self,
returncode: int,
cmd: _CMD,
output: Optional[bytes] = ...) -> None: ...

class Popen:
stdin: Optional[IO[Any]]
stdout: Optional[IO[Any]]
stderr: Optional[IO[Any]]
class Popen(Generic[_T]):
stdin: Optional[IO[bytes]]
stdout: Optional[IO[bytes]]
stderr: Optional[IO[bytes]]
pid = 0
returncode = 0

Expand All @@ -96,7 +101,7 @@ class Popen:
def poll(self) -> int: ...
def wait(self) -> int: ...
# morally: -> Tuple[Optional[bytes], Optional[bytes]]
def communicate(self, input: Optional[_TXT] = ...) -> Tuple[Any, Any]: ...
def communicate(self, input: Optional[_TXT] = ...) -> Tuple[bytes, bytes]: ...
def send_signal(self, signal: int) -> None: ...
def terminate(self) -> None: ...
def kill(self) -> None: ...
Expand Down