Refactor mail-merge slightly

diff --git a/mail-merge b/mail-merge
index f03baeac63b36e70c367cf653287ff7c0bd8460d..60bcefc3ed6c994be7c71821b0a371d1870c90c2 100755 (executable)
--- a/mail-merge
+++ b/mail-merge
@@ -1,10 +1,11 @@
 #!/usr/bin/python
 
-import sys
-import os
 import csv
+import os
 import smtplib
 import subprocess
+import sys
+
 
 sender_header = 'mail-merge-sender@mit.edu'
 smtp = None
@@ -34,13 +35,9 @@ cmd_funcs = (lambda: True, sendmail_cmd)
 setup_sendmail, sendmail = smtp_funcs
 setup_sendmail, sendmail = cmd_funcs
 
-if __name__=='__main__':
-    print "Syntax: $script $cc_addr $template $recipients"
-    setup_sendmail()
-    cc_addr = sys.argv[1]
-    email_file = sys.argv[2]
+def mail_merge(cc_addr, email_file, recipients_file):
     email = open(email_file, 'r').read()
-    reader = csv.reader(open(sys.argv[3]))
+    reader = csv.reader(open(recipients_file, 'r'))
     header = reader.next()
     print header
     for line in reader:
@@ -48,3 +45,11 @@ if __name__=='__main__':
         print dct
         text = email % dct
         sendmail([dct['email'], cc_addr, ], text, )
+
+if __name__=='__main__':
+    print "Syntax: $script $cc_addr $template $recipients"
+    setup_sendmail()
+    cc_addr = sys.argv[1]
+    email_file = sys.argv[2]
+    recipients_file = sys.argv[3]
+    mail_merge(cc_addr, email_file, recipients_file, )