Merge pull request #310 from zopefoundation/zope-interface-fix-incons…

…istent-iro Fix inconsistent resolution order with zope.interface v5.
zopefoundation · Jun 2, 2020 · 5ce50c3 · 5ce50c3
2 parents bb9bf53 + 463fc5a
commit 5ce50c3
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,9 @@
 language: python
 
+env:
+  global:
+    ZOPE_INTERFACE_STRICT_IRO: 1
+
 python:
   - 2.7
   - 3.5

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -40,6 +40,8 @@
 
 - Fix tests with transaction 3.0.
 
+- Fix inconsistent resolution order with zope.interface v5.
+
 5.5.1 (2018-10-25)
 ==================
 

diff --git a/buildout.cfg b/buildout.cfg
@@ -63,8 +63,9 @@ eggs =
     ${sphinx_egg:eggs}
     docutils
     ZODB
-    j1m.sphinxautointerface
+    sphinxcontrib_zopeext
     j1m.sphinxautozconfig
+    sphinx_rtd_theme
 scripts =
     sphinx-build
 interpreter = stxpy
diff --git a/doc/conf.py b/doc/conf.py
@@ -38,7 +38,7 @@
     'sphinx.ext.doctest',
     'sphinx.ext.intersphinx',
     'sphinx.ext.viewcode',
-    'j1m.sphinxautointerface',
+    'sphinxcontrib.zopeext.autointerface',
     'j1m.sphinxautozconfig',
 ]
 
@@ -126,7 +126,7 @@
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = 'zodb.ico'
+html_favicon = '.static/zodb.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -3,6 +3,6 @@ Sphinx
 pygments<2.6
 docutils
 ZODB
-j1m.sphinxautointerface
+sphinxcontrib_zopeext
 j1m.sphinxautozconfig
 sphinx_rtd_theme
diff --git a/src/ZODB/FileStorage/FileStorage.py b/src/ZODB/FileStorage/FileStorage.py
@@ -127,12 +127,12 @@ def __init__(self, afile):
         self._file = afile
 
 @implementer(
-        IStorage,
         IStorageRestoreable,
         IStorageIteration,
         IStorageUndoable,
         IStorageCurrentRecordIteration,
         IExternalGC,
+        IStorage,
         )
 class FileStorage(
     FileStorageFormatter,

diff --git a/src/ZODB/blob.py b/src/ZODB/blob.py
@@ -754,12 +754,10 @@ def __init__(self, base_directory, storage, layout='automatic'):
         self._blobs_pack_is_in_progress = False
 
         if ZODB.interfaces.IStorageRestoreable.providedBy(storage):
-            iblob = ZODB.interfaces.IBlobStorageRestoreable
-        else:
-            iblob = ZODB.interfaces.IBlobStorage
-
-        zope.interface.directlyProvides(
-            self, iblob, zope.interface.providedBy(storage))
+            zope.interface.directlyProvides(
+                self,
+                ZODB.interfaces.IBlobStorageRestoreable,
+                zope.interface.providedBy(storage))
 
     def __getattr__(self, name):
         return getattr(self.__storage, name)

diff --git a/tox.ini b/tox.ini
@@ -13,6 +13,8 @@ commands =
     zope-testrunner --test-path=src []
 deps =
     .[test]
+setenv =
+    ZOPE_INTERFACE_STRICT_IRO = 1
 
 [testenv:coverage]
 basepython = python3.7