fixes #34: zope.interface 4.7 support

news/34.feature

@@ -0,0 +1 @@
+Support for zope.interface 4.7+ [jensens]

plone/supermodel/directives.py

@@ -12,6 +12,7 @@
 from zope.component import adapter
 from zope.interface import alsoProvides
 from zope.interface import implementer
+from zope.interface.interface import Element
 from zope.interface.interface import TAGGED_DATA
 
 import os.path
@@ -71,7 +72,7 @@ class CheckerPlugin(object):
 
     def __init__(self, schema):
         self.schema = schema
-        self.value = schema.queryTaggedValue(self.key, None)
+        self.value = Element.queryTaggedValue(schema, self.key, default=None)
 
     def fieldNames(self):
         raise NotImplementedError()
@@ -148,10 +149,18 @@ def __init__(self, interface):
 
     def __call__(self):
         interface = self.interface
-        filename = interface.queryTaggedValue(FILENAME_KEY, None)
+        filename = Element.queryTaggedValue(
+            interface,
+            FILENAME_KEY,
+            default=None,
+        )
         if filename is None:
             return
-        schema = interface.queryTaggedValue(SCHEMA_NAME_KEY, u'')
+        schema = Element.queryTaggedValue(
+            interface,
+            SCHEMA_NAME_KEY,
+            default=u'',
+        )
 
         moduleName = interface.__module__
         module = sys.modules.get(moduleName, None)

plone/supermodel/utils.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from collections import OrderedDict
 from lxml import etree
 from plone.supermodel.debug import parseinfo
 from plone.supermodel.interfaces import I18N_NAMESPACE
@@ -8,6 +9,7 @@
 from zope.i18nmessageid import Message
 from zope.interface import directlyProvidedBy
 from zope.interface import directlyProvides
+from zope.interface.interface import Element
 from zope.schema.interfaces import IChoice
 from zope.schema.interfaces import ICollection
 from zope.schema.interfaces import IDict
@@ -21,12 +23,6 @@
 import sys
 
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from zope.schema.vocabulary import OrderedDict  # <py27
-
-
 _marker = object()
 noNS_re = re.compile('^{\S+}')
 
@@ -269,7 +265,7 @@ def mergedTaggedValueDict(schema, name):
     """
     tv = {}
     for iface in reversed(schema.__iro__):
-        tv.update(iface.queryTaggedValue(name, {}))
+        tv.update(Element.queryTaggedValue(iface, name, default={}))
     return tv
 
 
@@ -281,7 +277,7 @@ def mergedTaggedValueList(schema, name):
     """
     tv = []
     for iface in reversed(schema.__iro__):
-        tv.extend(iface.queryTaggedValue(name, []))
+        tv.extend(Element.queryTaggedValue(iface, name, default=[]))
     return tv