- Pull in WebDAV support from Zope and pin Zope to 4.2.1 or higher

CHANGES.rst

@@ -1,8 +1,10 @@
 Changelog
 =========
 
-3.0.14 (unreleased)
--------------------
+3.1 (unreleased)
+----------------
+
+- Pull in WebDAV support from Zope and pin Zope to 4.2.1 or higher
 
 
 3.0.13 (2020-02-04)

setup.py

@@ -16,7 +16,7 @@
 from setuptools import setup
 
 
-version = '3.0.14.dev0'
+version = '3.1.dev0'
 
 with open('README.rst') as f:
     README = f.read()
@@ -62,7 +62,7 @@
     install_requires=[
         'setuptools',
         'six',
-        'Zope >= 4.0b5',
+        'Zope >= 4.2.1',
         'Missing',
         'Record',
         'DocumentTemplate >= 3.2.2',

src/Shared/DC/ZRDB/DA.py

@@ -38,7 +38,9 @@
 from OFS.role import RoleManager
 from OFS.SimpleItem import Item
 from Persistence import Persistent
+from webdav.Resource import Resource
 from zExceptions import BadRequest
+from zExceptions import ResourceLockedError
 
 from .Aqueduct import BaseQuery
 from .Aqueduct import custom_default_report
@@ -50,30 +52,6 @@
 from .sqlvar import SQLVar
 
 
-try:
-    from OFS import bbb
-except ImportError:
-    bbb = None
-
-
-if bbb is not None and bbb.HAS_ZSERVER:
-    from webdav.Resource import Resource
-    from webdav.Lockable import ResourceLockedError
-else:
-    from zExceptions import ResourceLockedError
-
-    class Resource:
-        def dav__init(self, request, response):
-            pass
-
-        def dav__validate(self, object, methodname, REQUEST):
-            pass
-
-        def dav__simpleifhandler(self, request, response, method='PUT',
-                                 col=0, url=None, refresh=0):
-            pass
-
-
 def _getPath(home, prefix, name, suffixes):
 
     dir = os.path.join(home, prefix)