Commit 5ce50c38 authored by Julien Muchembled's avatar Julien Muchembled Committed by GitHub

Merge pull request #310 from zopefoundation/zope-interface-fix-inconsistent-iro

Fix inconsistent resolution order with zope.interface v5.
parents bb9bf539 463fc5af
language: python language: python
env:
global:
ZOPE_INTERFACE_STRICT_IRO: 1
python: python:
- 2.7 - 2.7
- 3.5 - 3.5
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
- Fix tests with transaction 3.0. - Fix tests with transaction 3.0.
- Fix inconsistent resolution order with zope.interface v5.
5.5.1 (2018-10-25) 5.5.1 (2018-10-25)
================== ==================
......
...@@ -63,8 +63,9 @@ eggs = ...@@ -63,8 +63,9 @@ eggs =
${sphinx_egg:eggs} ${sphinx_egg:eggs}
docutils docutils
ZODB ZODB
j1m.sphinxautointerface sphinxcontrib_zopeext
j1m.sphinxautozconfig j1m.sphinxautozconfig
sphinx_rtd_theme
scripts = scripts =
sphinx-build sphinx-build
interpreter = stxpy interpreter = stxpy
...@@ -38,7 +38,7 @@ extensions = [ ...@@ -38,7 +38,7 @@ extensions = [
'sphinx.ext.doctest', 'sphinx.ext.doctest',
'sphinx.ext.intersphinx', 'sphinx.ext.intersphinx',
'sphinx.ext.viewcode', 'sphinx.ext.viewcode',
'j1m.sphinxautointerface', 'sphinxcontrib.zopeext.autointerface',
'j1m.sphinxautozconfig', 'j1m.sphinxautozconfig',
] ]
...@@ -126,7 +126,7 @@ html_logo = 'zodb.png' ...@@ -126,7 +126,7 @@ html_logo = 'zodb.png'
# The name of an image file (within the static path) to use as favicon of the # 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 # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large. # pixels large.
html_favicon = 'zodb.ico' html_favicon = '.static/zodb.ico'
# Add any paths that contain custom static files (such as style sheets) here, # 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, # relative to this directory. They are copied after the builtin static files,
......
...@@ -3,6 +3,6 @@ Sphinx ...@@ -3,6 +3,6 @@ Sphinx
pygments<2.6 pygments<2.6
docutils docutils
ZODB ZODB
j1m.sphinxautointerface sphinxcontrib_zopeext
j1m.sphinxautozconfig j1m.sphinxautozconfig
sphinx_rtd_theme sphinx_rtd_theme
...@@ -127,12 +127,12 @@ class TempFormatter(FileStorageFormatter): ...@@ -127,12 +127,12 @@ class TempFormatter(FileStorageFormatter):
self._file = afile self._file = afile
@implementer( @implementer(
IStorage,
IStorageRestoreable, IStorageRestoreable,
IStorageIteration, IStorageIteration,
IStorageUndoable, IStorageUndoable,
IStorageCurrentRecordIteration, IStorageCurrentRecordIteration,
IExternalGC, IExternalGC,
IStorage,
) )
class FileStorage( class FileStorage(
FileStorageFormatter, FileStorageFormatter,
......
...@@ -754,12 +754,10 @@ class BlobStorage(BlobStorageMixin): ...@@ -754,12 +754,10 @@ class BlobStorage(BlobStorageMixin):
self._blobs_pack_is_in_progress = False self._blobs_pack_is_in_progress = False
if ZODB.interfaces.IStorageRestoreable.providedBy(storage): if ZODB.interfaces.IStorageRestoreable.providedBy(storage):
iblob = ZODB.interfaces.IBlobStorageRestoreable
else:
iblob = ZODB.interfaces.IBlobStorage
zope.interface.directlyProvides( zope.interface.directlyProvides(
self, iblob, zope.interface.providedBy(storage)) self,
ZODB.interfaces.IBlobStorageRestoreable,
zope.interface.providedBy(storage))
def __getattr__(self, name): def __getattr__(self, name):
return getattr(self.__storage, name) return getattr(self.__storage, name)
......
...@@ -13,6 +13,8 @@ commands = ...@@ -13,6 +13,8 @@ commands =
zope-testrunner --test-path=src [] zope-testrunner --test-path=src []
deps = deps =
.[test] .[test]
setenv =
ZOPE_INTERFACE_STRICT_IRO = 1
[testenv:coverage] [testenv:coverage]
basepython = python3.7 basepython = python3.7
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment