From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 28 Mar 2010 16:22:40 +0000 (-0400)
Subject: fix some examples
X-Git-Tag: rel_0_6beta3~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb766e69bd2fa2811de127a69ad33d507621bff7;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix some examples
---

diff --git a/examples/association/basic_association.py b/examples/association/basic_association.py
index 7e94ef7fed..9c280d7ea7 100644
--- a/examples/association/basic_association.py
+++ b/examples/association/basic_association.py
@@ -101,7 +101,7 @@ print [(order_item.item.description, order_item.price)
        for order_item in order.order_items]
 
 # print customers who bought 'MySQL Crowbar' on sale
-q = session.query(Order).join(['order_items', 'item'])
+q = session.query(Order).join('order_items', 'item')
 q = q.filter(and_(Item.description == 'MySQL Crowbar',
                   Item.price > OrderItem.price))
 
diff --git a/examples/association/proxied_association.py b/examples/association/proxied_association.py
index 3139b09736..ac258121ed 100644
--- a/examples/association/proxied_association.py
+++ b/examples/association/proxied_association.py
@@ -100,6 +100,6 @@ print [(item.description, item.price)
        for item in order.items]
 
 # print customers who bought 'MySQL Crowbar' on sale
-orders = session.query(Order).join(['itemassociations', 'item']).filter(
+orders = session.query(Order).join('itemassociations', 'item').filter(
     and_(Item.description=='MySQL Crowbar', Item.price > OrderItem.price))
 print [order.customer_name for order in orders]
diff --git a/examples/custom_attributes/custom_management.py b/examples/custom_attributes/custom_management.py
index 0ffd0db4bc..4d135edcd6 100644
--- a/examples/custom_attributes/custom_management.py
+++ b/examples/custom_attributes/custom_management.py
@@ -118,16 +118,16 @@ class MyCollectionAdapter(object):
 
     def fire_append_event(self, item, initiator=None):
         if initiator is not False and item is not None:
-            self.state.get_impl(self.key).fire_append_event(self.state, item,
+            self.state.get_impl(self.key).fire_append_event(self.state, self.state.dict, item,
                                                             initiator)
 
     def fire_remove_event(self, item, initiator=None):
         if initiator is not False and item is not None:
-            self.state.get_impl(self.key).fire_remove_event(self.state, item,
+            self.state.get_impl(self.key).fire_remove_event(self.state, self.state.dict, item,
                                                             initiator)
 
     def fire_pre_remove_event(self, initiator=None):
-        self.state.get_impl(self.key).fire_pre_remove_event(self.state,
+        self.state.get_impl(self.key).fire_pre_remove_event(self.state, self.state.dict, 
                                                             initiator)
 
 class MyCollection(object):