Merge pull request #18 from masipcat/mypy-annotations-components

Improved mypy annotations in Components methods

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 0.2.6 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Improved mypy annotations in Components methods
 
 
 ## [0.2.5] - 2020-03-12

src/zope-stubs/interface/registry.pyi

@@ -2,7 +2,9 @@
 #
 # NOTE: This dynamically typed stub was automatically generated by stubgen.
 
-from typing import Any, Optional
+from typing import Any, Generic, Iterator, Optional, Type, TypeVar, Tuple
+
+T = TypeVar("T")
 
 class _UnhashableComponentCounter:
     def __init__(self, otherdict: Any) -> None: ...
@@ -23,22 +25,22 @@ class Components:
     def registerUtility(self, component: Optional[Any] = ..., provided: Optional[Any] = ..., name: str = ..., info: str = ..., event: bool = ..., factory: Optional[Any] = ...): ...
     def unregisterUtility(self, component: Optional[Any] = ..., provided: Optional[Any] = ..., name: str = ..., factory: Optional[Any] = ...): ...
     def registeredUtilities(self) -> None: ...
-    def queryUtility(self, provided: Any, name: str = ..., default: Optional[Any] = ...): ...
-    def getUtility(self, provided: Any, name: str = ...): ...
-    def getUtilitiesFor(self, interface: Any) -> None: ...
+    def queryUtility(self, provided: Type[T], name: str = ..., default: Optional[Any] = ...) -> Optional[T]: ...
+    def getUtility(self, provided: Type[T], name: str = ...) -> T: ...
+    def getUtilitiesFor(self, interface: Type[T]) -> Iterator[Tuple[str, T]]: ...
     def getAllUtilitiesRegisteredFor(self, interface: Any): ...
     def registerAdapter(self, factory: Any, required: Optional[Any] = ..., provided: Optional[Any] = ..., name: str = ..., info: str = ..., event: bool = ...) -> None: ...
     def unregisterAdapter(self, factory: Optional[Any] = ..., required: Optional[Any] = ..., provided: Optional[Any] = ..., name: str = ...): ...
     def registeredAdapters(self) -> None: ...
-    def queryAdapter(self, object: Any, interface: Any, name: str = ..., default: Optional[Any] = ...): ...
-    def getAdapter(self, object: Any, interface: Any, name: str = ...): ...
-    def queryMultiAdapter(self, objects: Any, interface: Any, name: str = ..., default: Optional[Any] = ...): ...
-    def getMultiAdapter(self, objects: Any, interface: Any, name: str = ...): ...
-    def getAdapters(self, objects: Any, provided: Any) -> None: ...
+    def queryAdapter(self, object: Any, interface: Type[T], name: str = ..., default: Optional[Any] = ...) -> Optional[T]: ...
+    def getAdapter(self, object: Any, interface: Type[T], name: str = ...) -> T: ...
+    def queryMultiAdapter(self, objects: Any, interface: Type[T], name: str = ..., default: Optional[Any] = ...) -> Optional[T]: ...
+    def getMultiAdapter(self, objects: Any, interface: Type[T], name: str = ...) -> T: ...
+    def getAdapters(self, objects: Any, provided: Type[T]) -> Iterator[Tuple[str, T]]: ...
     def registerSubscriptionAdapter(self, factory: Any, required: Optional[Any] = ..., provided: Optional[Any] = ..., name: str = ..., info: str = ..., event: bool = ...) -> None: ...
     def registeredSubscriptionAdapters(self) -> None: ...
     def unregisterSubscriptionAdapter(self, factory: Optional[Any] = ..., required: Optional[Any] = ..., provided: Optional[Any] = ..., name: str = ...): ...
-    def subscribers(self, objects: Any, provided: Any): ...
+    def subscribers(self, objects: Any, provided: Type[T]) -> T: ...
     def registerHandler(self, factory: Any, required: Optional[Any] = ..., name: str = ..., info: str = ..., event: bool = ...) -> None: ...
     def registeredHandlers(self) -> None: ...
     def unregisterHandler(self, factory: Optional[Any] = ..., required: Optional[Any] = ..., name: str = ...): ...