Merged pyflakes fixes forward to new copy of trunk.

- Legacy-Id: 7463

ietf/community/display.py

@@ -1,9 +1,8 @@
 import datetime
 
-from django.db.models import Q
 from django.core.urlresolvers import reverse as urlreverse
 
-from ietf.doc.models import DocAlias, DocEvent
+from ietf.doc.models import DocAlias
 
 
 class DisplayField(object):

ietf/community/management/commands/update_doc_change_dates.py

@@ -1,7 +1,6 @@
 import sys
 
 from django.core.management.base import BaseCommand
-from django.db.models import Q
 
 from ietf.community.constants import SIGNIFICANT_STATES
 from ietf.community.models import DocumentChangeDates

ietf/community/migrations/0001_initial_migration.py

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

ietf/community/migrations/0002_add_display_config.py

@@ -1,7 +1,7 @@
 
 from south.db import db
-from django.db import models
-from ietf.community.models import *
+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,7 @@
 
 from south.db import db
-from django.db import models
-from ietf.community.models import *
+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,7 @@
 
 from south.db import db
-from django.db import models
-from ietf.community.models import *
+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,7 @@
 
 from south.db import db
-from django.db import models
-from ietf.community.models import *
+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,7 @@
 
 from south.db import db
-from django.db import models
-from ietf.community.models import *
+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,8 @@
 # encoding: utf-8
-import datetime
+import datetime                         # pyflakes:ignore
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
+from django.db import models            # pyflakes:ignore
 
 class Migration(SchemaMigration):
 

ietf/community/rules.py

@@ -1,5 +1,3 @@
-from django.db.models import Q
-
 from ietf.doc.models import Document
 from ietf.group.models import Group
 from ietf.person.models import Person

ietf/community/views.py

@@ -7,16 +7,15 @@ import json
 from django.db import IntegrityError
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.contrib.auth.models import User
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render_to_response
 from django.template import RequestContext
 from django.utils.http import urlquote
 
-from ietf.community.models import CommunityList, Rule, EmailSubscription, ListNotification
+from ietf.community.models import CommunityList, Rule, EmailSubscription
 from ietf.community.forms import RuleForm, DisplayForm, SubscribeForm, UnSubscribeForm
 from ietf.group.models import Group
-from ietf.doc.models import Document, DocEvent, DocAlias
+from ietf.doc.models import DocEvent, DocAlias
 
 
 def _manage_list(request, clist):

ietf/cookies/__init__.py

@@ -2,7 +2,6 @@
 # coding: latin-1
 
 from types import ModuleType
-import urls, views
 
 # These people will be sent a stack trace if there's an uncaught exception in
 # code any of the modules imported above:

ietf/cookies/views.py

@@ -1,7 +1,6 @@
 # Copyright The IETF Trust 2010, All Rights Reserved
 
-from django.http import HttpResponse
-from django.shortcuts import render_to_response as render, get_object_or_404
+from django.shortcuts import render_to_response as render
 from django.template import RequestContext
 
 def settings(request, new_enough = -1, expires_soon = -1, full_draft = ""):

ietf/dbtemplate/forms.py

@@ -5,7 +5,7 @@ from django.template import Context
 from ietf.dbtemplate.models import DBTemplate
 from ietf.dbtemplate.template import PlainTemplate, RSTTemplate, DjangoTemplate
 
-import debug
+import debug                            # pyflakes:ignore
 
 class DBTemplateForm(forms.ModelForm):
 
@@ -13,7 +13,7 @@ class DBTemplateForm(forms.ModelForm):
         try:
             content = self.cleaned_data['content']
             if   self.instance.type.slug == 'rst':
-                return_code = RSTTemplate(content).render(Context({}))
+                RSTTemplate(content).render(Context({}))
             elif self.instance.type.slug == 'django':
                 DjangoTemplate(content).render(Context({}))
             elif self.instance.type.slug == 'plain':

ietf/dbtemplate/migrations/0001_initial.py

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

ietf/dbtemplate/template.py

@@ -2,7 +2,7 @@ import os
 import string
 from docutils.core import publish_string
 from docutils.utils import SystemMessage
-import debug
+import debug                            # pyflakes:ignore
 
 from django.template import Template as DjangoTemplate, TemplateDoesNotExist, TemplateEncodingError
 from django.template.loader import BaseLoader

ietf/doc/admin.py

@@ -3,10 +3,8 @@ from django.utils.safestring import mark_safe
 from django.contrib import admin
 from django import forms
 
-from models import *
-from ietf.person.models import *
+from models import *                    # pyflakes:ignore
 from ietf.doc.utils import get_state_types
-from ietf.utils.admin import admin_link
 
 class StateTypeAdmin(admin.ModelAdmin):
     list_display = ["slug", "label"]

ietf/doc/expire.py

@@ -1,12 +1,10 @@
 # expiry of Internet Drafts
 
 from django.conf import settings
-from django.template.loader import render_to_string
-from django.db.models import Q
 
 import datetime, os, shutil, glob, re
 
-from ietf.utils.mail import send_mail, send_mail_subj
+from ietf.utils.mail import send_mail
 from ietf.doc.models import Document, DocEvent, State, save_document_in_history, IESG_SUBSTATE_TAGS
 from ietf.person.models import Person, Email
 from ietf.meeting.models import Meeting
@@ -149,7 +147,6 @@ def clean_up_draft_files():
     cut_off = datetime.date.today()
 
     pattern = os.path.join(settings.INTERNET_DRAFT_PATH, "draft-*.*")
-    files = []
     filename_re = re.compile('^(.*)-(\d\d)$')
 
     def splitext(fn):

ietf/doc/feeds.py

@@ -1,15 +1,12 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-import datetime, re
-
-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
 from django.template.defaultfilters import truncatewords, truncatewords_html, date as datefilter, linebreaks
 from django.utils.html import strip_tags
 
-from ietf.doc.models import *
+from ietf.doc.models import Document, State, LastCallDocEvent
 from ietf.doc.utils import augment_events_with_revision
 from ietf.doc.templatetags.ietf_filters import format_textarea
 

ietf/doc/lastcall.py

@@ -2,12 +2,15 @@
 
 import datetime
 
-from django.conf import settings
+from django.db.models import Q
 
-from ietf.doc.models import *
+from ietf.doc.models import Document, State, DocEvent, LastCallDocEvent, WriteupDocEvent
+from ietf.doc.models import save_document_in_history
+from ietf.doc.models import IESG_SUBSTATE_TAGS
 from ietf.person.models import Person
 from ietf.doc.utils import add_state_change_event
-from ietf.doc.mails import *
+from ietf.doc.mails import generate_ballot_writeup, generate_approval_mail, generate_last_call_announcement
+from ietf.doc.mails import send_last_call_request, email_last_call_expired
 
 def request_last_call(request, doc):
     if not doc.latest_event(type="changed_ballot_writeup_text"):

ietf/doc/management/commands/generate_draft_bibxml_files.py

@@ -2,7 +2,6 @@ import sys
 import os
 
 from django.core.management.base import BaseCommand
-from django.db.models import Q
 from django.conf import settings
 from django.template.loader import render_to_string
 

ietf/doc/migrations/0002_auto__del_groupballotpositiondocevent__add_ballottype__add_ballotdocev.py

@@ -1,5 +1,4 @@
 # encoding: utf-8
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models

ietf/doc/migrations/0003_add_conflict.py

@@ -1,11 +1,6 @@
 # encoding: utf-8
-import datetime
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
-
 from doc.models import StateType, State, BallotType, DocTypeName
-from name.models import BallotPositionName
 
 class Migration(DataMigration):
 

ietf/doc/migrations/0004_clean_stale_discusses.py

@@ -1,8 +1,5 @@
 # encoding: utf-8
-import datetime
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
 
 from person.models import Person
 from doc.models import BallotPositionDocEvent

ietf/doc/migrations/0005_auto__add_statedocevent__add_consensusdocevent.py

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

ietf/doc/migrations/0006_add_iana_rfc_editor_states.py

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

ietf/doc/migrations/0007_fix_groups_of_alternate_stream_docs.py

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

ietf/doc/migrations/0008_auto__add_deletedevent.py

@@ -2,7 +2,6 @@
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 class Migration(SchemaMigration):
 

ietf/doc/migrations/0009_add_statchg.py

@@ -1,11 +1,7 @@
 # encoding: utf-8
-import datetime
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
 
 from ietf.doc.models import StateType, State, BallotType, DocTypeName
-from ietf.name.models import BallotPositionName
 
 class Migration(DataMigration):
 

ietf/doc/migrations/0010_more_statchg_states.py

@@ -1,8 +1,5 @@
 # encoding: utf-8
-import datetime
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
 
 from ietf.doc.models import State,StateType
 

ietf/doc/migrations/0011_cleanup_new_revision_docevents.py

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

ietf/doc/migrations/0012_cleanup_doc_notes.py

@@ -1,8 +1,6 @@
 # encoding: utf-8
-import datetime, re
-from south.db import db
+import re
 from south.v2 import DataMigration
-from django.db import models
 
 class Migration(DataMigration):
 

ietf/doc/migrations/0013_fixup_broken_rfc_docs.py

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

ietf/doc/migrations/0014_fix_rfc_aliases.py

@@ -1,6 +1,4 @@
 # encoding: utf-8
-import datetime
-from south.db import db
 from south.v2 import DataMigration
 from django.db import models
 

ietf/doc/migrations/0015_split_state_changing_iesg_approve_events.py

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

ietf/doc/migrations/0016_add_docevent_time_index.py

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

ietf/doc/migrations/0017_set_type_to_changed_state.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
+# -*- coding: utf-8 -*-
 from south.v2 import DataMigration
 from django.db import models
 

ietf/doc/models.py

@@ -6,13 +6,13 @@ from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
 from django.utils.html import mark_safe
 
-from ietf.group.models import *
-from ietf.name.models import *
+from ietf.group.models import Group
+from ietf.name.models import *          # pyflakes:ignore
 from ietf.person.models import Email, Person
 from ietf.utils.admin import admin_link
 
 import datetime, os
-import debug
+import debug                            # pyflakes:ignore
 
 class StateType(models.Model):
     slug = models.CharField(primary_key=True, max_length=30) # draft, draft-iesg, charter, ...

ietf/doc/redirect_idtracker_urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import patterns
 from django.views.generic import RedirectView
 
 urlpatterns = patterns('',

ietf/doc/templatetags/ballot_icon.py

@@ -34,12 +34,11 @@ import datetime
 
 from django import template
 from django.core.urlresolvers import reverse as urlreverse
-from django.conf import settings
 from django.db.models import Q
 from django.utils.safestring import mark_safe
 
 from ietf.ietfauth.utils import user_is_person, has_role
-from ietf.doc.models import BallotDocEvent, BallotPositionDocEvent, IESG_BALLOT_ACTIVE_STATES, IESG_SUBSTATE_TAGS
+from ietf.doc.models import BallotPositionDocEvent, IESG_BALLOT_ACTIVE_STATES
 from ietf.name.models import BallotPositionName
 
 

ietf/doc/templatetags/ietf_filters.py

@@ -7,14 +7,11 @@ import types
 from email.utils import parseaddr
 
 from django import template
-from django.conf import settings
 from django.utils.html import escape, fix_ampersands
-from django.template.defaultfilters import truncatewords_html, linebreaksbr, wordwrap, stringfilter, urlize
+from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, urlize
 from django.template import resolve_variable
 from django.utils.safestring import mark_safe, SafeData
 from django.utils.html import strip_tags
-from django.template import RequestContext
-
 
 register = template.Library()
 
@@ -323,6 +320,7 @@ def wrap_text(text, width=72):
     lines = text.split("\n")
     filled = []
     wrapped = False
+    prev_indent = None
     for line in lines:
         line = line.expandtabs()
         indent = " " * (len(line) - len(line.lstrip()))

ietf/doc/templatetags/mail_filters.py

@@ -1,6 +1,4 @@
 from django import template
-from django.core.cache import cache
-from django.template import loader
 
 register = template.Library()
 

ietf/doc/templatetags/streams_menu.py

@@ -1,6 +1,4 @@
 from django import template
-from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
 from django.contrib.auth.models import AnonymousUser
 
 from ietf.ietfauth.utils import has_role

ietf/doc/tests.py

@@ -1,26 +1,21 @@
-import os, shutil, datetime
+import datetime
 import sys
 if sys.version_info[0] == 2 and sys.version_info[1] < 7:
     import unittest2 as unittest
 else:
     import unittest
+from pyquery import PyQuery
 
 from django.core.urlresolvers import reverse as urlreverse
 
-from pyquery import PyQuery
+from ietf.doc.models import *           # pyflakes:ignore
+from ietf.name.models import *          # pyflakes:ignore
 
 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 import TestCase
 
-from ietf.doc.models import *
-from ietf.name.models import *
-from ietf.group.models import *
-from ietf.person.models import *
-from ietf.meeting.models import Meeting, MeetingTypeName
-from ietf.iesg.models import TelechatDate
-
 class SearchTestCase(TestCase):
     def test_search(self):
         draft = make_test_data()
@@ -98,7 +93,7 @@ class SearchTestCase(TestCase):
         self.assertTrue(draft.title in r.content)
 
     def test_frontpage(self):
-        draft = make_test_data()
+        make_test_data()
         r = self.client.get("/")
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Search Internet-Drafts" in r.content)
@@ -309,7 +304,7 @@ class DocTestCase(TestCase):
 
         doc.set_state(State.objects.get(type="draft-iesg", slug="lc"))
 
-        e = LastCallDocEvent.objects.create(
+        LastCallDocEvent.objects.create(
             doc=doc,
             desc="Last call",
             type="sent_last_call",

ietf/doc/tests_ballot.py

@@ -1,24 +1,19 @@
-import unittest
-import StringIO
-import os, shutil
-from datetime import date, timedelta, time
+import datetime
+from pyquery import PyQuery
+import debug                            # pyflakes:ignore
 
 from django.core.urlresolvers import reverse as urlreverse
-from django.conf import settings
 
-from pyquery import PyQuery
-import debug
+from ietf.doc.models import *           # pyflakes:ignore
 
-from ietf.doc.models import *
-from ietf.name.models import *
-from ietf.group.models import *
-from ietf.person.models import *
-from ietf.meeting.models import Meeting, MeetingTypeName
-from ietf.iesg.models import TelechatDate
-from ietf.utils.test_utils import login_testing_unauthorized
-from ietf.utils.test_data import make_test_data
-from ietf.utils.mail import outbox
+from ietf.group.models import Group, Role
+from ietf.name.models import BallotPositionName
+from ietf.person.models import Person
 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
+
 
 class EditPositionTests(TestCase):
     def test_edit_position(self):
@@ -98,7 +93,7 @@ class EditPositionTests(TestCase):
         self.assertTrue(len(q('form input[name=position]')) > 0)
 
         # vote on behalf of AD
-        events_before = draft.docevent_set.count()
+        # events_before = draft.docevent_set.count()
         r = self.client.post(url, dict(position="discuss", discuss="Test discuss text"))
         self.assertEqual(r.status_code, 302)
 

ietf/doc/tests_charter.py

@@ -2,24 +2,21 @@
 
 import os, shutil, datetime
 from StringIO import StringIO
+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.utils_charter import next_revision, default_review_text, default_action_text
+from ietf.group.models import Group, GroupMilestone
+from ietf.iesg.models import TelechatDate
+from ietf.person.models import Person
+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.utils import TestCase
-
-from pyquery import PyQuery
-
-from ietf.doc.models import *
-from ietf.doc.utils import *
-from ietf.group.models import *
-from ietf.group.utils import *
-from ietf.name.models import *
-from ietf.person.models import *
-from ietf.iesg.models import TelechatDate
-from ietf.doc.utils_charter import *
 
 class EditCharterTests(TestCase):
     def setUp(self):
@@ -332,12 +329,14 @@ class EditCharterTests(TestCase):
                                            desc="Has been copied",
                                            due=due_date,
                                            resolved="")
-        m2 = GroupMilestone.objects.create(group=group,
+        # m2 isn't used -- missing test?
+        m2 = GroupMilestone.objects.create(group=group, # pyflakes:ignore
                                            state_id="active",
                                            desc="To be deleted",
                                            due=due_date,
                                            resolved="")
-        m3 = GroupMilestone.objects.create(group=group,
+        # m3 isn't used -- missing test?
+        m3 = GroupMilestone.objects.create(group=group, # pyflakes:ignore
                                            state_id="charter",
                                            desc="Has been copied",
                                            due=due_date,

ietf/doc/tests_conflict_review.py

@@ -5,21 +5,19 @@ from pyquery import PyQuery
 from StringIO import StringIO
 from textwrap import wrap
 
-
 from django.conf import settings
 from django.core.urlresolvers import reverse as urlreverse
 
-from ietf.utils.test_utils import login_testing_unauthorized
-from ietf.utils.test_data  import make_test_data
-from ietf.utils.mail import outbox
+from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, BallotPositionDocEvent, TelechatDocEvent, State
 from ietf.doc.utils import create_ballot_if_not_open
 from ietf.doc.views_conflict_review import default_approval_text
-from ietf.utils import TestCase
-
-from ietf.doc.models import Document,DocEvent,NewRevisionDocEvent,BallotPositionDocEvent,TelechatDocEvent,DocAlias,State
-from ietf.name.models import StreamName
 from ietf.group.models import Person
 from ietf.iesg.models import TelechatDate
+from ietf.name.models import StreamName
+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
 
 
 class ConflictReviewTests(TestCase):

ietf/doc/tests_draft.py

@@ -1,17 +1,20 @@
+import os
+import shutil
+import datetime
 import StringIO
-import os, shutil, datetime
+from pyquery import PyQuery
 
 from django.core.urlresolvers import reverse as urlreverse
 from django.conf import settings
 
-from pyquery import PyQuery
-import debug
+import debug                            # pyflakes:ignore
 
-from ietf.doc.models import *
-from ietf.doc.utils import *
-from ietf.name.models import *
-from ietf.group.models import *
-from ietf.person.models import *
+from ietf.doc.models import *           # pyflakes:ignore
+
+from ietf.doc.utils import get_tags_for_stream_id
+from ietf.name.models import StreamName, IntendedStdLevelName, DocTagName
+from ietf.group.models import Group
+from ietf.person.models import Person, Email
 from ietf.meeting.models import Meeting, MeetingTypeName
 from ietf.iesg.models import TelechatDate
 from ietf.utils.test_utils import login_testing_unauthorized
@@ -280,7 +283,7 @@ class EditInfoTests(TestCase):
             ad=None,
             expires=datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             )
-        doc_alias = DocAlias.objects.create(
+        DocAlias.objects.create(
             document=draft,
             name=draft.name,
             )
@@ -854,7 +857,6 @@ class IndividualInfoFormsTests(TestCase):
         test_file.name = "unnamed"
         r = self.client.post(url,dict(txt=test_file,submit_response="1"))
         self.assertEqual(r.status_code, 302)
-        doc = Document.objects.get(name=self.docname)
         self.assertTrue(self.doc.latest_event(WriteupDocEvent,type="changed_protocol_writeup").text.startswith('This is a different writeup.'))
 
         # template reset

ietf/doc/tests_status_change.py

@@ -5,21 +5,19 @@ from pyquery import PyQuery
 from StringIO import StringIO
 from textwrap import wrap
 
-
 from django.conf import settings
 from django.core.urlresolvers import reverse as urlreverse
 
-from ietf.utils.test_utils import login_testing_unauthorized
-from ietf.utils.test_data  import make_test_data
-from ietf.utils.mail import outbox
+from ietf.doc.models import *           # pyflakes:ignore
+
 from ietf.doc.utils import create_ballot_if_not_open
 from ietf.doc.views_status_change import default_approval_text
-from ietf.utils import TestCase
-
-from ietf.doc.models import Document,DocEvent,NewRevisionDocEvent,BallotPositionDocEvent,TelechatDocEvent,WriteupDocEvent,DocAlias,State
-from ietf.name.models import StreamName
 from ietf.group.models import Person
 from ietf.iesg.models import TelechatDate
+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
 
 
 class StatusChangeTests(TestCase):

ietf/doc/urls.py

@@ -33,7 +33,6 @@
 from django.conf.urls import patterns, url, include
 from django.views.generic import RedirectView
 
-from ietf.doc.models import State
 from ietf.doc import views_search, views_draft, views_ballot
 from ietf.doc import views_status_change
 from ietf.doc import views_doc

ietf/doc/utils.py

@@ -1,13 +1,17 @@
-import os, re, urllib
+import os
+import re
+import urllib
 import math
 
 from django.conf import settings
 
 from ietf.utils import markup_txt
-from ietf.doc.models import *
+from ietf.doc.models import DocAlias, RelatedDocument, BallotType, DocReminder
+from ietf.doc.models import DocEvent, BallotDocEvent, NewRevisionDocEvent, StateDocEvent
+from ietf.name.models import DocReminderTypeName, DocRelationshipName
 from ietf.group.models import Role
 from ietf.ietfauth.utils import has_role
-
+from ietf.person.models import Person
 from ietf.utils import draft
 
 def get_state_types(doc):

ietf/doc/utils_charter.py

@@ -1,16 +1,13 @@
-import re, datetime, os, textwrap
+import re, datetime, os
 
 from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
 
-from ietf.utils.mail import send_mail_text
+from ietf.doc.models import NewRevisionDocEvent, WriteupDocEvent, BallotPositionDocEvent
 from ietf.person.models import Person
-from ietf.group.models import GroupEvent, ChangeStateGroupEvent
-from ietf.doc.models import Document, DocAlias, DocHistory, RelatedDocument, DocumentAuthor
-from ietf.doc.models import DocEvent, NewRevisionDocEvent, WriteupDocEvent, BallotPositionDocEvent
 from ietf.utils.history import find_history_active_at
+from ietf.utils.mail import send_mail_text
 
 
 def next_revision(rev):

ietf/doc/views_ballot.py

@@ -1,33 +1,29 @@
 # ballot management (voting, commenting, writeups, ...) for Area
 # Directors and Secretariat
 
-import re, os, datetime, json
+import datetime, json
 
-from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect, Http404
+from django.http import HttpResponseForbidden, HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, get_object_or_404, redirect
 from django.core.urlresolvers import reverse as urlreverse
 from django.template.loader import render_to_string
 from django.template import RequestContext
 from django import forms
-from django.utils.html import strip_tags
 from django.conf import settings
 
-import debug
+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.utils.mail import send_mail_text, send_mail_preformatted
-from ietf.ietfauth.utils import has_role, role_required
-from ietf.iesg.models import TelechatDate
-from ietf.ipr.models import IprDetail
-from ietf.ipr.search import iprs_from_docs
-from ietf.doc.mails import *
 from ietf.doc.lastcall import request_last_call
-
-from ietf.doc.utils import *
-from ietf.doc.models import *
-from ietf.name.models import BallotPositionName
-
+from ietf.iesg.models import TelechatDate
+from ietf.ietfauth.utils import has_role, role_required
 from ietf.message.utils import infer_message
+from ietf.name.models import BallotPositionName
 from ietf.person.models import Person
+from ietf.utils.mail import send_mail_text, send_mail_preformatted
 
 BALLOT_CHOICES = (("yes", "Yes"),
                   ("noobj", "No Objection"),
@@ -80,18 +76,6 @@ def position_to_ballot_choice(position):
 def position_label(position_value):
     return dict(BALLOT_CHOICES).get(position_value, "")
 
-def get_ballot_info(ballot, area_director):
-    pos = Position.objects.filter(ballot=ballot, ad=area_director)
-    pos = pos[0] if pos else None
-    
-    discuss = IESGDiscuss.objects.filter(ballot=ballot, ad=area_director)
-    discuss = discuss[0] if discuss else None
-    
-    comment = IESGComment.objects.filter(ballot=ballot, ad=area_director)
-    comment = comment[0] if comment else None
-    
-    return (pos, discuss, comment)
-
 # -------------------------------------------------
 class EditPositionForm(forms.Form):
     position = forms.ModelChoiceField(queryset=BallotPositionName.objects.all(), widget=forms.RadioSelect, initial="norecord", required=True)
@@ -253,7 +237,7 @@ def send_ballot_comment(request, name, ballot_id):
     doc = get_object_or_404(Document, docalias__name=name)
     ballot = get_object_or_404(BallotDocEvent, type="created_ballot", pk=ballot_id, doc=doc)
 
-    ad = login = request.user.person
+    ad = request.user.person
 
     return_to_url = request.GET.get('return_to_url')
     if not return_to_url:
@@ -485,7 +469,6 @@ def lastcalltext(request, name):
     s = doc.get_state("draft-iesg")
     can_request_last_call = s.order < 27
     can_make_last_call = s.order < 20
-    can_announce = s.order > 19
     
     need_intended_status = ""
     if not doc.intended_std_level:

ietf/doc/views_charter.py

@@ -1,32 +1,29 @@
-import re, os, string, datetime, shutil, textwrap, json
+import os, datetime, shutil, textwrap, json
 
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound, Http404
 from django.shortcuts import render_to_response, get_object_or_404, redirect
-from django.template.loader import render_to_string
 from django.core.urlresolvers import reverse as urlreverse
 from django.template import RequestContext
 from django import forms
-from django.forms.util import ErrorList
-from django.utils.html import strip_tags, escape
+from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.conf import settings
 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.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.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.utils.history import find_history_active_at
-from ietf.ietfauth.utils import has_role, role_required
-from ietf.iesg.models import TelechatDate
-from ietf.doc.models import *
-from ietf.doc.utils 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, save_milestone_in_history
 from ietf.wginfo.mails import email_secretariat
-from ietf.doc.utils_charter import *
-
-import debug
 
 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)
@@ -598,7 +595,6 @@ def approve(request, name):
         new_state = GroupStateName.objects.get(slug="active")
         if group.state != new_state:
             save_group_in_history(group)
-            prev_state = group.state
             group.state = new_state
             group.time = e.time
             group.save()

ietf/doc/views_conflict_review.py

@@ -8,21 +8,17 @@ from django.template import RequestContext
 from django.template.loader import render_to_string
 from django.conf import settings
 
-from ietf.doc.utils import add_state_change_event, update_telechat
-from ietf.doc.models import save_document_in_history
-from ietf.doc.utils import create_ballot_if_not_open, close_open_ballots, get_document_content
-from ietf.ietfauth.utils import has_role, role_required, is_authorized_in_doc_stream
-from ietf.utils.textupload import get_cleaned_text_file_content
-from ietf.utils.mail import send_mail_preformatted
+from ietf.doc.models import *           # pyflakes:ignore
+from ietf.doc.utils import *            # pyflakes:ignore
+
 from ietf.doc.mails import email_iana
-
-from ietf.doc.models import State, Document, DocHistory, DocAlias
-from ietf.doc.models import DocEvent, NewRevisionDocEvent, WriteupDocEvent, TelechatDocEvent, BallotDocEvent, BallotPositionDocEvent
-from ietf.person.models import Person
-from ietf.iesg.models import TelechatDate
-from ietf.group.models import Role, Group
-
 from ietf.doc.forms import TelechatForm, AdForm, NotifyForm
+from ietf.group.models import Role, Group
+from ietf.iesg.models import TelechatDate
+from ietf.ietfauth.utils import has_role, role_required, is_authorized_in_doc_stream
+from ietf.person.models import Person
+from ietf.utils.mail import send_mail_preformatted
+from ietf.utils.textupload import get_cleaned_text_file_content
 
 class ChangeStateForm(forms.Form):
     review_state = forms.ModelChoiceField(State.objects.filter(used=True, type="conflrev"), label="Conflict review state", empty_label=None, required=True)

ietf/doc/views_doc.py

@@ -30,28 +30,30 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import re, os, datetime, urllib, json
+import os, datetime, urllib, json
 
 from django.http import HttpResponse, Http404
 from django.shortcuts import render_to_response, get_object_or_404, redirect
 from django.template import RequestContext
 from django.template.loader import render_to_string
-from django.template.defaultfilters import truncatewords_html
 from django.utils.decorators import decorator_from_middleware
 from django.middleware.gzip import GZipMiddleware
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse as urlreverse, NoReverseMatch
+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.community.models import CommunityList
-from ietf.doc.models import *
-from ietf.doc.utils import *
-from ietf.utils.history import find_history_active_at
-from ietf.ietfauth.utils import *
-from ietf.doc.views_status_change import RELATION_SLUGS as status_change_relationships
-from ietf.ipr.models import IprDocAlias
 from ietf.doc.mails import email_ad
+from ietf.doc.views_status_change import RELATION_SLUGS as status_change_relationships
+from ietf.group.models import Role
+from ietf.ietfauth.utils import has_role, is_authorized_in_doc_stream, user_is_person, role_required
+from ietf.name.models import StreamName, BallotPositionName
+from ietf.person.models import Email
+from ietf.utils.history import find_history_active_at
 
 def render_document_top(request, doc, tab, name):
     tabs = []
@@ -137,7 +139,6 @@ def document_main(request, name, rev=None):
         split_content = not ( request.GET.get('include_text') or request.COOKIES.get("full_draft", "") == "on" )
 
         iesg_state = doc.get_state("draft-iesg")
-        iesg_substate = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
         iesg_state_summary = doc.friendly_state()
         can_edit = has_role(request.user, ("Area Director", "Secretariat"))
         stream_slugs = StreamName.objects.values_list("slug", flat=True)

ietf/doc/views_draft.py

@@ -1,37 +1,34 @@
 # changing state and metadata on Internet Drafts
 
-import re, os, datetime, json
-from textwrap import dedent
+import datetime, json
 
-from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404
+
+from django.http import HttpResponseRedirect, HttpResponseForbidden, Http404
 from django.shortcuts import render_to_response, get_object_or_404, redirect
-from django.core.urlresolvers import reverse as urlreverse
 from django.template.loader import render_to_string
 from django.template import RequestContext
 from django import forms
-from django.utils.html import strip_tags
-from django.db.models import Max
 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.utils.mail import send_mail_text, send_mail_message
-from ietf.ietfauth.utils import role_required
-from ietf.ietfauth.utils import has_role, is_authorized_in_doc_stream, user_is_person
-from ietf.iesg.models import TelechatDate
-from ietf.doc.mails import *
-from ietf.doc.lastcall import request_last_call
-from ietf.utils.textupload import get_cleaned_text_file_content
-from ietf.person.forms import EmailsField
-from ietf.group.models import Group
-from ietf.secr.lib import jsonapi
+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 *
-from ietf.doc.utils import *
-from ietf.name.models import IntendedStdLevelName, DocTagName, StreamName
-from ietf.person.models import Person, Email
+from ietf.doc.lastcall import request_last_call
+from ietf.group.models import Group
+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
 from ietf.message.models import Message
+from ietf.name.models import IntendedStdLevelName, DocTagName, StreamName
+from ietf.person.forms import EmailsField
+from ietf.person.models import Person, Email
+from ietf.secr.lib import jsonapi
+from ietf.utils.mail import send_mail, send_mail_message
+from ietf.utils.textupload import get_cleaned_text_file_content
 
 class ChangeStateForm(forms.Form):
     state = forms.ModelChoiceField(State.objects.filter(used=True, type="draft-iesg"), empty_label=None, required=True)
@@ -42,7 +39,7 @@ class ChangeStateForm(forms.Form):
         retclean = self.cleaned_data
         state = self.cleaned_data.get('state', '(None)')
         tag = self.cleaned_data.get('substate','')
-        comment = self.cleaned_data['comment'].strip()
+        comment = self.cleaned_data['comment'].strip() # pyflakes:ignore
         doc = get_object_or_404(Document, docalias__name=self.docname)
         prev = doc.get_state("draft-iesg")
     
@@ -327,7 +324,7 @@ class ReplacesForm(forms.Form):
         for id in ids:
             try:
                 d = DocAlias.objects.get(pk=id)
-            except DocAlias.DoesNotExist, e:
+            except DocAlias.DoesNotExist:
                 raise forms.ValidationError("ERROR: %s not found for id %d" % DocAlias._meta.verbos_name, id)
             if d.document == self.doc:
                 raise forms.ValidationError("ERROR: A draft can't replace itself")

ietf/doc/views_help.py

@@ -1,9 +1,9 @@
-from django import forms
 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 *
+from ietf.doc.models import *           # pyflakes:ignore
+
 from ietf.doc.utils import get_tags_for_stream_id
 
 def state_help(request, type):

ietf/doc/views_search.py

@@ -30,23 +30,24 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import re, datetime
+import datetime
 
 from django import forms
 from django.shortcuts import render_to_response
 from django.db.models import Q
 from django.template import RequestContext
-from django.http import Http404, HttpResponse, HttpResponseBadRequest
+from django.http import Http404, HttpResponseBadRequest
+
+from ietf.doc.models import *           # pyflakes:ignore
 
 from ietf.doc.expire import expirable_draft
 from ietf.utils import normalize_draftname
-from ietf.doc.models import *
-from ietf.person.models import *
-from ietf.group.models import *
+#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
+import debug                            # pyflakes:ignore
 
 class SearchForm(forms.Form):
     name = forms.CharField(required=False)
@@ -81,7 +82,7 @@ class SearchForm(forms.Form):
         active_ads.sort(key=extract_last_name)
         inactive_ads.sort(key=extract_last_name)
 
-        self.fields['ad'].choices = c = [('', 'any AD')] + [(ad.pk, ad.plain_name()) for ad in active_ads] + [('', '------------------')] + [(ad.pk, ad.name) for ad in inactive_ads]
+        self.fields['ad'].choices = [('', 'any AD')] + [(ad.pk, ad.plain_name()) for ad in active_ads] + [('', '------------------')] + [(ad.pk, ad.name) for ad in inactive_ads]
         self.fields['substate'].choices = [('', 'any substate'), ('0', 'no substate')] + [(n.slug, n.name) for n in DocTagName.objects.filter(slug__in=IESG_SUBSTATE_TAGS)]
 
     def clean_name(self):

ietf/doc/views_status_change.py

@@ -8,23 +8,20 @@ from django.template import RequestContext
 from django.template.loader import render_to_string
 from django.conf import settings
 
-from ietf.doc.utils import add_state_change_event, update_telechat
-from ietf.doc.models import save_document_in_history
-
-from ietf.doc.utils import create_ballot_if_not_open, close_open_ballots, get_document_content
-from ietf.ietfauth.utils import has_role, role_required
-from ietf.utils.textupload import get_cleaned_text_file_content
-from ietf.utils.mail import send_mail_preformatted
-from ietf.doc.models import State, Document, DocHistory, DocAlias
-from ietf.doc.models import DocEvent, NewRevisionDocEvent, WriteupDocEvent, TelechatDocEvent, BallotDocEvent, BallotPositionDocEvent
-from ietf.person.models import Person
-from ietf.iesg.models import TelechatDate
-from ietf.group.models import Group
-from ietf.name.models import DocRelationshipName, StdLevelName
+from ietf.doc.models import *           # pyflakes:ignore
+from ietf.name.models import *          # pyflakes:ignore
 
 from ietf.doc.forms import TelechatForm, AdForm, NotifyForm
-from ietf.doc.views_ballot import LastCallTextForm
 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
+from ietf.doc.views_ballot import LastCallTextForm
+from ietf.group.models import Group
+from ietf.iesg.models import TelechatDate
+from ietf.ietfauth.utils import has_role, role_required
+from ietf.name.models import DocRelationshipName, StdLevelName
+from ietf.person.models import Person
+from ietf.utils.mail import send_mail_preformatted
+from ietf.utils.textupload import get_cleaned_text_file_content
 
 class ChangeStateForm(forms.Form):
     new_state = forms.ModelChoiceField(State.objects.filter(type="statchg", used=True), label="Status Change Evaluation State", empty_label=None, required=True)

ietf/feed_urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import patterns
 from django.views.generic import RedirectView
 
 from ietf.doc.feeds import DocumentChangesFeed, InLastCallFeed

ietf/group/models.py

@@ -10,7 +10,7 @@ from ietf.person.models import Email, Person
 from ietf.group.colors import fg_group_colors, bg_group_colors
 
 import datetime
-import debug
+import debug                            # pyflakes:ignore
 
 class GroupInfo(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)

ietf/group/views_stream.py

@@ -13,7 +13,7 @@ from ietf.name.models import StreamName
 from ietf.ietfauth.utils import has_role
 from ietf.person.forms import EmailsField
 
-import debug
+import debug                            # pyflakes:ignore
 
 def streams(request):
     streams = [ s.slug for s in StreamName.objects.all().exclude(slug__in=['ietf', 'legacy']) ]

ietf/help/views.py

@@ -5,7 +5,7 @@ import os
 from django.template import RequestContext
 from django.shortcuts import get_object_or_404, render_to_response
 
-import debug
+import debug                            # pyflakes:ignore
 
 from ietf.doc.models import State, StateType
 

ietf/meeting/ajax.py

@@ -12,7 +12,7 @@ from ietf.meeting.helpers import get_meeting, get_schedule, get_schedule_by_id,
 from ietf.meeting.views   import edit_timeslots, edit_agenda
 from ietf.meeting.models import TimeSlot, Session, Schedule, Room, Constraint
 
-import debug
+import debug                            # pyflakes:ignore
 
 def dajaxice_core_js(request):
     # this is a slightly weird hack to get, we seem to need this because

ietf/meeting/helpers.py

@@ -13,7 +13,7 @@ from django.core.cache import cache
 from django.utils.cache import get_cache_key
 from django.shortcuts import get_object_or_404
 
-import debug
+import debug                            # pyflakes:ignore
 
 from ietf.ietfauth.utils import has_role, user_is_person
 from ietf.utils.history import find_history_active_at

ietf/meeting/models.py

@@ -6,7 +6,7 @@ import copy
 import os
 import re
 
-import debug
+import debug                            # pyflakes:ignore
 
 from django.db import models
 from django.conf import settings

ietf/meeting/views.py

@@ -4,7 +4,7 @@ import datetime
 import os
 import re
 import tarfile
-import debug
+import debug                            # pyflakes:ignore
 import urllib
 import json
 

ietf/middleware.py

@@ -8,8 +8,6 @@ from ietf.utils import log
 from ietf.utils.mail import log_smtp_exception
 import re
 import smtplib
-import sys
-import traceback
 import unicodedata
 
 class SQLLogMiddleware(object):

ietf/nomcom/management/commands/feedback_email.py

@@ -8,7 +8,7 @@ from ietf.nomcom.models import NomCom
 from ietf.nomcom.utils import create_feedback_email
 from ietf.nomcom.fields import EncryptedException
 
-import debug
+import debug                            # pyflakes:ignore
 
 class Command(BaseCommand):
     help = (u"Receive nomcom email, encrypt and save it.")

ietf/nomcom/utils.py

@@ -24,7 +24,7 @@ from ietf.utils import unaccent
 from ietf.utils.mail import send_mail_text, send_mail
 from ietf.utils.log import log
 
-import debug
+import debug                            # pyflakes:ignore
 
 MAIN_NOMCOM_TEMPLATE_PATH = '/nomcom/defaults/'
 QUESTIONNAIRE_TEMPLATE = 'position/questionnaire.txt'

ietf/person/forms.py

@@ -5,7 +5,7 @@ from django.utils.functional import lazy
 from django import forms
 from django.core.urlresolvers import reverse as urlreverse
 
-import debug
+import debug                            # pyflakes:ignore
 
 from ietf.person.models import *
 

ietf/secr/groups/tests.py

@@ -3,7 +3,7 @@ from ietf.utils import TestCase
 from ietf.group.models import Group
 from ietf.person.models import Person
 from ietf.utils.test_data import make_test_data
-import debug
+import debug                            # pyflakes:ignore
 
 SECR_USER='secretary'
 

ietf/secr/proceedings/tests.py

@@ -5,7 +5,7 @@ from ietf.meeting.models import Meeting
 from ietf.utils.test_data import make_test_data
 
 from pyquery import PyQuery
-import debug
+import debug                            # pyflakes:ignore
 
 SECR_USER='secretary'
 

ietf/secr/roles/tests.py

@@ -6,7 +6,7 @@ from ietf.person.models import Person
 from ietf.utils.test_data import make_test_data
 
 from pyquery import PyQuery
-import debug
+import debug                            # pyflakes:ignore
 
 SECR_USER='secretary'
 

ietf/settings.py

@@ -406,7 +406,7 @@ PRODUCTION_TIMEZONE = "America/Los_Angeles"
 
 # Put the production SECRET_KEY in settings_local.py, and also any other
 # sensitive or site-specific changes.  DO NOT commit settings_local.py to svn.
-from settings_local import *
+from settings_local import *            # pyflakes:ignore
 
 # We provide a secret key only for test and development modes.  It's
 # absolutely vital that django fails to start in production mode unless a

ietf/settings_sqlitetest.py

@@ -4,7 +4,7 @@
 #   ./manage.py test --settings=settings_sqlitetest doc.ChangeStateTestCase
 #
 
-from settings import *
+from settings import *                  # pyflakes:ignore
 
 DATABASES = {
     'default': {

ietf/submit/forms.py

@@ -7,7 +7,7 @@ from django.conf import settings
 from django.utils.html import mark_safe
 from django.core.urlresolvers import reverse as urlreverse
 
-import debug
+import debug                            # pyflakes:ignore
 
 from ietf.group.models import Group, Role
 from ietf.doc.models import Document

ietf/urls.py

@@ -1,8 +1,8 @@
 # Copyright The IETF Trust 2007, 2009, All Rights Reserved
 
-from django.conf.urls import patterns, include, handler404, handler500
+from django.conf.urls import patterns, include
 from django.contrib import admin
-from django.views.generic import RedirectView, TemplateView
+from django.views.generic import TemplateView
 
 from ietf.liaisons.sitemaps import LiaisonMap
 from ietf.ipr.sitemaps import IPRMap

ietf/utils/management/commands/flakes.py

@@ -0,0 +1,109 @@
+import ast
+import os
+from pyflakes import checker, messages
+import sys
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+# BlackHole, PySyntaxError and checking based on 
+# https://github.com/patrys/gedit-pyflakes-plugin.git
+class BlackHole(object):
+    write = flush = lambda *args, **kwargs: None
+
+    def __enter__(self):
+        self.stderr, sys.stderr = sys.stderr, self
+
+    def __exit__(self, *args, **kwargs):
+        sys.stderr = self.stderr
+
+
+class PySyntaxError(messages.Message):
+    message = 'syntax error in line %d: %s'
+
+    def __init__(self, filename, lineno, col, message):
+        super(PySyntaxError, self).__init__(filename, lineno)
+        self.message_args = (col, message)
+
+
+def check(codeString, filename):
+    """
+    Check the Python source given by C{codeString} for flakes.
+
+    @param codeString: The Python source to check.
+    @type codeString: C{str}
+
+    @param filename: The name of the file the source came from, used to report
+        errors.
+    @type filename: C{str}
+
+    @return: The number of warnings emitted.
+    @rtype: C{int}
+    """
+
+    try:
+        with BlackHole():
+            tree = ast.parse(codeString, filename)
+    except SyntaxError, e:
+        return [PySyntaxError(filename, e.lineno, e.offset, e.text)]
+    else:
+        # Okay, it's syntactically valid.  Now parse it into an ast and check
+        # it.
+        w = checker.Checker(tree, filename)
+
+        lines = codeString.split('\n')
+        # honour pyflakes:ignore comments
+        messages = [message for message in w.messages
+                    if lines[message.lineno-1].find('pyflakes:ignore') < 0]
+        messages.sort(lambda a, b: cmp(a.lineno, b.lineno))
+        if len(messages):
+            sys.stderr.write('F')
+        else:
+            sys.stderr.write('.')
+        return messages
+
+
+def checkPath(filename):
+    """
+    Check the given path, printing out any warnings detected.
+
+    @return: the number of warnings printed
+    """
+    try:
+        return check(file(filename, 'U').read() + '\n', filename)
+    except IOError, msg:
+        return ["%s: %s" % (filename, msg.args[1])]
+    except TypeError:
+        pass
+
+def checkPaths(filenames):
+    warnings = []
+    for arg in filenames:
+        if os.path.isdir(arg):
+            for dirpath, dirnames, filenames in os.walk(arg):
+                for filename in filenames:
+                    if filename.endswith('.py'):
+                        warnings.extend(checkPath(os.path.join(dirpath,
+                                                               filename)))
+        else:
+            warnings.extend(checkPath(arg))
+    return warnings
+#### pyflakes.scripts.pyflakes ends.
+
+
+class Command(BaseCommand):
+    help = "Run pyflakes syntax checks."
+    args = '[filename [filename [...]]]'
+
+    def handle(self, *filenames, **options):
+        if not filenames:
+            filenames = getattr(settings, 'PYFLAKES_DEFAULT_ARGS', ['.'])
+        warnings = checkPaths(filenames)
+        print ""
+        for warning in warnings:
+            print warning
+
+        if warnings:
+            print 'Total warnings: %d' % len(warnings)
+            raise SystemExit(1)
+            

ietf/utils/test_data.py

@@ -10,7 +10,7 @@ from ietf.name.models import *
 from ietf.group.models import *
 from ietf.person.models import *
 
-import debug
+import debug                            # pyflakes:ignore
 
 def create_person(group, role_name, name=None, username=None, email_address=None):
     """Add person/user/email and role."""

ietf/utils/test_utils.py

@@ -47,7 +47,7 @@ from django.test.client import Client
 from django.conf import settings
 from django.core.management import call_command
 
-import debug
+import debug                            # pyflakes:ignore
 
 real_database_name = settings.DATABASES["default"]["NAME"]
 

ietf/wginfo/edit.py

@@ -8,7 +8,7 @@ from django.template import RequestContext
 from django import forms
 from django.utils.html import mark_safe
 
-import debug
+import debug                            # pyflakes:ignore
 
 from ietf.ietfauth.utils import role_required, has_role
 

ietf/wginfo/tests.py

@@ -8,7 +8,7 @@ from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils import TestCase
 
 from pyquery import PyQuery
-import debug
+import debug                            # pyflakes:ignore
 
 from ietf.doc.models import *
 from ietf.group.models import *

ietf/wsgi.py

@@ -40,7 +40,6 @@ WSGIPythonEggs /var/www/.python-eggs/
 
 import os
 import sys
-import syslog
 
 path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 if not path in sys.path: