Improve typing in the portal module

Author: ale-rt

src/plone/api/portal.py

@@ -8,7 +8,7 @@
 from email.utils import formataddr
 from email.utils import parseaddr
 from logging import getLogger
-from plone.api._types import ContainerContext
+from plone.api._types import Content
 from plone.api._types import Request
 from plone.api.exc import CannotGetPortalError
 from plone.api.exc import InvalidParameterError
@@ -17,6 +17,7 @@
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.interfaces import ISiteRoot
 from Products.CMFCore.utils import getToolByName
+from Products.CMFPlone.Portal import PloneSite
 from Products.statusmessages.interfaces import IStatusMessage
 from typing import Any
 from zope.component import ComponentLookupError
@@ -60,7 +61,7 @@
 MISSING = object()
 
 
-def get() -> ContainerContext:
+def get() -> PloneSite:
     """Get the Plone portal object out of thin air.
 
     Without the need to import fancy Interfaces and doing multi adapter
@@ -84,9 +85,7 @@ def get() -> ContainerContext:
 
 
 @required_parameters("context")
-def get_navigation_root(
-    context: ContainerContext | None = None,
-) -> ContainerContext:
+def get_navigation_root(context: Content) -> Content:
     """Get the navigation root object for the context.
 
     This traverses the path up and returns the nearest navigation root.
@@ -409,7 +408,7 @@ def get_default_language() -> str:
     return settings.default_language
 
 
-def get_current_language(context: ContainerContext | None = None) -> str:
+def get_current_language(context: Content | None = None) -> str:
     """Return the current negotiated language.
 
     :param context: context object
@@ -458,9 +457,7 @@ def translate(msgid: str, domain: str = "plone", lang: str | None = None) -> str
 
 
 @required_parameters("name")
-def get_vocabulary(
-    name: str | None = None, context: ContainerContext | None = None
-) -> SimpleVocabulary:
+def get_vocabulary(name: str, context: Content | None = None) -> SimpleVocabulary:
     """Return a vocabulary object with the given name.
 
     :param name: Name of the vocabulary.