# HG changeset patch
# User Damien Correia
# Date 1529064722 -7200
# Node ID 6d2469d780f76893091d6c519cb2188ad32e22ac
# Parent  b63d9050929da873deca3794b4cabc036b3d6da8# Parent  00af28a2352dc1643ad77c217f34aca71ac5cf57
merge default

diff -r b63d9050929d -r 6d2469d780f7 src/pyams_utils/adapter.py
--- a/src/pyams_utils/adapter.py	Thu Jun 14 17:49:54 2018 +0200
+++ b/src/pyams_utils/adapter.py	Fri Jun 15 14:12:02 2018 +0200
@@ -27,6 +27,8 @@
 
 import venusian
 
+from inspect import isclass
+
 # import interfaces
 from zope.annotation.interfaces import IAnnotations
 
@@ -158,7 +160,7 @@
         elif factory is None:
             return None
         else:
-            if issubclass(factory, Interface):
+            if isclass(factory) and issubclass(factory, Interface):
                 factory = get_object_factory(factory)
                 assert factory is not None, "Missing object factory"
             adapter = annotations[key] = factory()