Merge "Make ATC lists sort E-mails with preferred first"

tools/atc/email_stats.py

@@ -49,6 +49,15 @@ def get_account(accounts, num):
 def main():
     accounts = {}
 
+    for row in csv.reader(open('accounts.csv')):
+        num = int(row[-1])
+        name = row[1]
+        email = row[2]
+        a = get_account(accounts, num)
+        a.full_name = name
+        if email and email != '\\N':
+            a.emails.append(email)
+
     for row in csv.reader(open('emails.csv')):
         num, email, pw, external = row
         num = int(num)
@@ -67,12 +76,6 @@ def main():
                 raise Exception("Already a username")
             a.username = m.group(1)
 
-    for row in csv.reader(open('accounts.csv')):
-        num = int(row[-1])
-        name = row[1]
-        a = get_account(accounts, num)
-        a.full_name = name
-
     username_accounts = {}
     for a in accounts.values():
         username_accounts[a.username] = a