# HG changeset patch # User Damien Correia # Date 1528882744 -7200 # Node ID 6a4a802b91a355c16cd4126f4f30de643ed32e24 # Parent a70ef9a05ea1254cbb04205cb87c0320caaeab7e# Parent 59bd282a06f8faddc4f14c7f6487037dd38c4239 merge default diff -r a70ef9a05ea1 -r 6a4a802b91a3 buildout.cfg --- a/buildout.cfg Mon Jun 11 16:13:37 2018 +0200 +++ b/buildout.cfg Wed Jun 13 11:39:04 2018 +0200 @@ -96,4 +96,4 @@ eggs = pyams_utils [test] [versions] -pyams_utils = 0.1.15 +pyams_utils = 0.1.16 diff -r a70ef9a05ea1 -r 6a4a802b91a3 setup.py --- a/setup.py Mon Jun 11 16:13:37 2018 +0200 +++ b/setup.py Wed Jun 13 11:39:04 2018 +0200 @@ -25,7 +25,7 @@ README = os.path.join(DOCS, 'README.txt') HISTORY = os.path.join(DOCS, 'HISTORY.txt') -version = '0.1.15' +version = '0.1.16' long_description = open(README).read() + '\n\n' + open(HISTORY).read() tests_require = [ diff -r a70ef9a05ea1 -r 6a4a802b91a3 src/pyams_utils/adapter.py --- a/src/pyams_utils/adapter.py Mon Jun 11 16:13:37 2018 +0200 +++ b/src/pyams_utils/adapter.py Wed Jun 13 11:39:04 2018 +0200 @@ -159,6 +159,8 @@ else: adapter = annotations[key] = factory() if markers: + if not isinstance(markers, (list, tuple, set)): + markers = {markers} for marker in markers: alsoProvides(adapter, marker) if notify: