From 7953848101f734c590eaac2918034cebe609ab49 Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Wed, 3 Aug 2022 18:08:08 -0400 Subject: [PATCH] Various pyvmomi improvements (#8469) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Alex Waygood --- 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 | 19 ++++++++----------- 6 files changed, 19 insertions(+), 21 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..0c7b59266e4d 100644 --- a/stubs/pyvmomi/pyVmomi/vim/option.pyi +++ b/stubs/pyvmomi/pyVmomi/vim/option.pyi @@ -1,6 +1,7 @@ +from _typeshed import Incomplete from typing import Any -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..a081798377f2 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 @@ -12,13 +13,11 @@ class PropertyCollector: pathSet: list[str] class TraversalSpec: - def __init__( - self, *, path: str = ..., skip: bool = ..., type: type[ContainerView] = ..., **kwargs: Any # incomplete - ) -> None: ... + def __init__(self, *, path: str = ..., skip: bool = ..., type: type[ContainerView] = ..., **kwargs) -> 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 +37,17 @@ class PropertyCollector: *, propSet: list[PropertyCollector.PropertySpec] = ..., objectSet: list[PropertyCollector.ObjectSpec] = ..., - **kwargs: Any, # incomplete + **kwargs, ) -> 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) -> 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 +57,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: ...