Merge pull request #51 from python-trio/tjstum/subprocess_optional

Mark many subprocess types as Optional
python-trio · Dec 16, 2021 · aed1e7d · aed1e7d
2 parents 9158056 + 449080d
commit aed1e7d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/trio-stubs/__init__.pyi b/trio-stubs/__init__.pyi
@@ -710,8 +710,8 @@ if sys.platform == "win32":
         stderr: _Redirect = ...,
         close_fds: bool = ...,
         shell: bool = ...,
-        cwd: StrOrBytesPath = ...,
-        env: Mapping[str, str] = ...,
+        cwd: Optional[StrOrBytesPath] = ...,
+        env: Optional[Mapping[str, str]] = ...,
         startupinfo: subprocess.STARTUPINFO = ...,
         creationflags: int = ...,
     ) -> Process: ...
@@ -722,13 +722,13 @@ if sys.platform == "win32":
         capture_stdout: bool = ...,
         capture_stderr: bool = ...,
         check: bool = ...,
-        deliver_cancel: Callable[[Process], Awaitable[None]] = ...,
+        deliver_cancel: Optional[Callable[[Process], Awaitable[None]]] = ...,
         stdout: _Redirect = ...,
         stderr: _Redirect = ...,
         close_fds: bool = ...,
         shell: bool = ...,
-        cwd: StrOrBytesPath = ...,
-        env: Mapping[str, str] = ...,
+        cwd: Optional[StrOrBytesPath] = ...,
+        env: Optional[Mapping[str, str]] = ...,
         startupinfo: subprocess.STARTUPINFO = ...,
         creationflags: int = ...,
     ) -> subprocess.CompletedProcess[bytes]: ...
@@ -743,8 +743,8 @@ else:
         stderr: _Redirect = ...,
         close_fds: bool = ...,
         shell: Literal[True],
-        cwd: StrOrBytesPath = ...,
-        env: Mapping[str, str] = ...,
+        cwd: Optional[StrOrBytesPath] = ...,
+        env: Optional[Mapping[str, str]] = ...,
         preexec_fn: Optional[Callable[[], Any]] = ...,
         restore_signals: bool = ...,
         start_new_session: bool = ...,
@@ -759,8 +759,8 @@ else:
         stderr: _Redirect = ...,
         close_fds: bool = ...,
         shell: bool = ...,
-        cwd: StrOrBytesPath = ...,
-        env: Mapping[str, str] = ...,
+        cwd: Optional[StrOrBytesPath] = ...,
+        env: Optional[Mapping[str, str]] = ...,
         preexec_fn: Optional[Callable[[], Any]] = ...,
         restore_signals: bool = ...,
         start_new_session: bool = ...,
@@ -774,13 +774,13 @@ else:
         capture_stdout: bool = ...,
         capture_stderr: bool = ...,
         check: bool = ...,
-        deliver_cancel: Callable[[Process], Awaitable[None]] = ...,
+        deliver_cancel: Optional[Callable[[Process], Awaitable[None]]] = ...,
         stdout: _Redirect = ...,
         stderr: _Redirect = ...,
         close_fds: bool = ...,
         shell: Literal[True],
-        cwd: StrOrBytesPath = ...,
-        env: Mapping[str, str] = ...,
+        cwd: Optional[StrOrBytesPath] = ...,
+        env: Optional[Mapping[str, str]] = ...,
         preexec_fn: Optional[Callable[[], Any]] = ...,
         restore_signals: bool = ...,
         start_new_session: bool = ...,
@@ -794,13 +794,13 @@ else:
         capture_stdout: bool = ...,
         capture_stderr: bool = ...,
         check: bool = ...,
-        deliver_cancel: Callable[[Process], Awaitable[None]] = ...,
+        deliver_cancel: Optional[Callable[[Process], Awaitable[None]]] = ...,
         stdout: _Redirect = ...,
         stderr: _Redirect = ...,
         close_fds: bool = ...,
         shell: bool = ...,
-        cwd: StrOrBytesPath = ...,
-        env: Mapping[str, str] = ...,
+        cwd: Optional[StrOrBytesPath] = ...,
+        env: Optional[Mapping[str, str]] = ...,
         preexec_fn: Optional[Callable[[], Any]] = ...,
         restore_signals: bool = ...,
         start_new_session: bool = ...,

diff --git a/trio_typing/_tests/test-data/trio-basic.test b/trio_typing/_tests/test-data/trio-basic.test
@@ -111,3 +111,9 @@ async def test() -> None:
     await trio.run_process(["cat", Path("/dev/null"), b"/dev/null"])
     await trio.run_process(["cat", Path("/dev/null")], cwd=Path("/"))
     await trio.run_process("cat /dev/null", shell=True)
+
+[case testOptionalCwd]
+import trio
+async def test(_cwd=None) -> None:
+    await trio.run_process(["cat", "dev/null"], cwd="/")
+    await trio.run_process(["cat", "/dev/null"], cwd=_cwd)