From: Jason Kirtland <jek@discorporate.us>
Date: Sat, 9 Feb 2008 18:45:11 +0000 (+0000)
Subject: - Determine the basic collection interface dynamically when adapting a collection... 
X-Git-Tag: rel_0_4_3~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2269bee87fe905d2b6f608fa32cf1d35b6e7646f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Determine the basic collection interface dynamically when adapting a collection to an interable
---

diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py
index f2b726b4c4..5f701bccc4 100644
--- a/lib/sqlalchemy/orm/collections.py
+++ b/lib/sqlalchemy/orm/collections.py
@@ -504,11 +504,13 @@ class CollectionAdapter(object):
             return converter(obj)
 
         setting_type = sautil.duck_type_collection(obj)
+        receiving_type = sautil.duck_type_collection(self._data())
 
-        if obj is None or setting_type != self.attr.collection_interface:
+        if obj is None or setting_type != receiving_type:
             raise TypeError(
                 "Incompatible collection type: %s is not %s-like" %
-                (type(obj).__name__, self.attr.collection_interface.__name__))
+                (type(obj).__class__.__name__,
+                 receiving_type.__class__.__name__))
 
         # If the object is an adapted collection, return the (iterable) adapter.
         if getattr(obj, '_sa_adapter', None) is not None: