From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 8 Sep 2014 17:01:43 +0000 (-0400)
Subject: - check for None linker...
X-Git-Tag: rel_1_0_0b1~194^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4996d4f5432657639798c1b286ee811a36e2a10;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- check for None linker...
---

diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index 459a525392..2b4c3ec750 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -863,7 +863,7 @@ class CollectionAttributeImpl(AttributeImpl):
         self.copy = copy_function
         self.collection_factory = typecallable
 
-        if hasattr(self.collection_factory, "_sa_linker"):
+        if getattr(self.collection_factory, "_sa_linker", None):
 
             @event.listens_for(self, "init_collection")
             def link(target, collection, collection_adapter):