From 25ef2ad18406840083ea730935758b96064b4d95 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Tue, 8 Jul 2014 14:37:12 +0000
Subject: [PATCH] Some cleanup of the alias generation scripts.  - Legacy-Id:
 8056

---
 ietf/bin/generate-draft-aliases | 12 +-----------
 ietf/bin/generate-wg-aliases    |  3 ---
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/ietf/bin/generate-draft-aliases b/ietf/bin/generate-draft-aliases
index 94c84b304..6cab455cf 100755
--- a/ietf/bin/generate-draft-aliases
+++ b/ietf/bin/generate-draft-aliases
@@ -111,25 +111,15 @@ if __name__ == '__main__':
 
     interesting_drafts = active_drafts | inactive_recent_drafts
 
-    count = 0
     for draft in interesting_drafts.distinct().iterator():
         # Omit RFCs, we care only about drafts
         if draft.docalias_set.filter(name__startswith='rfc'):
             continue
 
-        count += 1
-        if (count % 100) == 0:
-            sys.stderr.write('.')            
         alias = draft.name
         all = []
         def handle_sublist(afile, vfile, alias, emails):
-            try:
-                all.extend( dump_sublist(afile, vfile, alias, emails) )
-            except TypeError:
-                import debug
-                debug.show('alias')
-                debug.show('emails')
-                raise
+            all.extend( dump_sublist(afile, vfile, alias, emails) )
         #.authors (/and no suffix) = authors
         # First, do no suffix case
         handle_sublist(afile, vfile, alias,             get_draft_authors_emails(draft))
diff --git a/ietf/bin/generate-wg-aliases b/ietf/bin/generate-wg-aliases
index 9c9cbf831..3fc6b801f 100755
--- a/ietf/bin/generate-wg-aliases
+++ b/ietf/bin/generate-wg-aliases
@@ -57,7 +57,6 @@ if __name__ == '__main__':
 
     wgs = Group.objects.filter(type='wg').all()
 
-    print '# WGs'
     # - status = Active
     active_wgs = wgs.filter(state__in=ACTIVE_STATES)
 
@@ -70,7 +69,6 @@ if __name__ == '__main__':
         dump_sublist(afile, vfile, name+'-ads'   , get_group_ads_emails(wg))
         dump_sublist(afile, vfile, name+'-chairs', get_group_chairs_emails(wg))
 
-    print '# RGs'
     # - status = Active
     rgs = Group.objects.filter(type='rg').all()
     active_rgs = rgs.filter(state__in=ACTIVE_STATES)
@@ -86,7 +84,6 @@ if __name__ == '__main__':
 
     # Additionally, for areaz, we should list -ads and -chairs
     # (for every chair in active groups within the area).
-    print '# Areas'
     areas = Group.objects.filter(type='area').all()
     active_areas = areas.filter(state__in=ACTIVE_STATES)
     for area in active_areas: