Made ietf/wginfo pyflakes-clean, and fixed some potential issues in ietf/wginfo/mails.py.

- Legacy-Id: 7494

ietf/wginfo/edit.py

@@ -1,25 +1,28 @@
 # edit/create view for WGs
 
-import re, os, datetime, shutil
+import re
+import os
+import datetime
+import shutil
 
+from django import forms
 from django.shortcuts import render_to_response, get_object_or_404, redirect
 from django.http import HttpResponseForbidden
 from django.template import RequestContext
-from django import forms
 from django.utils.html import mark_safe
+from django.http import Http404, HttpResponse
 
 import debug                            # pyflakes:ignore
 
-from ietf.ietfauth.utils import role_required, has_role
-
-from ietf.doc.models import *
-from ietf.name.models import *
-from ietf.person.models import *
-from ietf.group.models import *
-from ietf.group.utils import save_group_in_history
-from ietf.wginfo.mails import email_secretariat
-from ietf.person.forms import EmailsField
+from ietf.doc.models import DocAlias, DocTagName, Document, State, save_document_in_history
 from ietf.doc.utils import get_tags_for_stream_id
+from ietf.group.models import ( Group, Role, GroupEvent, GroupHistory, GroupStateName,
+    GroupStateTransitions, GroupTypeName, GroupURL, ChangeStateGroupEvent )
+from ietf.group.utils import save_group_in_history
+from ietf.ietfauth.utils import role_required, has_role
+from ietf.person.forms import EmailsField
+from ietf.person.models import Person, Email
+from ietf.wginfo.mails import email_secretariat
 
 MAX_GROUP_DELEGATES = 3
 
@@ -274,7 +277,6 @@ def edit(request, acronym=None, action="edit"):
             return redirect('group_charter', acronym=wg.acronym)
     else: # form.is_valid()
         if not new_wg:
-            from ietf.person.forms import json_emails
             init = dict(name=wg.name,
                         acronym=wg.acronym,
                         state=wg.state,

ietf/wginfo/feeds.py

@@ -1,8 +1,5 @@
 # Copyright The IETF Trust 2011, All Rights Reserved
 
-import datetime, re, os
-
-from django.conf import settings
 from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed
 from django.core.urlresolvers import reverse as urlreverse

ietf/wginfo/mails.py

@@ -1,8 +1,9 @@
 # generation of mails 
 
-import textwrap, datetime, re
+import datetime
+import re
+
 
-from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 from django.utils.text import wrap
 from django.conf import settings
@@ -10,14 +11,14 @@ from django.core.urlresolvers import reverse as urlreverse
 
 from ietf.utils.mail import send_mail, send_mail_text
 
-from ietf.group.models import *
+from ietf.group.models import Group
 
 def email_secretariat(request, group, subject, text):
     to = ["iesg-secretary@ietf.org"]
     full_subject = u"Regarding %s %s: %s" % (group.type.name, group.acronym, subject)
     text = strip_tags(text)
 
-    send_mail(request, to, None, subject,
+    send_mail(request, to, None, full_subject,
               "wginfo/email_secretariat.txt",
               dict(text=text,
                    group=group,
@@ -60,7 +61,7 @@ def email_milestone_review_reminder(group, grace_period=7):
         return False
 
     to = [group.ad.role_email("ad").formatted_email()]
-    cc = [r.formatted_email() for r in group.role_set.filter(name="chair")]
+    #cc = [r.formatted_email() for r in group.role_set.filter(name="chair")]
 
     now = datetime.datetime.now()
     too_early = True

ietf/wginfo/milestones.py

@@ -1,20 +1,20 @@
 # WG milestone editing views
 
-import re, os, string, datetime, shutil, calendar, json
+import datetime
+import calendar
+import json
 
-from django.shortcuts import render_to_response, get_object_or_404, redirect
-from django.template import RequestContext
 from django import forms
 from django.http import HttpResponse, HttpResponseForbidden, HttpResponseBadRequest
-from django.utils.html import mark_safe, escape
-from django.utils.functional import lazy
-from django.core.urlresolvers import reverse as urlreverse
+from django.shortcuts import render_to_response, get_object_or_404, redirect
+from django.template import RequestContext
 
-from ietf.ietfauth.utils import role_required, has_role
 from ietf.doc.models import Document, DocEvent
 from ietf.doc.utils import get_chartering_type
-from ietf.group.models import *
-from ietf.group.utils import save_group_in_history, save_milestone_in_history
+from ietf.group.models import Group, GroupMilestone, MilestoneGroupEvent
+from ietf.group.utils import save_milestone_in_history
+from ietf.ietfauth.utils import role_required, has_role
+from ietf.name.models import GroupMilestoneStateName
 from ietf.wginfo.mails import email_milestones_changed
 
 def json_doc_names(docs):
@@ -68,7 +68,7 @@ class MilestoneForm(forms.Form):
         # set choices for due date
         this_year = datetime.date.today().year
 
-        self.fields["due_month"].choices = [(m, datetime.date(this_year, m, 1).strftime("%B")) for m in range(1, 13)]
+        self.fields["due_month"].choices = [(month, datetime.date(this_year, month, 1).strftime("%B")) for month in range(1, 13)]
 
         years = [ y for y in range(this_year, this_year + 10)]
 

ietf/wginfo/tests.py

@@ -1,21 +1,27 @@
-import os, unittest, shutil, calendar, json
-
-from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
-from ietf.utils.mail import outbox
-from ietf.utils.test_data import make_test_data
-from ietf.utils.test_utils import login_testing_unauthorized
-from ietf.utils import TestCase
+import os
+import shutil
+import calendar
+import json
+import datetime
 
 from pyquery import PyQuery
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import *
-from ietf.group.models import *
-from ietf.group.utils import *
-from ietf.name.models import *
-from ietf.person.models import *
-from ietf.wginfo.mails import *
+from django.conf import settings
+from django.core.urlresolvers import reverse as urlreverse
+
+from ietf.doc.models import Document, DocAlias, DocEvent, State
+from ietf.group.models import Group, GroupEvent, GroupMilestone, GroupStateTransitions, MilestoneGroupEvent
+from ietf.group.utils import save_group_in_history
+from ietf.name.models import DocTagName, GroupStateName
+from ietf.person.models import Person, Email
+from ietf.utils import TestCase
+from ietf.utils.mail import outbox
+from ietf.utils.test_data import make_test_data
+from ietf.utils.test_utils import login_testing_unauthorized
+from ietf.wginfo.mails import ( email_milestone_review_reminder, email_milestones_due,
+    email_milestones_overdue, groups_needing_milestones_due_reminder,
+    groups_needing_milestones_overdue_reminder, groups_with_milestones_needing_review )
 
 class GroupPagesTests(TestCase):
     def setUp(self):
@@ -353,13 +359,6 @@ class GroupEditTests(TestCase):
                                   list_archive="archive.mars",
                                   urls="http://mars.mars (MARS site)"
                                   ))
-        if not r.status_code == 302:
-            for line in r.content.splitlines():
-                label = ""
-                if "label" in line:
-                    label = line
-                if 'class="errorlist"' in line:
-                    label = ""
         self.assertEqual(r.status_code, 302)
 
         group = Group.objects.get(acronym="mars")
@@ -548,7 +547,6 @@ class MilestoneTests(TestCase):
         self.assertEqual(r.status_code, 200)
 
         events_before = group.groupevent_set.count()
-        due = self.last_day_of_month(datetime.date.today() + datetime.timedelta(days=365))
 
         # add
         r = self.client.post(url, { 'prefix': "m1",
@@ -678,7 +676,7 @@ class MilestoneTests(TestCase):
         self.assertEqual(group.charter.docevent_set.count(), events_before + 2) # 1 delete, 1 add
 
     def test_send_review_needed_reminders(self):
-        draft = make_test_data()
+        make_test_data()
 
         group = Group.objects.get(acronym="mars")
         person = Person.objects.get(user__username="marschairman")
@@ -723,10 +721,9 @@ class MilestoneTests(TestCase):
         self.assertTrue(m2.desc in unicode(outbox[-1]))
 
     def test_send_milestones_due_reminders(self):
-        draft = make_test_data()
+        make_test_data()
 
         group = Group.objects.get(acronym="mars")
-        person = Person.objects.get(user__username="marschairman")
 
         early_warning_days = 30
 
@@ -768,10 +765,9 @@ class MilestoneTests(TestCase):
         self.assertTrue(m2.desc in unicode(outbox[-1]))
 
     def test_send_milestones_overdue_reminders(self):
-        draft = make_test_data()
+        make_test_data()
 
         group = Group.objects.get(acronym="mars")
-        person = Person.objects.get(user__username="marschairman")
 
         # due dates here aren't aligned on the last day of the month,
         # but everything should still work

ietf/wginfo/urls.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2008, All Rights Reserved
 
-from django.conf.urls import patterns, include
+from django.conf.urls import patterns
 from django.views.generic import RedirectView
 
 from ietf.wginfo import views, edit, milestones

ietf/wginfo/views.py

@@ -45,7 +45,7 @@ from django.core.urlresolvers import reverse as urlreverse
 from django.db.models import Q
 
 from ietf.doc.views_search import SearchForm, retrieve_search_results
-from ietf.group.models import Group, GroupURL, Role
+from ietf.group.models import Group, Role
 from ietf.doc.models import State, DocAlias, RelatedDocument
 from ietf.doc.utils import get_chartering_type
 from ietf.group.utils import get_charter_text