Mv _types to types

Author: ale-rt

src/plone/api/content.py

@@ -7,10 +7,10 @@
 from copy import copy as _copy
 from itertools import islice
 from plone.api import portal
-from plone.api._types import Container
-from plone.api._types import Content
-from plone.api._types import Request
 from plone.api.exc import InvalidParameterError
+from plone.api.types import Container
+from plone.api.types import Content
+from plone.api.types import Request
 from plone.api.validation import at_least_one_of
 from plone.api.validation import mutually_exclusive_parameters
 from plone.api.validation import required_parameters

src/plone/api/portal.py

@@ -8,10 +8,10 @@
 from email.utils import formataddr
 from email.utils import parseaddr
 from logging import getLogger
-from plone.api._types import Content
-from plone.api._types import Request
 from plone.api.exc import CannotGetPortalError
 from plone.api.exc import InvalidParameterError
+from plone.api.types import Content
+from plone.api.types import Request
 from plone.api.validation import required_parameters
 from plone.base.navigationroot import get_navigation_root_object
 from plone.registry.interfaces import IRegistry

src/plone/api/relation.py

@@ -7,8 +7,8 @@
 from collections import defaultdict
 from importlib.metadata import distribution
 from importlib.metadata import PackageNotFoundError
-from plone.api._types import Content
 from plone.api.exc import InvalidParameterError
+from plone.api.types import Content
 from plone.api.validation import at_least_one_of
 from plone.api.validation import required_parameters
 from plone.app.linkintegrity.handlers import modifiedContent

src/plone/api/tests/test_content.py

@@ -5,10 +5,10 @@
 from OFS.event import ObjectWillBeMovedEvent
 from OFS.interfaces import IObjectWillBeMovedEvent
 from plone import api
-from plone.api._types import Content
 from plone.api.content import _parse_object_provides_query
 from plone.api.exc import MissingParameterError
 from plone.api.tests.base import INTEGRATION_TESTING
+from plone.api.types import Content
 from plone.app.contenttypes.interfaces import IFolder
 from plone.app.linkintegrity.exceptions import LinkIntegrityNotificationException
 from plone.app.textfield import RichTextValue

src/plone/api/tests/test_portal.py

@@ -119,7 +119,7 @@ def test_get(self):
 
     def test_request_alias(self):
         """Request alias should map to ZPublisher HTTPRequest."""
-        from plone.api._types import Request
+        from plone.api.types import Request
 
         self.assertIs(Request, HTTPRequest)
 

src/plone/api/_types.py src/plone/api/types.pysrc/plone/api/_types.py renamed to src/plone/api/types.py

@@ -8,11 +8,11 @@
 from contextlib import contextmanager
 from plone.api import env
 from plone.api import portal
-from plone.api._types import Content
 from plone.api.exc import GroupNotFoundError
 from plone.api.exc import InvalidParameterError
 from plone.api.exc import MissingParameterError
 from plone.api.exc import UserNotFoundError
+from plone.api.types import Content
 from plone.api.validation import at_least_one_of
 from plone.api.validation import mutually_exclusive_parameters
 from plone.api.validation import required_parameters