- make ZServer an optional dependency

CHANGES.rst

@@ -6,6 +6,9 @@ Changelog
 
 - Target use with Zope 4:  no longer support 2.13.x.
 
+- Make webdav from ZServer optional
+  [dataflake]
+
 2.13.5 (2016-11-10)
 -------------------
 

setup.py

@@ -48,7 +48,6 @@
         'transaction',
         'zope.interface',
         'zExceptions',
-        'ZServer >= 4.0dev',  # webdav
     ],
     include_package_data=True,
     zip_safe=False,

src/Products/ZSQLMethods/tests/test_SQL.py

@@ -12,7 +12,10 @@ def _makeOne(self, *args, **kw):
 
     def test_class_conforms_to_IWriteLock(self):
         from zope.interface.verify import verifyClass
-        from webdav.interfaces import IWriteLock
+        try:
+            from OFS.interfaces import IWriteLock
+        except ImportError:
+            from webdav.interfaces import IWriteLock
         verifyClass(IWriteLock, self._getTargetClass())
 
 

src/Shared/DC/ZRDB/DA.py

@@ -33,11 +33,16 @@
 from DateTime.DateTime import DateTime
 from ExtensionClass import Base
 from BTrees.OOBTree import OOBucket as Bucket
+from OFS import bbb
 from OFS.SimpleItem import Item
 from Persistence import Persistent
 import Products
-from webdav.Resource import Resource
-from webdav.Lockable import ResourceLockedError
+if bbb.HAS_ZSERVER:
+    from webdav.Resource import Resource
+    from webdav.Lockable import ResourceLockedError
+else:
+    Resource = bbb.Resource
+    from zExceptions import ResourceLockedError
 from zExceptions import BadRequest
 from zExceptions import NotFound