distutils: various fixes

stdlib/2and3/distutils/cmd.pyi

@@ -34,7 +34,7 @@ class Command:
     def mkpath(self, name: str, mode: int = ...) -> None: ...
     def copy_file(self, infile: str, outfile: str, preserve_mode: int = ..., preserve_times: int = ..., link: Optional[str] = ..., level: Any = ...) -> Tuple[str, bool]: ...  # level is not used
     def copy_tree(self, infile: str, outfile: str, preserve_mode: int = ..., preserve_times: int = ..., preserve_symlinks: int = ..., level: Any = ...) -> List[str]: ...  # level is not used
-    def move_file(self, src: str, dest: str, level: Any = ...) -> str: ...  # level is not used
+    def move_file(self, src: str, dst: str, level: Any = ...) -> str: ...  # level is not used
     def spawn(self, cmd: Iterable[str], search_path: int = ..., level: Any = ...) -> None: ...  # level is not used
     def make_archive(self, base_name: str, format: str, root_dir: Optional[str] = ..., base_dir: Optional[str] = ..., owner: Optional[str] = ..., group: Optional[str] = ...) -> str: ...
     def make_file(self, infiles: Union[str, List[str], Tuple[str]], outfile: str, func: Callable[..., Any], args: List[Any], exec_msg: Optional[str] = ..., skip_msg: Optional[str] = ..., level: Any = ...) -> None: ...  # level is not used

stdlib/2and3/distutils/core.pyi

@@ -5,46 +5,46 @@ from distutils.cmd import Command as Command
 from distutils.dist import Distribution as Distribution
 from distutils.extension import Extension as Extension
 
-def setup(name: str = ...,
-          version: str = ...,
-          description: str = ...,
-          long_description: str = ...,
-          author: str = ...,
-          author_email: str = ...,
-          maintainer: str = ...,
-          maintainer_email: str = ...,
-          url: str = ...,
-          download_url: str = ...,
-          packages: List[str] = ...,
-          py_modules: List[str] = ...,
-          scripts: List[str] = ...,
-          ext_modules: List[Extension] = ...,
-          classifiers: List[str] = ...,
-          distclass: Type[Distribution] = ...,
-          script_name: str = ...,
-          script_args: List[str] = ...,
-          options: Mapping[str, Any] = ...,
-          license: str = ...,
-          keywords: Union[List[str], str] = ...,
-          platforms: Union[List[str], str] = ...,
-          cmdclass: Mapping[str, Type[Command]] = ...,
-          data_files: List[Tuple[str, List[str]]] = ...,
-          package_dir: Mapping[str, str] = ...,
-          obsoletes: List[str] = ...,
-          provides: List[str] = ...,
-          requires: List[str] = ...,
-          command_packages: List[str] = ...,
-          command_options: Mapping[str, Mapping[str, Tuple[Any, Any]]] = ...,
-          package_data: Mapping[str, List[str]] = ...,
-          include_package_data: bool = ...,
-          libraries: List[str] = ...,
-          headers: List[str] = ...,
-          ext_package: str = ...,
-          include_dirs: List[str] = ...,
-          password: str = ...,
-          fullname: str = ...,
-          **attrs: Any) -> None: ...
-
-def run_setup(script_name: str,
-              script_args: Optional[List[str]] = ...,
-              stop_after: str = ...) -> Distribution: ...
+def setup(
+    *,
+    name: str = ...,
+    version: str = ...,
+    description: str = ...,
+    long_description: str = ...,
+    author: str = ...,
+    author_email: str = ...,
+    maintainer: str = ...,
+    maintainer_email: str = ...,
+    url: str = ...,
+    download_url: str = ...,
+    packages: List[str] = ...,
+    py_modules: List[str] = ...,
+    scripts: List[str] = ...,
+    ext_modules: List[Extension] = ...,
+    classifiers: List[str] = ...,
+    distclass: Type[Distribution] = ...,
+    script_name: str = ...,
+    script_args: List[str] = ...,
+    options: Mapping[str, Any] = ...,
+    license: str = ...,
+    keywords: Union[List[str], str] = ...,
+    platforms: Union[List[str], str] = ...,
+    cmdclass: Mapping[str, Type[Command]] = ...,
+    data_files: List[Tuple[str, List[str]]] = ...,
+    package_dir: Mapping[str, str] = ...,
+    obsoletes: List[str] = ...,
+    provides: List[str] = ...,
+    requires: List[str] = ...,
+    command_packages: List[str] = ...,
+    command_options: Mapping[str, Mapping[str, Tuple[Any, Any]]] = ...,
+    package_data: Mapping[str, List[str]] = ...,
+    include_package_data: bool = ...,
+    libraries: List[str] = ...,
+    headers: List[str] = ...,
+    ext_package: str = ...,
+    include_dirs: List[str] = ...,
+    password: str = ...,
+    fullname: str = ...,
+    **attrs: Any,
+) -> None: ...
+def run_setup(script_name: str, script_args: Optional[List[str]] = ..., stop_after: str = ...) -> Distribution: ...

stdlib/2and3/distutils/extension.pyi

@@ -18,6 +18,7 @@ class Extension:
                      extra_compile_args: List[str] = ...,
                      extra_link_args: List[str] = ...,
                      export_symbols: List[str] = ...,
+                     swig_opts: Optional[str] = ...,  # undocumented
                      depends: List[str] = ...,
                      language: str = ...,
                      optional: bool = ...) -> None: ...
@@ -35,5 +36,6 @@ class Extension:
                      extra_compile_args: List[str] = ...,
                      extra_link_args: List[str] = ...,
                      export_symbols: List[str] = ...,
+                     swig_opts: Optional[str] = ...,  # undocumented
                      depends: List[str] = ...,
                      language: str = ...) -> None: ...