Merge cba7e22 into 3f3bbbd

CHANGES.rst

@@ -6,6 +6,9 @@ There's a frood who really knows where his towel is.
 1.7b4 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
+- Remove deprecated adapters ``CollectionUIDsProvider``, ``FolderUIDsProvider`` and ``GenericUIDsProvider``.
+  [hvelarde]
+
 - Fix retrieval of available image scales in tile layout configuration for Plone 5 (fixes `#781 <https://github.com/collective/collective.cover/issues/781>`_).
   [rodfersou]
 

src/collective/cover/interfaces.py

@@ -3,8 +3,6 @@
 from zope.interface import Attribute
 from zope.interface import Interface
 
-import warnings
-
 
 class ICoverLayer(Interface):
     """ A layer specific for this add-on product.
@@ -31,18 +29,6 @@ def getSearchResults(self, filter_portal_types, rooted, document_base_url, searc
         """ Returns the actual search results """
 
 
-class ICoverUIDsProvider(Interface):
-    """GenericUIDsProvider interface will be removed in collective.cover v1.7."""
-    warnings.warn(__doc__, DeprecationWarning)
-
-    def getUIDs(self):
-        """Get UUIDs associated with the object.
-            could be the UUID of the object or a
-            list of related UUIDs.
-        @return: iterable of UUIDs
-        """
-
-
 class ITileEditForm(Interface):
     """Custom EditForm interface for a tile.
     """

src/collective/cover/tiles/configure.zcml

@@ -87,36 +87,6 @@
       permission="zope.Public"
       />
 
-  <!--BEGIN DEPRECATED ADAPTERS. They will be removed on collective.cover 1.7.-->
-  <adapter
-      for="Products.ATContentTypes.interface.IATFolder"
-      provides="..interfaces.ICoverUIDsProvider"
-      factory=".list.FolderUIDsProvider"
-      />
-
-  <!-- Archetypes-based collection -->
-  <adapter
-      zcml:condition="installed plone.app.collection"
-      for="plone.app.collection.interfaces.ICollection"
-      provides="..interfaces.ICoverUIDsProvider"
-      factory=".list.CollectionUIDsProvider"
-      />
-
-  <!-- Dexterity-based collection -->
-  <adapter
-      zcml:condition="installed plone.app.contenttypes"
-      for="plone.app.contenttypes.interfaces.ICollection"
-      provides="..interfaces.ICoverUIDsProvider"
-      factory=".list.CollectionUIDsProvider"
-      />
-
-  <adapter
-      for="*"
-      provides="..interfaces.ICoverUIDsProvider"
-      factory=".list.GenericUIDsProvider"
-      />
-  <!--END DEPRECATED ADAPTERS. They will be removed on collective.cover 1.7.-->
-
   <adapter
       factory=".base.PersistentCoverTilePurgePaths"
       name="collective.cover.tiles"

src/collective/cover/tiles/list.py

@@ -2,7 +2,6 @@
 from AccessControl import Unauthorized
 from collective.cover import _
 from collective.cover.config import PROJECTNAME
-from collective.cover.interfaces import ICoverUIDsProvider
 from collective.cover.interfaces import ITileEditForm
 from collective.cover.tiles.base import IPersistentCoverTile
 from collective.cover.tiles.base import PersistentCoverTile
@@ -23,7 +22,6 @@
 
 import logging
 import six
-import warnings
 
 
 logger = logging.getLogger(PROJECTNAME)
@@ -373,42 +371,3 @@ def _get_title_tag(self, item):
     @view.memoize
     def get_title_tag(self, item):
         return self._get_title_tag(item)
-
-
-@implementer(ICoverUIDsProvider)
-class CollectionUIDsProvider(object):
-    """CollectionUIDsProvider adapter will be removed in collective.cover v1.7."""
-    warnings.warn(__doc__, DeprecationWarning)
-
-    def __init__(self, context):
-        self.context = context
-
-    def getUIDs(self):
-        """Return a list of UUIDs of collection objects."""
-        return [i.UID for i in self.context.queryCatalog()]
-
-
-@implementer(ICoverUIDsProvider)
-class FolderUIDsProvider(object):
-    """FolderUIDsProvider adapter will be removed in collective.cover v1.7."""
-    warnings.warn(__doc__, DeprecationWarning)
-
-    def __init__(self, context):
-        self.context = context
-
-    def getUIDs(self):
-        """Return a list of UUIDs of collection objects."""
-        return [i.UID for i in self.context.getFolderContents()]
-
-
-@implementer(ICoverUIDsProvider)
-class GenericUIDsProvider(object):
-    """GenericUIDsProvider adapter will be removed in collective.cover v1.7."""
-    warnings.warn(__doc__, DeprecationWarning)
-
-    def __init__(self, context):
-        self.context = context
-
-    def getUIDs(self):
-        """Return a list of UUIDs of collection objects."""
-        return [IUUID(self.context)]