A second pass of pyflakes cleanup, removing additional bulk imports, fixing a bug in get_initial_notify(), and removing some dead (and buggy) code.

- Legacy-Id: 7509

ietf/community/migrations/0002_add_display_config.py

@@ -1,7 +1,4 @@
-
 from south.db import db
-from django.db import models            # pyflakes:ignore
-from ietf.community.models import *     # pyflakes:ignore
 
 class Migration:
     

ietf/community/migrations/0003_add_notifications.py

@@ -1,7 +1,4 @@
-
 from south.db import db
-from django.db import models            # pyflakes:ignore
-from ietf.community.models import *     # pyflakes:ignore
 
 class Migration:
     

ietf/community/migrations/0004_refactor_notifications_with_docevent.py

@@ -1,7 +1,4 @@
-
 from south.db import db
-from django.db import models            # pyflakes:ignore
-from ietf.community.models import *     # pyflakes:ignore
 
 class Migration:
     

ietf/community/migrations/0005_auto__add_field_communitylist_secret.py

@@ -1,7 +1,4 @@
-
 from south.db import db
-from django.db import models            # pyflakes:ignore
-from ietf.community.models import *     # pyflakes:ignore
 
 class Migration:
     

ietf/community/migrations/0006_auto__add_field_communitylist_cached.py

@@ -1,7 +1,4 @@
-
 from south.db import db
-from django.db import models            # pyflakes:ignore
-from ietf.community.models import *     # pyflakes:ignore
 
 class Migration:
     

ietf/community/migrations/0007_auto__add_unique_rule_community_list_rule_type_value.py

@@ -1,8 +1,5 @@
-# encoding: utf-8
-import datetime                         # pyflakes:ignore
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models            # pyflakes:ignore
 
 class Migration(SchemaMigration):
 

ietf/doc/models.py

@@ -1,18 +1,21 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
+import datetime, os
+
 from django.db import models
 from django.core.urlresolvers import reverse as urlreverse
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
 from django.utils.html import mark_safe
 
+import debug                            # pyflakes:ignore
+
 from ietf.group.models import Group
-from ietf.name.models import *          # pyflakes:ignore
+from ietf.name.models import ( DocTypeName, DocTagName, StreamName, IntendedStdLevelName, StdLevelName,
+    DocRelationshipName, DocReminderTypeName, BallotPositionName )
 from ietf.person.models import Email, Person
 from ietf.utils.admin import admin_link
 
-import datetime, os
-import debug                            # pyflakes:ignore
 
 class StateType(models.Model):
     slug = models.CharField(primary_key=True, max_length=30) # draft, draft-iesg, charter, ...
@@ -164,8 +167,6 @@ class RelatedDocument(models.Model):
     relationship = models.ForeignKey(DocRelationshipName)
     def action(self):
         return self.relationship.name
-    def inverse_action():
-        return self.relationship.revname
     def __unicode__(self):
         return u"%s %s %s" % (self.source.name, self.relationship.name.lower(), self.target.name)
 

ietf/doc/tests.py

@@ -8,12 +8,13 @@ from pyquery import PyQuery
 
 from django.core.urlresolvers import reverse as urlreverse
 
-from ietf.doc.models import *           # pyflakes:ignore
-from ietf.name.models import *          # pyflakes:ignore
-
+from ietf.doc.models import ( Document, DocAlias, DocRelationshipName, RelatedDocument, State,
+    DocEvent, BallotPositionDocEvent, LastCallDocEvent, WriteupDocEvent )
+from ietf.group.models import Group
+from ietf.person.models import Person
 from ietf.utils.mail import outbox
-from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils.test_data import make_test_data
+from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils.test_utils import TestCase
 
 class SearchTestCase(TestCase):

ietf/doc/tests_ballot.py

@@ -1,11 +1,12 @@
 import datetime
 from pyquery import PyQuery
+
 import debug                            # pyflakes:ignore
 
 from django.core.urlresolvers import reverse as urlreverse
 
-from ietf.doc.models import *           # pyflakes:ignore
-
+from ietf.doc.models import ( Document, State, DocEvent, BallotDocEvent,
+    BallotPositionDocEvent, LastCallDocEvent, WriteupDocEvent )
 from ietf.group.models import Group, Role
 from ietf.name.models import BallotPositionName
 from ietf.person.models import Person

ietf/doc/tests_charter.py

@@ -7,8 +7,8 @@ from pyquery import PyQuery
 from django.conf import settings
 from django.core.urlresolvers import reverse as urlreverse
 
-from ietf.doc.models import *           # pyflakes:ignore
-
+from ietf.doc.models import ( Document, State, BallotDocEvent, BallotType, NewRevisionDocEvent,
+    TelechatDocEvent, WriteupDocEvent )
 from ietf.doc.utils_charter import next_revision, default_review_text, default_action_text
 from ietf.group.models import Group, GroupMilestone
 from ietf.iesg.models import TelechatDate

ietf/doc/tests_draft.py

@@ -9,8 +9,8 @@ from django.conf import settings
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import *           # pyflakes:ignore
-
+from ietf.doc.models import ( Document, DocAlias, DocReminder, DocumentAuthor, DocEvent,
+    ConsensusDocEvent, LastCallDocEvent, RelatedDocument, State, TelechatDocEvent, WriteupDocEvent )
 from ietf.doc.utils import get_tags_for_stream_id
 from ietf.name.models import StreamName, IntendedStdLevelName, DocTagName
 from ietf.group.models import Group

ietf/doc/tests_status_change.py

@@ -8,8 +8,8 @@ from textwrap import wrap
 from django.conf import settings
 from django.core.urlresolvers import reverse as urlreverse
 
-from ietf.doc.models import *           # pyflakes:ignore
-
+from ietf.doc.models import ( Document, DocAlias, State, DocEvent,
+    BallotPositionDocEvent, NewRevisionDocEvent, TelechatDocEvent, WriteupDocEvent )
 from ietf.doc.utils import create_ballot_if_not_open
 from ietf.doc.views_status_change import default_approval_text
 from ietf.group.models import Person

ietf/doc/views_ballot.py

@@ -13,10 +13,13 @@ from django.conf import settings
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import *           # pyflakes:ignore
-from ietf.doc.utils import *            # pyflakes:ignore
-from ietf.doc.mails import *            # pyflakes:ignore
-
+from ietf.doc.models import ( Document, State, DocEvent, BallotDocEvent, BallotPositionDocEvent,
+    BallotType, LastCallDocEvent, WriteupDocEvent, save_document_in_history, IESG_SUBSTATE_TAGS )
+from ietf.doc.utils import ( add_state_change_event, close_ballot, close_open_ballots,
+    create_ballot_if_not_open, update_telechat )
+from ietf.doc.mails import ( email_ad, email_ballot_deferred, email_state_changed,
+    extra_automation_headers, generate_last_call_announcement, generate_issue_ballot_mail,
+    generate_ballot_writeup, generate_approval_mail )
 from ietf.doc.lastcall import request_last_call
 from ietf.iesg.models import TelechatDate
 from ietf.ietfauth.utils import has_role, role_required

ietf/doc/views_charter.py

@@ -12,19 +12,26 @@ from django.contrib import messages
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import *           # pyflakes:ignore
-from ietf.doc.utils import *            # pyflakes:ignore
-from ietf.doc.utils_charter import *    # pyflakes:ignore
-
+from ietf.doc.models import ( Document, DocHistory, State, DocEvent, BallotDocEvent,
+    BallotPositionDocEvent, InitialReviewDocEvent, NewRevisionDocEvent, TelechatDocEvent,
+    WriteupDocEvent, save_document_in_history )
+from ietf.doc.utils import ( add_state_change_event, close_open_ballots,
+    create_ballot_if_not_open, get_chartering_type, update_telechat )
+from ietf.doc.utils_charter import ( historic_milestones_for_charter,
+    approved_revision, default_review_text, default_action_text, email_state_changed,
+    generate_ballot_writeup, generate_issue_ballot_mail, next_approved_revision, next_revision )
 from ietf.group.models import ChangeStateGroupEvent, MilestoneGroupEvent
 from ietf.group.utils import save_group_in_history, save_milestone_in_history
 from ietf.iesg.models import TelechatDate
 from ietf.ietfauth.utils import has_role, role_required
+from ietf.name.models import GroupStateName
+from ietf.person.models import Person
 from ietf.utils.history import find_history_active_at
 from ietf.utils.mail import send_mail_preformatted
 from ietf.utils.textupload import get_cleaned_text_file_content
 from ietf.wginfo.mails import email_secretariat
 
+
 class ChangeStateForm(forms.Form):
     charter_state = forms.ModelChoiceField(State.objects.filter(used=True, type="charter", slug__in=["infrev", "intrev", "extrev", "iesgrev"]), label="Charter state", empty_label=None, required=False)
     initial_time = forms.IntegerField(initial=0, label="Review time", help_text="(in weeks)", required=False)

ietf/doc/views_conflict_review.py

@@ -8,9 +8,10 @@ from django.template import RequestContext
 from django.template.loader import render_to_string
 from django.conf import settings
 
-from ietf.doc.models import *           # pyflakes:ignore
-from ietf.doc.utils import *            # pyflakes:ignore
-
+from ietf.doc.models import ( BallotDocEvent, BallotPositionDocEvent, DocAlias, DocEvent,
+    Document, NewRevisionDocEvent, State, TelechatDocEvent, save_document_in_history )
+from ietf.doc.utils import ( add_state_change_event, close_open_ballots,
+    create_ballot_if_not_open, get_document_content, update_telechat )
 from ietf.doc.mails import email_iana
 from ietf.doc.forms import TelechatForm, AdForm, NotifyForm
 from ietf.group.models import Role, Group

ietf/doc/views_doc.py

@@ -43,9 +43,12 @@ from django.core.urlresolvers import reverse as urlreverse
 from django.conf import settings
 from django import forms
 
-from ietf.doc.models import *           # pyflakes:ignore
-from ietf.doc.utils import *            # pyflakes:ignore
-
+from ietf.doc.models import ( Document, DocAlias, DocHistory, DocEvent, BallotDocEvent,
+    ConsensusDocEvent, NewRevisionDocEvent, TelechatDocEvent, WriteupDocEvent,
+    IESG_BALLOT_ACTIVE_STATES)
+from ietf.doc.utils import ( add_links_in_new_revision_events, augment_events_with_revision,
+    can_adopt_draft, get_chartering_type, get_document_content, get_tags_for_stream_id,
+    needed_ballot_positions, nice_consensus, prettify_std_name)
 from ietf.community.models import CommunityList
 from ietf.doc.mails import email_ad
 from ietf.doc.views_status_change import RELATION_SLUGS as status_change_relationships

ietf/doc/views_draft.py

@@ -2,22 +2,28 @@
 
 import datetime, json
 
+from django import forms
 from django.http import HttpResponseRedirect, HttpResponseForbidden, Http404
 from django.shortcuts import render_to_response, get_object_or_404, redirect
 from django.template.loader import render_to_string
 from django.template import RequestContext
-from django import forms
 from django.conf import settings
 from django.forms.util import ErrorList
 from django.contrib.auth.decorators import login_required
 from django.template.defaultfilters import pluralize
 
-from ietf.doc.models import *           # pyflakes:ignore
-from ietf.doc.utils import *            # pyflakes:ignore
-from ietf.doc.mails import *            # pyflakes:ignore
-
+from ietf.doc.models import ( Document, DocAlias, DocRelationshipName, RelatedDocument, State,
+    StateType, DocEvent, ConsensusDocEvent, TelechatDocEvent, WriteupDocEvent, IESG_SUBSTATE_TAGS,
+    save_document_in_history )
+from ietf.doc.mails import ( email_ad, email_pulled_from_rfc_queue, email_resurrect_requested,
+    email_resurrection_completed, email_state_changed, email_stream_changed,
+    email_stream_state_changed, email_stream_tags_changed, extra_automation_headers,
+    generate_publication_request, html_to_text )
+from ietf.doc.utils import ( add_state_change_event, can_adopt_draft,
+    get_tags_for_stream_id, nice_consensus,
+    update_reminder, update_telechat )
 from ietf.doc.lastcall import request_last_call
-from ietf.group.models import Group
+from ietf.group.models import Group, Role
 from ietf.iesg.models import TelechatDate
 from ietf.ietfauth.utils import has_role, is_authorized_in_doc_stream, user_is_person
 from ietf.ietfauth.utils import role_required
@@ -505,7 +511,7 @@ def get_initial_notify(doc):
     else:
         receivers.append("%s-chairs@%s" % (doc.group.acronym, settings.TOOLS_SERVER))
         for editor in Email.objects.filter(role__name="editor", role__group=doc.group):
-            receivers.append(e.address)
+            receivers.append(editor.address)
 
     receivers.append("%s@%s" % (doc.name, settings.TOOLS_SERVER))
     return ", ".join(receivers)

ietf/doc/views_help.py

@@ -2,8 +2,8 @@ from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.http import Http404
 
-from ietf.doc.models import *           # pyflakes:ignore
-
+from ietf.doc.models import State, StateType, IESG_SUBSTATE_TAGS
+from ietf.name.models import DocRelationshipName,  DocTagName
 from ietf.doc.utils import get_tags_for_stream_id
 
 def state_help(request, type):

ietf/doc/views_search.py

@@ -38,17 +38,18 @@ from django.db.models import Q
 from django.template import RequestContext
 from django.http import Http404, HttpResponseBadRequest
 
-from ietf.doc.models import *           # pyflakes:ignore
-
-from ietf.doc.expire import expirable_draft
-from ietf.utils.draft_search import normalize_draftname
-#from ietf.person.models import *
-#from ietf.group.models import *
-from ietf.ipr.models import IprDocAlias
-from ietf.idindex.index import active_drafts_index_by_group
-
 import debug                            # pyflakes:ignore
 
+from ietf.doc.models import ( Document, DocAlias, State, RelatedDocument, DocEvent,
+    LastCallDocEvent, TelechatDocEvent, IESG_SUBSTATE_TAGS )
+from ietf.doc.expire import expirable_draft
+from ietf.group.models import Group
+from ietf.idindex.index import active_drafts_index_by_group
+from ietf.ipr.models import IprDocAlias
+from ietf.name.models import DocTagName, DocTypeName, StreamName
+from ietf.person.models import Person
+from ietf.utils.draft_search import normalize_draftname
+
 class SearchForm(forms.Form):
     name = forms.CharField(required=False)
     rfcs = forms.BooleanField(required=False, initial=True)

ietf/doc/views_status_change.py

@@ -8,9 +8,9 @@ from django.template import RequestContext
 from django.template.loader import render_to_string
 from django.conf import settings
 
-from ietf.doc.models import *           # pyflakes:ignore
-from ietf.name.models import *          # pyflakes:ignore
-
+from ietf.doc.models import ( Document, DocAlias, State, DocEvent, BallotDocEvent,
+    BallotPositionDocEvent, NewRevisionDocEvent, TelechatDocEvent, WriteupDocEvent,
+    save_document_in_history )
 from ietf.doc.forms import TelechatForm, AdForm, NotifyForm
 from ietf.doc.lastcall import request_last_call
 from ietf.doc.utils import get_document_content, add_state_change_event, update_telechat, close_open_ballots, create_ballot_if_not_open