From b05c9f7036f2489a680856a8879f5ee32d9088bd Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Tue, 2 Aug 2022 11:35:15 -0400 Subject: [PATCH 1/6] fix: 8082 and use Incomplete instead of Any --- stubs/pyvmomi/pyVmomi/vim/event.pyi | 4 ++-- stubs/pyvmomi/pyVmomi/vim/fault.pyi | 4 ++-- stubs/pyvmomi/pyVmomi/vim/option.pyi | 3 ++- stubs/pyvmomi/pyVmomi/vim/view.pyi | 4 ++-- stubs/pyvmomi/pyVmomi/vmodl/fault.pyi | 6 +++--- stubs/pyvmomi/pyVmomi/vmodl/query.pyi | 17 ++++++++--------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/stubs/pyvmomi/pyVmomi/vim/event.pyi b/stubs/pyvmomi/pyVmomi/vim/event.pyi index 4a422e3f1a7d..26f3e067d06e 100644 --- a/stubs/pyvmomi/pyVmomi/vim/event.pyi +++ b/stubs/pyvmomi/pyVmomi/vim/event.pyi @@ -1,7 +1,7 @@ +from _typeshed import Incomplete from datetime import datetime -from typing import Any -def __getattr__(name: str) -> Any: ... # incomplete +def __getattr__(name: str) -> Incomplete: ... class Event: createdTime: datetime diff --git a/stubs/pyvmomi/pyVmomi/vim/fault.pyi b/stubs/pyvmomi/pyVmomi/vim/fault.pyi index 80a1dac07b1f..35be40441bae 100644 --- a/stubs/pyvmomi/pyVmomi/vim/fault.pyi +++ b/stubs/pyvmomi/pyVmomi/vim/fault.pyi @@ -1,6 +1,6 @@ -from typing import Any +from _typeshed import Incomplete -def __getattr__(name: str) -> Any: ... # incomplete +def __getattr__(name: str) -> Incomplete: ... class InvalidName(Exception): ... class RestrictedByAdministrator(Exception): ... diff --git a/stubs/pyvmomi/pyVmomi/vim/option.pyi b/stubs/pyvmomi/pyVmomi/vim/option.pyi index 70af8267057f..0751b80bfeb2 100644 --- a/stubs/pyvmomi/pyVmomi/vim/option.pyi +++ b/stubs/pyvmomi/pyVmomi/vim/option.pyi @@ -1,6 +1,7 @@ from typing import Any +from _typeshed import Incomplete -def __getattr__(name: str) -> Any: ... # incomplete +def __getattr__(name: str) -> Incomplete: ... class OptionManager: def QueryOptions(self, name: str) -> list[OptionValue]: ... diff --git a/stubs/pyvmomi/pyVmomi/vim/view.pyi b/stubs/pyvmomi/pyVmomi/vim/view.pyi index 114883ba3431..dbb397bdaf2d 100644 --- a/stubs/pyvmomi/pyVmomi/vim/view.pyi +++ b/stubs/pyvmomi/pyVmomi/vim/view.pyi @@ -1,8 +1,8 @@ -from typing import Any +from _typeshed import Incomplete from pyVmomi.vim import ManagedEntity -def __getattr__(name: str) -> Any: ... # incomplete +def __getattr__(name: str) -> Incomplete: ... class ContainerView: def Destroy(self) -> None: ... diff --git a/stubs/pyvmomi/pyVmomi/vmodl/fault.pyi b/stubs/pyvmomi/pyVmomi/vmodl/fault.pyi index 23576a3c49d9..8aac5d51d671 100644 --- a/stubs/pyvmomi/pyVmomi/vmodl/fault.pyi +++ b/stubs/pyvmomi/pyVmomi/vmodl/fault.pyi @@ -1,10 +1,10 @@ -from typing import Any +from _typeshed import Incomplete from pyVmomi.vmodl import ManagedObject -def __getattr__(name: str) -> Any: ... # incomplete +def __getattr__(name: str) -> Incomplete: ... class InvalidArgument(Exception): ... -class ManagedObjectNotFound: +class ManagedObjectNotFound(Exception): obj: ManagedObject diff --git a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi index 8aea285fe4f3..d9c464c5894a 100644 --- a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi +++ b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi @@ -1,3 +1,4 @@ +from _typeshed import Incomplete from typing import Any from pyVmomi.vim import ManagedEntity @@ -13,12 +14,12 @@ class PropertyCollector: class TraversalSpec: def __init__( - self, *, path: str = ..., skip: bool = ..., type: type[ContainerView] = ..., **kwargs: Any # incomplete + self, *, path: str = ..., skip: bool = ..., type: type[ContainerView] = ..., **kwargs: Incomplete ) -> None: ... path: str skip: bool type: type[ContainerView] - def __getattr__(self, name: str) -> Any: ... # incomplete + def __getattr__(self, name: str) -> Incomplete: ... class RetrieveOptions: def __init__(self, *, maxObjects: int | None = ...) -> None: ... @@ -38,19 +39,17 @@ class PropertyCollector: *, propSet: list[PropertyCollector.PropertySpec] = ..., objectSet: list[PropertyCollector.ObjectSpec] = ..., - **kwargs: Any, # incomplete + **kwargs: Incomplete, ) -> None: ... propSet: list[PropertyCollector.PropertySpec] objectSet: list[PropertyCollector.ObjectSpec] - def __getattr__(self, name: str) -> Any: ... # incomplete + def __getattr__(self, name: str) -> Incomplete: ... class ObjectContent: - def __init__( - self, *, obj: ManagedEntity = ..., propSet: list[DynamicProperty] = ..., **kwargs: Any # incomplete - ) -> None: ... + def __init__(self, *, obj: ManagedEntity = ..., propSet: list[DynamicProperty] = ..., **kwargs: Incomplete) -> None: ... obj: ManagedEntity propSet: list[DynamicProperty] - def __getattr__(self, name: str) -> Any: ... # incomplete + def __getattr__(self, name: str) -> Incomplete: ... class RetrieveResult: def __init__(self, *, objects: list[PropertyCollector.ObjectContent] = ..., token: str | None = ...) -> None: ... @@ -60,4 +59,4 @@ class PropertyCollector: self, specSet: list[PropertyCollector.FilterSpec], options: PropertyCollector.RetrieveOptions ) -> PropertyCollector.RetrieveResult: ... def ContinueRetrievePropertiesEx(self, token: str) -> PropertyCollector.RetrieveResult: ... - def __getattr__(self, name: str) -> Any: ... # incomplete + def __getattr__(self, name: str) -> Incomplete: ... From 61b309b803b9ee7e1b41efb9f9c408ea85d54b89 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 2 Aug 2022 15:39:34 +0000 Subject: [PATCH 2/6] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/pyvmomi/pyVmomi/vim/option.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/pyvmomi/pyVmomi/vim/option.pyi b/stubs/pyvmomi/pyVmomi/vim/option.pyi index 0751b80bfeb2..0c7b59266e4d 100644 --- a/stubs/pyvmomi/pyVmomi/vim/option.pyi +++ b/stubs/pyvmomi/pyVmomi/vim/option.pyi @@ -1,5 +1,5 @@ -from typing import Any from _typeshed import Incomplete +from typing import Any def __getattr__(name: str) -> Incomplete: ... From 9a14c3a39e1b02f39e29562ad17e352e12e4e008 Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Tue, 2 Aug 2022 15:05:24 -0400 Subject: [PATCH 3/6] Remove kwargs: Incomplete in __init__ Co-authored-by: Alex Waygood --- stubs/pyvmomi/pyVmomi/vmodl/query.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi index d9c464c5894a..bab9e3b3a6cb 100644 --- a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi +++ b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi @@ -46,7 +46,7 @@ class PropertyCollector: def __getattr__(self, name: str) -> Incomplete: ... class ObjectContent: - def __init__(self, *, obj: ManagedEntity = ..., propSet: list[DynamicProperty] = ..., **kwargs: Incomplete) -> None: ... + def __init__(self, *, obj: ManagedEntity = ..., propSet: list[DynamicProperty] = ..., **kwargs) -> None: ... obj: ManagedEntity propSet: list[DynamicProperty] def __getattr__(self, name: str) -> Incomplete: ... From 08a4abc07d4abd628cfbad33e1eb6e17d3e34a4e Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Tue, 2 Aug 2022 15:05:43 -0400 Subject: [PATCH 4/6] Remove kwargs: Incomplete in __init__ of TraversalSpec Co-authored-by: Alex Waygood --- stubs/pyvmomi/pyVmomi/vmodl/query.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi index bab9e3b3a6cb..4c566685633f 100644 --- a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi +++ b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi @@ -14,7 +14,7 @@ class PropertyCollector: class TraversalSpec: def __init__( - self, *, path: str = ..., skip: bool = ..., type: type[ContainerView] = ..., **kwargs: Incomplete + self, *, path: str = ..., skip: bool = ..., type: type[ContainerView] = ..., **kwargs, ) -> None: ... path: str skip: bool From 77b06432249279c374705253802389cf72c50310 Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Tue, 2 Aug 2022 15:06:01 -0400 Subject: [PATCH 5/6] Remove kwargs: Incomplete from PropertyCollector Co-authored-by: Alex Waygood --- stubs/pyvmomi/pyVmomi/vmodl/query.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi index 4c566685633f..82baec2bc889 100644 --- a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi +++ b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi @@ -39,7 +39,7 @@ class PropertyCollector: *, propSet: list[PropertyCollector.PropertySpec] = ..., objectSet: list[PropertyCollector.ObjectSpec] = ..., - **kwargs: Incomplete, + **kwargs, ) -> None: ... propSet: list[PropertyCollector.PropertySpec] objectSet: list[PropertyCollector.ObjectSpec] From c48948e3e87f6cf9704cf90cba6b6363eb32376a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 2 Aug 2022 19:07:47 +0000 Subject: [PATCH 6/6] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/pyvmomi/pyVmomi/vmodl/query.pyi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi index 82baec2bc889..a081798377f2 100644 --- a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi +++ b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi @@ -13,9 +13,7 @@ class PropertyCollector: pathSet: list[str] class TraversalSpec: - def __init__( - self, *, path: str = ..., skip: bool = ..., type: type[ContainerView] = ..., **kwargs, - ) -> None: ... + def __init__(self, *, path: str = ..., skip: bool = ..., type: type[ContainerView] = ..., **kwargs) -> None: ... path: str skip: bool type: type[ContainerView]