- Fixed typo blocking some assoc proxy dict assignments, added test

2 files changed, 4 insertions, 1 deletions

diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py
index 1b363c9ac..cdb814702 100644
--- a/lib/sqlalchemy/ext/associationproxy.py
+++ b/lib/sqlalchemy/ext/associationproxy.py
@@ -189,7 +189,7 @@ class AssociationProxy(object):
             return _AssociationList(lazy_collection, creator, getter, setter)
         elif self.collection_class is dict:
             kv_setter = lambda o, k, v: setattr(o, value_attr, v)
-            return _AssociationDict(lazy_collection, creator, getter, setter)
+            return _AssociationDict(lazy_collection, creator, getter, kv_setter)
         elif self.collection_class is util.Set:
             return _AssociationSet(lazy_collection, creator, getter, setter)
         else:
diff --git a/test/ext/associationproxy.py b/test/ext/associationproxy.py
index e095d285e..4935f4b6e 100644
--- a/test/ext/associationproxy.py
+++ b/test/ext/associationproxy.py
@@ -218,6 +218,9 @@ class CustomDictTest(DictTest):
         self.assert_(len(p1._children) == 3)
         self.assert_(len(p1.children) == 3)
 
+        p1.children['d'] = 'new d'
+        assert p1.children['d'] == 'new d'
+
         p1._children = {}
         self.assert_(len(p1.children) == 0)