reformat

Carreau · Carreau · commit a57c15d9ad17 · 2024-12-17T20:05:38.000+01:00
diff --git a/IPython/utils/_process_common.py b/IPython/utils/_process_common.py
@@ -25,7 +25,7 @@
 # Function definitions
 #-----------------------------------------------------------------------------
 
-def read_no_interrupt(p: subprocess.Popen):
+def read_no_interrupt(p: subprocess.Popen) -> str:
     """Read from a pipe ignoring EINTR errors.
 
     This is necessary because when reading from pipes with GUI event loops
@@ -40,7 +40,11 @@ def read_no_interrupt(p: subprocess.Popen):
             raise
 
 
-def process_handler(cmd:Union[str, List[str]], callback:Callable[[subprocess.Popen], int], stderr=subprocess.PIPE) -> Optional[int]:
+def process_handler(
+    cmd: Union[str, List[str]],
+    callback: Callable[[subprocess.Popen], int],
+    stderr=subprocess.PIPE,
+) -> int:
     """Open a command in a shell subprocess and execute a callback.
 
     This function provides common scaffolding for creating subprocess.Popen()
diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
@@ -26,6 +26,9 @@
 from threading import Thread
 import subprocess
 
+from typing import Optional, List
+import traceback
+
 # our own imports
 from ._process_common import read_no_interrupt, process_handler, arg_split as py_arg_split
 from . import py3compat
@@ -55,7 +58,8 @@ class AvoidUNCPath:
                 cmd = '"pushd %s &&"%s' % (path, cmd)
             os.system(cmd)
     """
-    def __enter__(self):
+
+    def __enter__(self) -> Optional[str]:
         self.path = os.getcwd()
         self.is_unc_path = self.path.startswith(r"\\")
         if self.is_unc_path:
@@ -67,7 +71,9 @@ def __enter__(self):
             # directory
             return None
 
-    def __exit__(self, exc_type, exc_value, traceback):
+    def __exit__(
+        self, exc_type: Optional[type], exc_value: Optional[BaseException], traceback
+    ) -> None:
         if self.is_unc_path:
             os.chdir(self.path)
 
@@ -76,18 +82,18 @@ def _system_body(p: subprocess.Popen) -> int:
     """Callback for _system."""
     enc = DEFAULT_ENCODING
 
-    def stdout_read():
+    def stdout_read() -> None:
         try:
             for line in read_no_interrupt(p.stdout).splitlines():
-                line = line.decode(enc, 'replace')
+                line = line.decode(enc, "replace")
                 print(line, file=sys.stdout)
         except Exception as e:
             print(f"Error reading stdout: {e}", file=sys.stderr)
 
-    def stderr_read():
+    def stderr_read() -> None:
         try:
             for line in read_no_interrupt(p.stderr).splitlines():
-                line = line.decode(enc, 'replace')
+                line = line.decode(enc, "replace")
                 print(line, file=sys.stderr)
         except Exception as e:
             print(f"Error reading stderr: {e}", file=sys.stderr)
@@ -115,7 +121,7 @@ def stderr_read():
     return result
 
 
-def system(cmd: str):
+def system(cmd: str) -> Optional[int]:
     """Win32 version of os.system() that works with network shares.
 
     Note that this implementation returns None, as meant for use in IPython.
@@ -139,7 +145,7 @@ def system(cmd: str):
             cmd = '"pushd %s &&"%s' % (path, cmd)
         return process_handler(cmd, _system_body)
 
-def getoutput(cmd):
+def getoutput(cmd: str) -> str:
     """Return standard output of executing cmd in a shell.
 
     Accepts the same arguments as os.system().
@@ -164,14 +170,17 @@ def getoutput(cmd):
     return py3compat.decode(out)
 
 try:
-    CommandLineToArgvW = ctypes.windll.shell32.CommandLineToArgvW
+    windll = ctypes.windll  # type: ignore [attr-defined]
+    CommandLineToArgvW = windll.shell32.CommandLineToArgvW
     CommandLineToArgvW.arg_types = [LPCWSTR, POINTER(c_int)]
     CommandLineToArgvW.restype = POINTER(LPCWSTR)
-    LocalFree = ctypes.windll.kernel32.LocalFree
+    LocalFree = windll.kernel32.LocalFree
     LocalFree.res_type = HLOCAL
     LocalFree.arg_types = [HLOCAL]
-    
-    def arg_split(commandline, posix=False, strict=True):
+
+    def arg_split(
+        commandline: str, posix: bool = False, strict: bool = True
+    ) -> List[str]:
         """Split a command line's arguments in a shell-like manner.
 
         This is a special version for windows that use a ctypes call to CommandLineToArgvW
@@ -188,13 +197,19 @@ def arg_split(commandline, posix=False, strict=True):
         argvn = c_int()
         result_pointer = CommandLineToArgvW(commandline.lstrip(), ctypes.byref(argvn))
         result_array_type = LPCWSTR * argvn.value
-        result = [arg for arg in result_array_type.from_address(ctypes.addressof(result_pointer.contents))]
+        result = [
+            arg
+            for arg in result_array_type.from_address(
+                ctypes.addressof(result_pointer.contents)
+            )
+            if arg is not None
+        ]
         retval = LocalFree(result_pointer)
         return result
 except AttributeError:
     arg_split = py_arg_split
 
-def check_pid(pid):
+def check_pid(pid: int) -> bool:
     # OpenProcess returns 0 if no such process (of ours) exists
     # positive int otherwise
-    return bool(ctypes.windll.kernel32.OpenProcess(1,0,pid))
+    return bool(windll.kernel32.OpenProcess(1, 0, pid))
diff --git a/pyproject.toml b/pyproject.toml
@@ -131,7 +131,6 @@ exclude = [
    'IPython/lib/deepreload.py',
    'IPython/sphinxext/ipython_directive.py',
    'IPython/terminal/ipapp.py',
-   'IPython/utils/_process_win32.py',
    'IPython/utils/path.py',
 ]
 # check_untyped_defs = true
@@ -334,7 +333,6 @@ addopts = [
    "--ignore=IPython/terminal/console.py",
    "--ignore=IPython/utils/_process_cli.py",
    "--ignore=IPython/utils/_process_posix.py",
-   "--ignore=IPython/utils/_process_win32.py",
    "--ignore=IPython/utils/_process_win32_controller.py",
    "--ignore=IPython/utils/daemonize.py",
    "--ignore=IPython/utils/eventful.py",
