Merge pull request #42 from plone/gforcada-remove-formlib

Remove zope.formlib dependency

CHANGES.rst

@@ -6,7 +6,11 @@ Changelog
 
 Breaking changes:
 
-- *add item here*
+- Make zope.formlib optional.
+  [gforcada]
+
+- Mark vocabularies based on zope.formlib as deprecated.
+  [gforcada]
 
 New features:
 

plone/app/vocabularies/catalog.py

@@ -14,7 +14,6 @@
 from Products.ZCTextIndex.ParseTree import ParseError
 from zope.browser.interfaces import ITerms
 from zope.component import queryUtility
-from zope.formlib.interfaces import ISourceQueryView
 from zope.interface import implementer
 from zope.interface import provider
 from zope.schema.interfaces import IContextSourceBinder
@@ -26,6 +25,16 @@
 
 import itertools
 import os
+import warnings
+
+
+try:
+    from zope.formlib.interfaces import ISourceQueryView
+except ImportError:
+    from zope.interface import Interface
+
+    class ISourceQueryView(Interface):
+        pass
 
 
 def parse_query(query, path_prefix=''):
@@ -317,6 +326,9 @@ class QuerySearchableTextSourceView(object):
     template = ViewPageTemplateFile('searchabletextsource.pt')
 
     def __init__(self, context, request):
+        msg = 'QuerySearchableTextSourceView is deprecated and will be ' \
+              'removed on Plone 6'
+        warnings.warn(msg, DeprecationWarning)
         self.context = context
         self.request = request
 

plone/app/vocabularies/configure.zcml

@@ -168,6 +168,7 @@
       />
 
   <adapter
+      zcml:condition="installed zope.formlib"
       for=".catalog.SearchableTextSource
            zope.publisher.interfaces.browser.IBrowserRequest"
       factory=".catalog.QuerySearchableTextSourceView"
@@ -182,6 +183,7 @@
       />
 
   <adapter
+      zcml:condition="installed zope.formlib"
       for=".users.UsersSource
            zope.publisher.interfaces.browser.IBrowserRequest"
       factory=".users.UsersSourceQueryView"
@@ -196,6 +198,7 @@
       />
 
   <adapter
+      zcml:condition="installed zope.formlib"
       for=".groups.GroupsSource
            zope.publisher.interfaces.browser.IBrowserRequest"
       factory=".groups.GroupsSourceQueryView"

plone/app/vocabularies/groups.py

@@ -2,13 +2,23 @@
 from Products.CMFCore.utils import getToolByName
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from zope.browser.interfaces import ITerms
-from zope.formlib.interfaces import ISourceQueryView
 from zope.interface import implementer
 from zope.interface import provider
 from zope.schema.interfaces import IContextSourceBinder
 from zope.schema.interfaces import ISource
 from zope.schema.vocabulary import SimpleTerm
 
+import warnings
+
+
+try:
+    from zope.formlib.interfaces import ISourceQueryView
+except ImportError:
+    from zope.interface import Interface
+
+    class ISourceQueryView(Interface):
+        pass
+
 
 @implementer(ISource)
 @provider(IContextSourceBinder)
@@ -137,6 +147,9 @@ class GroupsSourceQueryView(object):
     template = ViewPageTemplateFile('searchabletextsource.pt')
 
     def __init__(self, context, request):
+        msg = 'GroupsSourceQueryView is deprecated and will be removed on ' \
+              'Plone 6'
+        warnings.warn(msg, DeprecationWarning)
         self.context = context
         self.request = request
 

plone/app/vocabularies/users.py

@@ -4,14 +4,24 @@
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from zope.browser.interfaces import ITerms
 from zope.component.hooks import getSite
-from zope.formlib.interfaces import ISourceQueryView
 from zope.interface import implementer
 from zope.interface import provider
 from zope.schema.interfaces import IContextSourceBinder
 from zope.schema.interfaces import ISource
 from zope.schema.interfaces import IVocabularyFactory
 from zope.schema.vocabulary import SimpleTerm
 
+import warnings
+
+
+try:
+    from zope.formlib.interfaces import ISourceQueryView
+except ImportError:
+    from zope.interface import Interface
+
+    class ISourceQueryView(Interface):
+        pass
+
 
 def _createUserTerm(userid, context=None, acl_users=None):
     if acl_users is None:
@@ -184,6 +194,9 @@ class UsersSourceQueryView(object):
     template = ViewPageTemplateFile('searchabletextsource.pt')
 
     def __init__(self, context, request):
+        msg = 'UsersSourceQueryView is deprecated and will be removed on ' \
+              'Plone 6'
+        warnings.warn(msg, DeprecationWarning)
         self.context = context
         self.request = request
 

setup.py

@@ -41,7 +41,6 @@
         'setuptools',
         'zope.browser',
         'zope.component',
-        'zope.formlib',
         'zope.i18n',
         'zope.i18nmessageid',
         'zope.interface',