Fix soft dependency on formlib

Fixes #22
collective · Apr 8, 2019 · 5db3315 · 5db3315
1 parent fdd68a3
commit 5db3315
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/collective/auditlog/action.py b/collective/auditlog/action.py
@@ -27,7 +27,6 @@
 from zope.component import adapter
 from zope.component import getUtility
 from zope.component.hooks import getSite
-from zope.formlib import form
 from zope.globalrequest import getRequest
 from zope.interface import implementer
 from zope.interface import Interface
@@ -48,6 +47,15 @@
     class IPloneFormGenField(Interface):
         pass
 
+try:
+    # Plone4 only (formlib)
+    from zope.formlib import form
+    HAS_FORMLIB = True
+except ImportError:
+    form = None
+    HAS_FORMLIB = False  # Plone 5 will use z3c.form
+
+
 logger = logging.getLogger('collective.auditlog')
 
 
@@ -300,18 +308,24 @@ def __call__(self):
 
 
 class AuditAddForm(AddForm):
-    form_fields = form.FormFields(IAuditAction)  # needed for Plone4 (formlib)
+
+    # Plone4 only
+    form_fields = form.FormFields(IAuditAction) if HAS_FORMLIB else []
     schema = IAuditAction  # needed for Plone5 (z3c.form)
     label = u"Add Audit Action"
     form_name = u"Configure element"
 
     def create(self, data):
         a = AuditAction()
-        form.applyChanges(a, self.form_fields, data)
+        HAS_FORMLIB and form.applyChanges(a, self.form_fields, data)
         return a
 
 
 class AuditEditForm(EditForm):
-    form_fields = form.FormFields(IAuditAction)
+
+    # Plone4 only
+    form_fields = form.FormFields(IAuditAction) if HAS_FORMLIB else []
+    schema = IAuditAction  # needed for Plone5 (z3c.form)
+
     label = u"Edit Audit Action"
     form_name = u"Configure element"
diff --git a/docs/HISTORY.rst b/docs/HISTORY.rst
@@ -4,7 +4,8 @@ Changelog
 1.4.0a3 (unreleased)
 --------------------
 
-- Nothing changed yet.
+- Fix soft dependency on formlib (#22)
+  [ale-rt]
 
 
 1.4.0a2 (2018-10-11)