Make compatible with Zope 4 (#12)

Make the registration of the ``FileETag`` adapter conditional on the environment as Zope registers this adapter explicitly in ``Products.Five.browser``.
zopefoundation · Dec 10, 2019 · a17bbbb · a17bbbb
1 parent 6360ac9
commit a17bbbb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,6 +7,10 @@
 
 - Add support for Python 3.8.
 
+- Make the registration of the ``FileETag`` adapter conditional on the environment
+  as Zope registers this adapter explicitly in ``Products.Five.browser``.
+  See `#12 <https://github.com/zopefoundation/zope.browserresource/pull/12>`_.
+
 
 4.3 (2018-10-05)
 ================

diff --git a/src/zope/browserresource/configure.zcml b/src/zope/browserresource/configure.zcml
@@ -1,10 +1,11 @@
-<configure xmlns="http://namespaces.zope.org/zope">
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:zcml="http://namespaces.zope.org/zcml">
 
   <include file="meta.zcml" package="zope.component" />
   <include file="meta.zcml" package="zope.security" />
 
   <adapter factory=".resource.AbsoluteURL" />
-  <adapter factory=".file.FileETag" />
+  <adapter factory=".file.FileETag" zcml:condition="not-installed Products.Five"/>
 
   <view
       for="zope.component.interfaces.ISite"