diff options
| author | ale-rt <alessandro.pisa@gmail.com> | 2018-04-28 23:33:36 +0200 |
|---|---|---|
| committer | Philip Bauer <bauer@starzel.de> | 2018-09-21 15:50:53 +0200 |
| commit | b621e560e2f19de033a4919e0803d8cc41b6dbd5 (patch) | |
| tree | 1daa54b19c26342ac9c2cb7e193f84fc9428e105 | |
| parent | e6693826ab7e8c3b640763f65da2f28fe89a961a (diff) | |
| download | zope-interface-plone-py3.tar.gz | |
WIP: do not break Plone on Python3plone-py3
| -rw-r--r-- | src/zope/interface/adapter.py | 2 | ||||
| -rw-r--r-- | src/zope/interface/registry.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/zope/interface/adapter.py b/src/zope/interface/adapter.py index aae3155..7d6253d 100644 --- a/src/zope/interface/adapter.py +++ b/src/zope/interface/adapter.py @@ -325,6 +325,8 @@ class LookupBaseFallback(object): def lookup(self, required, provided, name=_BLANK, default=None): if not isinstance(name, STRING_TYPES): + name = name.decode() + if not isinstance(name, STRING_TYPES): raise ValueError('name is not a string') cache = self._getcache(provided, name) required = tuple(required) diff --git a/src/zope/interface/registry.py b/src/zope/interface/registry.py index bba0267..833ba3d 100644 --- a/src/zope/interface/registry.py +++ b/src/zope/interface/registry.py @@ -278,6 +278,8 @@ class Components(object): yield UtilityRegistration(self, provided, name, *data) def queryUtility(self, provided, name=u'', default=None): + if not isinstance(name, STRING_TYPES): + name = name.decode() return self.utilities.lookup((), provided, name, default) def getUtility(self, provided, name=u''): |