Changeset 82afa57

Timestamp:

Feb 2, 2010, 2:07:38 AM (16 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

07daa76

Parents:

1732748

git-author:

Alex Dehnert <adehnert@…> (02/02/10 02:07:38)

git-committer:

Alex Dehnert <adehnert@…> (02/02/10 02:07:38)

Message:

Purge UA from import_budget

File:

• treasury/vouchers/import_budget.py (modified) (5 diffs)

treasury/vouchers/import_budget.py

@@ -5 +5 @@
 import vouchers.models
 import finance_core.models
-from django.db import connection
 from finance_core.models import BudgetArea
 from finance_core.models import coerce_full_email
@@ -25 +24 @@
     return committees
 
-def do_populate_area_structure():
+def do_populate_area_structure(default_addr):
     nodes = [
         [ ('Accounts', 'Root',) ],
@@ -48 +47 @@
                     BudgetArea.add_root(name=name, comment=comment,
                         always=True, use_owner=True,
-                        owner='ua-treasurer@mit.edu',
-                        interested='ua-treasurer@mit.edu',
+                        owner=default_addr,
+                        interested=default_addr,
                         account_number=0,
                     )
@@ -57 +56 @@
     return (depth, )
 
-def do_populate_committees(committees):
-    (depth,) = do_populate_area_structure()
+def do_populate_committees(default_addr, committees):
+    (depth,) = do_populate_area_structure(default_addr, )
     core = BudgetArea.objects.get(name='Core', depth=depth)
     comms = BudgetArea.objects.get(name='Committees', depth=depth)
@@ -123 +122 @@
 
 
-def main(committees_file, budget_file, term_name, ):
+def main(default_addr, committees_file, budget_file, term_name, ):
     term = vouchers.models.BudgetTerm.objects.get(name=term_name)
     committees = build_committees(committees_file,)
-    (depth, ) = do_populate_committees(committees)
+    (depth, ) = do_populate_committees(default_addr, committees)
     do_process_rows(committees, budget_file, term, depth)
-
-
-def spring_2010():
-    committee_file = open('/mit/ua/officers/treasurer/resources/software/committees.csv')
-    budget_file = open('/mit/ua/officers/treasurer/budgeting/FY10/private/spring-working.csv')
-    term_name = 'Spring 2010'
-    main(committee_file, budget_file, term_name, )
-    print connection.queries
-
-
-if __name__== '__main__':
-    #print "Syntax: %s committee_file format_file budget_file budget_term [override_address]" % (sys.argv[0], )
-    spring_2010()