X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fmodel%2F__init__.py;h=49d6046f56a3d3b26359112c073ca0bcf18d8364;hb=8bfdfc2600a85b1b8935f434bce64dc3c5cbfc06;hp=a25f1d12df768e845a426a76321c4671d4e4734a;hpb=e6327295659555afc592537194c38812ab107f26;p=bluechips.git

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index a25f1d1..49d6046 100644
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -2,11 +2,11 @@
 import sqlalchemy as sa
 from sqlalchemy import orm
 
-from user import *
-from expenditure import *
-from split import *
-from subitem import *
-from transfer import *
+from bluechips.model.user import User
+from bluechips.model.expenditure import Expenditure
+from bluechips.model.split import Split
+from bluechips.model.subitem import Subitem
+from bluechips.model.transfer import Transfer
 
 from bluechips.model import meta
 from bluechips.model import types
@@ -77,8 +77,7 @@ transfers = sa.Table('transfers', meta.metadata,
 orm.mapper(User, users,
            properties={
         'expenditures': orm.relation(Expenditure,
-                                     backref='spender',
-                                     lazy=False)
+                                     backref='spender')
 })
 
 orm.mapper(Expenditure, expenditures, order_by=expenditures.c.date.desc(),
@@ -101,12 +100,10 @@ orm.mapper(Transfer, transfers, order_by=transfers.c.date.desc(),
            properties={
         'debtor': orm.relation(User,
                                primaryjoin=(transfers.c.debtor_id==\
-                                                users.c.id),
-                               lazy=False),
+                                                users.c.id)),
         'creditor': orm.relation(User,
                                  primaryjoin=(transfers.c.creditor_id==\
-                                                  users.c.id),
-                                 lazy=False)
+                                                  users.c.id))
 })
 
 __all__ = ['users', 'expenditures', 'splits', 'subitems', 'transfers',