Changeset 093448c

Timestamp:

Apr 29, 2015, 9:41:07 PM (11 years ago)

Author:

ASA Group Database <asa-db@…>

Branches:

master, stable

Children:

798afa8

Parents:

356174b

git-author:

Alex Dehnert <adehnert@…> (04/29/15 21:37:49)

git-committer:

ASA Group Database <asa-db@…> (04/29/15 21:41:07)

Message:

Make listdiff diff the GSC and UA Finboard lists too

Location:

asadb

Files:

• groups/listdiff.py (modified) (1 diff)
• util/mailinglist.py (modified) (1 diff)

asadb/groups/listdiff.py

@@ -20 +20 @@
     funded_groups = active_groups.filter(group_class__slug='mit-funded')
     return (
-        #(
-        #    util.mailinglist.MoiraList('finboard-groups-only'),
-        #    funded_groups.filter(group_funding__slug='undergrad'),
-        #),
-        #(
-        #    util.mailinglist.MailmanList('gsc-fb-'),
-        #    funded_groups.filter(group_funding__slug='grad'),
-        #),
+        (
+            util.mailinglist.MoiraList('finboard-groups-only'),
+            funded_groups.filter(group_funding__slug='undergrad'),
+            None,
+        ),
+        (
+            util.mailinglist.MailmanList('gsc-fb-'),
+            funded_groups.filter(group_funding__slug='grad'),
+            None,
+        ),
         (
             util.mailinglist.MailmanList('asa-official'),

asadb/util/mailinglist.py

@@ -28 +28 @@
 
     def list_members(self, ):
-        raise NotImplementedError
+        env = dict(KRB5CCNAME=self.ccache.name)
         res = subprocess.Popen(
             [BLANCHE_PATH, self.name, ],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            env=env,
         )
         stdout, stderr = res.communicate()
         if res.returncode:
             raise RuntimeError("Failed to list members: %s" % (stderr, ))
-        members = stdout.strip().split("\n")
+        members = [self.convert_moira_to_email(m) for m in stdout.strip().split("\n")]
         return members
+
+    def convert_moira_to_email(self, email):
+        typ, colon, val = email.partition(":")
+        if typ in ('STRING', 'USER', 'LIST'):
+            email = val + "@mit.edu"
+        # Leave untouched: KERBEROS (shouldn't exist), untagged strings
+        assert email.count('@') == 1, "%s has wrong number of @'s" % (email, )
+        return email
 
     def strip_mit(self, email):