Merge branch 'master' into linkintegrity_adapters

.isort.cfg

@@ -1,3 +1,2 @@
 [settings]
-profile=black
-force_single_line = true
+profile=plone

CHANGES.rst

@@ -7,6 +7,9 @@ Changelog
 - Add adapters for link integrity for content-types with BlocksField fields.
   [cekk]
 
+- Upgrade step to remove all custom Googlebot rules from robots.txt
+  [mamico]
+
 - Fix: add range_start to function for calculate recurrences in the right way
   [eikichi18]
 

docs/conf.py

@@ -12,6 +12,7 @@
 import os
 import sys
 
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

setup.py

@@ -4,6 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
+
 long_description = "\n\n".join(
     [
         open("README.rst").read(),

src/redturtle/volto/__init__.py

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 """Init and utils."""
-import logging
-import re
-
 from plone.app.content.browser.vocabulary import PERMISSIONS
 from plone.folder.nogopip import GopipIndex
 from plone.restapi.serializer import utils
 from Products.ZCatalog.Catalog import Catalog
+from redturtle.volto.catalogplan import Catalog_sorted_search_indexes
 from zope.i18nmessageid import MessageFactory
 from ZTUtils.Lazy import LazyCat
 from ZTUtils.Lazy import LazyMap
 
-from redturtle.volto.catalogplan import Catalog_sorted_search_indexes
+import logging
+import re
+
 
 logger = logging.getLogger(__name__)
 

src/redturtle/volto/adapters/stringinterp.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from plone.stringinterp.adapters import BaseSubstitution
 from Products.CMFCore.interfaces import IContentish
+from redturtle.volto import _
 from zope.component import adapter
 
-from redturtle.volto import _
 
 try:
     from plone.stringinterp import _ as stringinterp_mf

src/redturtle/volto/browser/controlpanel.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from plone.app.registry.browser.controlpanel import ControlPanelFormWrapper
 from plone.app.registry.browser.controlpanel import RegistryEditForm
-
 from redturtle.volto import _
 from redturtle.volto.interfaces import IRedTurtleVoltoSettings
 

src/redturtle/volto/browser/find_blocks.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
-import json
-import logging
-from copy import deepcopy
-
 from Acquisition import aq_base
+from copy import deepcopy
 from plone import api
 from plone.dexterity.utils import iterSchemata
 from Products.Five import BrowserView
 from zope.schema import getFieldsInOrder
 
+import json
+import logging
+
+
 logger = logging.getLogger(__name__)
 
 BLOCKS = [

src/redturtle/volto/browser/fix_links.py

@@ -1,18 +1,19 @@
 # -*- coding: utf-8 -*-
-import json
-import logging
-import re
-from urllib.parse import urlparse
-from urllib.parse import urlunparse
-
 from Acquisition import aq_base
 from plone import api
 from plone.dexterity.utils import iterSchemata
 from plone.restapi.interfaces import IFieldDeserializer
 from Products.Five import BrowserView
+from urllib.parse import urlparse
+from urllib.parse import urlunparse
 from zope.component import queryMultiAdapter
 from zope.schema import getFieldsInOrder
 
+import json
+import logging
+import re
+
+
 logger = logging.getLogger(__name__)
 
 

src/redturtle/volto/browser/sitemap.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
-import datetime
-
 from BTrees.OOBTree import OOBTree
 from plone.app.layout.sitemap.sitemap import SiteMapView as LayoutSiteMapView
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.interfaces import IPloneSiteRoot
 from zope.component import getUtility
 
+import datetime
+
 
 class SiteMapView(LayoutSiteMapView):
     def objects(self):

src/redturtle/volto/config/__init__.py

@@ -1,3 +1,4 @@
 import os
 
+
 MAX_LIMIT = int(os.environ.get("REDTURTLE_VOLTO_MAX_LIMIT_SEARCH") or 500)

src/redturtle/volto/interfaces.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 from plone.restapi.controlpanels.interfaces import IControlpanel
+from redturtle.volto import _
 from zope.interface import Interface
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 from zope.schema import Bool
 
-from redturtle.volto import _
-
 
 class IRedturtleVoltoLayer(IDefaultBrowserLayer):
     """Marker interface that defines a browser layer."""

src/redturtle/volto/locales/update.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import os
+import pkg_resources
 import subprocess
 
-import pkg_resources
 
 domain = "redturtle.volto"
 os.chdir(pkg_resources.resource_filename(domain, ""))

src/redturtle/volto/monkey.py

@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-import datetime
-import os
-
 from Acquisition import aq_base
 from plone.app.caching import purge
 from plone.app.event.base import dt_start_of_day
@@ -15,6 +12,9 @@
 from Products.CMFPlone.interfaces import IConstrainTypes
 from zope.globalrequest import getRequest
 
+import datetime
+import os
+
 
 def occurrences(self, range_start=None, range_end=None):
     """Return all occurrences of an event, possibly within a start and end

src/redturtle/volto/restapi/deserializer/blocks.py

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 from copy import deepcopy
-
 from plone.restapi.behaviors import IBlocks
 from plone.restapi.deserializer.blocks import path2uid
 from plone.restapi.interfaces import IBlockFieldDeserializationTransformer
 from Products.CMFPlone.interfaces import IPloneSiteRoot
+from redturtle.volto.interfaces import IRedturtleVoltoLayer
 from zope.component import adapter
 from zope.interface import implementer
 
-from redturtle.volto.interfaces import IRedturtleVoltoLayer
 
 EXCLUDE_KEYS = ["@type", "token", "value", "@id", "query"]
 EXCLUDE_TYPES = ["title", "listing", "calendar", "searchEvents"]

src/redturtle/volto/restapi/deserializer/dxfields.py

@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-import dateutil
-import lxml
-import pytz
 from plone.app.contenttypes.interfaces import ILink
 from plone.app.dexterity.behaviors.metadata import IPublication
 from plone.app.event.base import default_timezone
@@ -21,6 +18,7 @@
 from Products.CMFPlone.utils import safe_unicode
 from pytz import timezone
 from pytz import utc
+from redturtle.volto.interfaces import IRedturtleVoltoLayer
 from z3c.form.interfaces import IDataManager
 from zope.component import adapter
 from zope.component import getMultiAdapter
@@ -29,7 +27,9 @@
 from zope.schema.interfaces import IDatetime
 from zope.schema.interfaces import ITextLine
 
-from redturtle.volto.interfaces import IRedturtleVoltoLayer
+import dateutil
+import lxml
+import pytz
 
 
 @implementer(IFieldDeserializer)

src/redturtle/volto/restapi/deserializer/relationfield.py

@@ -1,18 +1,16 @@
-from urllib.parse import urlparse
-
 from plone.dexterity.interfaces import IDexterityContent
 from plone.restapi.deserializer.dxfields import DefaultFieldDeserializer
 from plone.restapi.interfaces import IFieldDeserializer
 from Products.CMFCore.utils import getToolByName
+from redturtle.volto.interfaces import IRedturtleVoltoLayer
+from urllib.parse import urlparse
 from z3c.relationfield.interfaces import IRelationChoice
 from zope.component import adapter
 from zope.component import getMultiAdapter
 from zope.component import queryUtility
 from zope.interface import implementer
 from zope.intid.interfaces import IIntIds
 
-from redturtle.volto.interfaces import IRedturtleVoltoLayer
-
 
 @implementer(IFieldDeserializer)
 @adapter(IRelationChoice, IDexterityContent, IRedturtleVoltoLayer)

src/redturtle/volto/restapi/search/query.py

@@ -1,16 +1,15 @@
 # -*- coding: utf-8 -*-
-import re
-
 from plone.restapi.interfaces import IIndexQueryParser
 from plone.restapi.search.query import (
     ZCTextIndexQueryParser as BaseZCTextIndexQueryParser,
 )
 from Products.ZCTextIndex.ZCTextIndex import ZCTextIndex
+from redturtle.volto.interfaces import IRedturtleVoltoLayer
 from zope.component import adapter
-from zope.interface import Interface
 from zope.interface import implementer
+from zope.interface import Interface
 
-from redturtle.volto.interfaces import IRedturtleVoltoLayer
+import re
 
 
 @implementer(IIndexQueryParser)

src/redturtle/volto/restapi/serializer/blocks.py

@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
 from copy import deepcopy
-
 from plone import api
 from plone.restapi.behaviors import IBlocks
 from plone.restapi.interfaces import IBlockFieldSerializationTransformer
 from plone.restapi.interfaces import ISerializeToJsonSummary
 from plone.restapi.serializer.blocks import uid_to_url
 from Products.CMFPlone.interfaces import IPloneSiteRoot
+from redturtle.volto.interfaces import IRedturtleVoltoLayer
 from zope.component import adapter
 from zope.component import getMultiAdapter
 from zope.globalrequest import getRequest
 from zope.interface import implementer
 
-from redturtle.volto.interfaces import IRedturtleVoltoLayer
 
 EXCLUDE_KEYS = ["@type"]
 EXCLUDE_TYPES = ["title", "listing"]

src/redturtle/volto/restapi/serializer/dxfields.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import re
-
 from plone.app.contenttypes.interfaces import ILink
 from plone.app.contenttypes.utils import replace_link_variables_by_paths
 from plone.app.dexterity.behaviors.metadata import IPublication
@@ -9,12 +7,14 @@
 from plone.restapi.serializer.converters import json_compatible
 from plone.restapi.serializer.dxfields import DefaultFieldSerializer
 from plone.restapi.serializer.utils import uid_to_url
+from redturtle.volto.interfaces import IRedturtleVoltoLayer
 from zope.component import adapter
 from zope.interface import implementer
 from zope.schema.interfaces import IDatetime
 from zope.schema.interfaces import ITextLine
 
-from redturtle.volto.interfaces import IRedturtleVoltoLayer
+import re
+
 
 RESOLVEUID_RE = re.compile(".*?/resolve[Uu]id/([^/]*)/?(.*)$")
 

src/redturtle/volto/restapi/serializer/summary.py

@@ -9,11 +9,11 @@
     DefaultJSONSummarySerializer as BaseSerializer,
 )
 from plone.restapi.serializer.utils import uid_to_url
+from redturtle.volto.interfaces import IRedturtleVoltoLayer
 from zope.component import adapter
-from zope.interface import Interface
 from zope.interface import implementer
+from zope.interface import Interface
 
-from redturtle.volto.interfaces import IRedturtleVoltoLayer
 
 EMPTY_STRINGS = ["None"]
 

src/redturtle/volto/restapi/services/controlpanel.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 from plone.restapi.controlpanels import RegistryConfigletPanel
-from zope.component import adapter
-from zope.interface import Interface
-from zope.interface import implementer
-
 from redturtle.volto.interfaces import IRedTurtleVoltoSettings
 from redturtle.volto.interfaces import IRedTurtleVoltoSettingsControlpanel
+from zope.component import adapter
+from zope.interface import implementer
+from zope.interface import Interface
 
 
 @adapter(Interface, Interface)

src/redturtle/volto/restapi/services/navigation/get.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
-from plone.app.layout.navigation.navtree import NavtreeStrategyBase
 from plone.app.layout.navigation.navtree import buildFolderTree
+from plone.app.layout.navigation.navtree import NavtreeStrategyBase
 from plone.dexterity.interfaces import IDexterityContainer
 from plone.restapi.interfaces import IExpandableElement
 from plone.restapi.services import Service
 from zope.component import adapter
-from zope.interface import Interface
 from zope.interface import implementer
+from zope.interface import Interface
 
 
 @implementer(IExpandableElement)

src/redturtle/volto/restapi/services/querystringsearch/get.py

@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
-import logging
 from datetime import datetime
-from urllib import parse
-
 from DateTime import DateTime
 from plone import api
 from plone.app.event.base import get_events
@@ -14,14 +11,17 @@
 from plone.restapi.interfaces import ISerializeToJson
 from plone.restapi.interfaces import ISerializeToJsonSummary
 from plone.restapi.services import Service
-from plone.restapi.services.querystringsearch.get import SUPPORT_NOT_UUID_QUERIES
 from plone.restapi.services.querystringsearch.get import (
     QuerystringSearch as BaseQuerystringSearch,
 )
+from plone.restapi.services.querystringsearch.get import SUPPORT_NOT_UUID_QUERIES
+from redturtle.volto.config import MAX_LIMIT
+from urllib import parse
 from zExceptions import BadRequest
 from zope.component import getMultiAdapter
 
-from redturtle.volto.config import MAX_LIMIT
+import logging
+
 
 logger = logging.getLogger(__name__)
 

src/redturtle/volto/restapi/services/search/get.py

@@ -4,11 +4,11 @@
 from plone.restapi.search.handler import SearchHandler as OriginalHandler
 from plone.restapi.search.utils import unflatten_dotted_dict
 from plone.restapi.services import Service
-from zope.component import getMultiAdapter
-
 from redturtle.volto import logger
 from redturtle.volto.config import MAX_LIMIT
 from redturtle.volto.interfaces import IRedTurtleVoltoSettings
+from zope.component import getMultiAdapter
+
 
 # search for 'ranking' in 'SearchableText' and rank very high
 # when the term is in 'Subject' and high when it is in 'Title'.