Applied .append(x, **kw) removal patch from [ticket:1124] and general cleanup.

diff --git a/examples/association/proxied_association.py b/examples/association/proxied_association.py
index f7dd45c4aee4a714661511a8fac1aeffe657e17a..ccd092f9576a581788bd5691aef65795dc59a976 100644 (file)
--- a/examples/association/proxied_association.py
+++ b/examples/association/proxied_association.py
@@ -1,43 +1,40 @@
-"""this is a modified version of the basic association example, which illustrates 
+"""this is a modified version of the basic association example, which illustrates
 the usage of the associationproxy extension."""
 
+from datetime import datetime
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.ext.selectresults import SelectResults
 from sqlalchemy.ext.associationproxy import AssociationProxy
-from datetime import datetime
-
-import logging
-logging.basicConfig(format='%(message)s')
-#logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)
 
 engine = create_engine('sqlite://')
+#engine = create_engine('sqlite://', echo=True)
 metadata = MetaData(engine)
 
-orders = Table('orders', metadata, 
+orders = Table('orders', metadata,
     Column('order_id', Integer, primary_key=True),
     Column('customer_name', String(30), nullable=False),
-    Column('order_date', DateTime, nullable=False, default=datetime.now()),
-    )
+    Column('order_date', DateTime, nullable=False, default=datetime.now))
 
 items = Table('items', metadata,
     Column('item_id', Integer, primary_key=True),
     Column('description', String(30), nullable=False),
-    Column('price', Float, nullable=False)
-    )
+    Column('price', Float, nullable=False))
 
 orderitems = Table('orderitems', metadata,
-    Column('order_id', Integer, ForeignKey('orders.order_id'), primary_key=True),
-    Column('item_id', Integer, ForeignKey('items.item_id'), primary_key=True),
-    Column('price', Float, nullable=False)
-    )
+    Column('order_id', Integer, ForeignKey('orders.order_id'),
+           primary_key=True),
+    Column('item_id', Integer, ForeignKey('items.item_id'),
+           primary_key=True),
+    Column('price', Float, nullable=False))
+
 metadata.create_all()
 
 class Order(object):
     def __init__(self, customer_name):
         self.customer_name = customer_name
-    items = AssociationProxy('itemassociations', 'item', creator=lambda x, **kw:OrderItem(x, **kw))
-    
+    items = AssociationProxy('itemassociations', 'item',
+                             creator=lambda x: OrderItem(x))
+
 class Item(object):
     def __init__(self, description, price):
         self.description = description
@@ -46,8 +43,8 @@ class Item(object):
 class OrderItem(object):
     def __init__(self, item, price=None):
         self.item = item
-        self.price = price or item.price
-        
+        self.price = price is None and item.price or price
+
 mapper(Order, orders, properties={
     'itemassociations':relation(OrderItem, cascade="all, delete-orphan", lazy=False)
 })
@@ -59,31 +56,29 @@ mapper(OrderItem, orderitems, properties={
 session = create_session()
 
 # create our catalog
-session.save(Item('SA T-Shirt', 10.99))
-session.save(Item('SA Mug', 6.50))
-session.save(Item('SA Hat', 8.99))
-session.save(Item('MySQL Crowbar', 16.99))
+session.add_all([Item('SA T-Shirt', 10.99),
+                 Item('SA Mug', 6.50),
+                 Item('SA Hat', 8.99),
+                 Item('MySQL Crowbar', 16.99)])
 session.flush()
 
 # function to return items
 def item(name):
     return session.query(Item).filter_by(description=name).one()
-    
+
 # create an order
 order = Order('john smith')
 
-# append an OrderItem association via the "itemassociations" collection
+# append an OrderItem association via the "itemassociations"
+# collection with a custom price.
 order.itemassociations.append(OrderItem(item('MySQL Crowbar'), 10.99))
 
 # append two more Items via the transparent "items" proxy, which
-# will create OrderItems automatically
+# will create OrderItems automatically using the default price.
 order.items.append(item('SA Mug'))
 order.items.append(item('SA Hat'))
 
-# now append one more item, overriding the price
-order.items.append(item('SA T-Shirt'), price=2.99)
-
-session.save(order)
+session.add(order)
 session.flush()
 
 session.clear()
@@ -91,26 +86,18 @@ session.clear()
 # query the order, print items
 order = session.query(Order).filter_by(customer_name='john smith').one()
 
+print "Order #%s:\n%s\n%s\n%s items.\n" % (
+    order.order_id, order.customer_name, order.order_date, len(order.items))
+
 # print items based on the OrderItem collection directly
-print [(item.item.description, item.price) for item in order.itemassociations]
+print [(assoc.item.description, assoc.price, assoc.item.price)
+       for assoc in order.itemassociations]
 
 # print items based on the "proxied" items collection
-print [(item.description, item.price) for item in order.items]
+print [(item.description, item.price)
+       for item in order.items]
 
 # print customers who bought 'MySQL Crowbar' on sale
-result = session.query(Order).join(['itemassociations', 'item']).filter(and_(Item.description=='MySQL Crowbar', Item.price>OrderItem.price))
-print [order.customer_name for order in result]
-
-# print customers who got the special T-shirt discount
-result = session.query(Order).join(['itemassociations', 'item']).filter(and_(Item.description=='SA T-Shirt', Item.price>OrderItem.price))
-print [order.customer_name for order in result]
-
-
-
-
-
-
-
-
-
-
+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]