Merge pull request #99 from plone/petschki-types-vocab-fallback

Fix token lookup in `ReallyUserFriendlyTypes`

news/99.bugfix

@@ -0,0 +1,2 @@
+Fix rare case of "non friendly" token lookup in `plone.app.vocabularies.ReallyUserFriendlyTypes`
+[petschki]

plone/app/vocabularies/__init__.py

@@ -1,6 +1,6 @@
 from plone.app.vocabularies.interfaces import IPermissiveVocabulary
 from plone.app.vocabularies.interfaces import ISlicableVocabulary
-from urllib import parse
+from urllib.parse import unquote
 from zope.interface import directlyProvides
 from zope.interface import implementer
 from zope.schema.vocabulary import SimpleTerm
@@ -57,5 +57,5 @@ def getTermByToken(self, token):
             v = super().getTermByToken(token)
         except LookupError:
             # fallback using dummy term, assumes token==value
-            return SimpleTerm(token, title=parse(token))
+            return SimpleTerm(token, title=unquote(token))
         return v

plone/app/vocabularies/types.py

@@ -280,11 +280,13 @@ class ReallyUserFriendlyTypesVocabulary:
     Containment is unenforced, to make GenericSetup import validation
     handle validation triggered by Choice.fromUnicode() on insertion:
 
-        >>> assert 'arbitrary_value' in util(context)
+        >>> non_friendly_type = types.getTermByToken('Plone Site')
+        >>> non_friendly_type.title, non_friendly_type.token
+        ('Plone Site', 'Plone Site')
 
         >>> doc = types.by_token['Document']
         >>> doc.title, doc.token, doc.value
-        (u'Page', 'Document', 'Document')
+        ('Page', 'Document', 'Document')
     """
 
     def __call__(self, context):