Fixed pyflakes complaints introduced with pyflakes 1.1.0

levkowetz · levkowetz · commit 846a02c3f9c2 · 2016-03-04T21:24:26.000Z
- Legacy-Id: 10896
diff --git a/ietf/community/resources.py b/ietf/community/resources.py
@@ -5,8 +5,8 @@
 
 from ietf import api
 
-from ietf.community.models import *     # pyflakes:ignore
-
+from ietf.community.models import ( CommunityList, ExpectedChange, DisplayConfiguration,
+    ListNotification, Rule, EmailSubscription, DocumentChangeDates ) 
 
 from ietf.doc.resources import DocumentResource
 from ietf.group.resources import GroupResource
diff --git a/ietf/dbtemplate/resources.py b/ietf/dbtemplate/resources.py
@@ -5,7 +5,7 @@
 
 from ietf import api
 
-from ietf.dbtemplate.models import *    # pyflakes:ignore
+from ietf.dbtemplate.models import DBTemplate
 
 
 from ietf.group.resources import GroupResource
diff --git a/ietf/doc/admin.py b/ietf/doc/admin.py
@@ -3,7 +3,11 @@
 from django.contrib import admin
 from django import forms
 
-from models import *                    # pyflakes:ignore
+from models import (StateType, State, DocAlias, DocumentAuthor, RelatedDocument,
+    Document, DocHistory, BallotType, DocEvent,  NewRevisionDocEvent, StateDocEvent,
+    ConsensusDocEvent, BallotDocEvent, WriteupDocEvent, LastCallDocEvent,
+    TelechatDocEvent, BallotPositionDocEvent)
+
 from ietf.doc.utils import get_state_types
 
 class StateTypeAdmin(admin.ModelAdmin):
diff --git a/ietf/doc/resources.py b/ietf/doc/resources.py
@@ -5,7 +5,11 @@
 
 from ietf import api
 
-from ietf.doc.models import *                            # pyflakes:ignore
+from ietf.doc.models import (BallotType, DeletedEvent, StateType, State, Document,
+    DocumentAuthor, DocEvent, StateDocEvent, DocHistory, ConsensusDocEvent, DocAlias,
+    TelechatDocEvent, DocReminder, LastCallDocEvent, NewRevisionDocEvent, WriteupDocEvent,
+    InitialReviewDocEvent, DocHistoryAuthor, BallotDocEvent, RelatedDocument,
+    RelatedDocHistory, BallotPositionDocEvent)
 
 
 from ietf.name.resources import BallotPositionNameResource, DocTypeNameResource
diff --git a/ietf/group/resources.py b/ietf/group/resources.py
@@ -5,7 +5,9 @@
 
 from ietf import api
 
-from ietf.group.models import *         # pyflakes:ignore
+from ietf.group.models import (Group, GroupStateTransitions, GroupMilestone, GroupHistory,
+    GroupURL, Role, GroupEvent, RoleHistory, GroupMilestoneHistory, MilestoneGroupEvent,
+    ChangeStateGroupEvent)
 
 
 from ietf.person.resources import PersonResource
diff --git a/ietf/iesg/resources.py b/ietf/iesg/resources.py
@@ -4,7 +4,7 @@
 
 from ietf import api
 
-from ietf.iesg.models import *          # pyflakes:ignore
+from ietf.iesg.models import TelechatDate, Telechat, TelechatAgendaItem
 
 
 class TelechatDateResource(ModelResource):
diff --git a/ietf/ipr/resources.py b/ietf/ipr/resources.py
@@ -5,8 +5,8 @@
 
 from ietf import api
 
-from ietf.ipr.models import *                            # pyflakes:ignore
-
+from ietf.ipr.models import ( IprDisclosureBase, IprDocRel, HolderIprDisclosure, ThirdPartyIprDisclosure,
+    RelatedIpr, NonDocSpecificIprDisclosure, GenericIprDisclosure, IprEvent, LegacyMigrationIprEvent )
 
 from ietf.person.resources import PersonResource
 from ietf.name.resources import IprDisclosureStateNameResource
diff --git a/ietf/liaisons/resources.py b/ietf/liaisons/resources.py
@@ -5,7 +5,8 @@
 
 from ietf import api
 
-from ietf.liaisons.models import *                            # pyflakes:ignore
+from ietf.liaisons.models import (LiaisonStatement, LiaisonStatementGroupContacts,
+    LiaisonStatementEvent, LiaisonStatementAttachment, RelatedLiaisonStatement)
 
 
 from ietf.person.resources import EmailResource
diff --git a/ietf/mailtrigger/resources.py b/ietf/mailtrigger/resources.py
@@ -5,7 +5,7 @@
 
 from ietf import api
 
-from ietf.mailtrigger.models import *                            # pyflakes:ignore
+from ietf.mailtrigger.models import Recipient, MailTrigger
 
 
 class RecipientResource(ModelResource):
diff --git a/ietf/message/resources.py b/ietf/message/resources.py
@@ -5,7 +5,7 @@
 
 from ietf import api
 
-from ietf.message.models import *       # pyflakes:ignore
+from ietf.message.models import Message, SendQueue
 
 
 from ietf.person.resources import PersonResource
diff --git a/ietf/name/admin.py b/ietf/name/admin.py
@@ -1,5 +1,9 @@
 from django.contrib import admin
-from models import *                    # pyflakes:ignore
+from ietf.name.models import (GroupTypeName, GroupStateName, RoleName, StreamName,
+    DocRelationshipName, DocTypeName, DocTagName, StdLevelName, IntendedStdLevelName,
+    DocReminderTypeName, BallotPositionName, SessionStatusName, TimeSlotTypeName,
+    ConstraintName, NomineePositionStateName, FeedbackTypeName, DBTemplateTypeName,
+    DraftSubmissionStateName, RoomResourceName)
 
 
 class NameAdmin(admin.ModelAdmin):
diff --git a/ietf/name/resources.py b/ietf/name/resources.py
@@ -5,7 +5,13 @@
 
 from ietf import api
 
-from ietf.name.models import *                            # pyflakes:ignore
+from ietf.name.models import (TimeSlotTypeName, GroupStateName, DocTagName, IntendedStdLevelName,
+    LiaisonStatementPurposeName, DraftSubmissionStateName, DocTypeName, RoleName,
+    IprDisclosureStateName, StdLevelName, LiaisonStatementEventTypeName, GroupTypeName,
+    IprEventTypeName, GroupMilestoneStateName, SessionStatusName, DocReminderTypeName,
+    ConstraintName, MeetingTypeName, DocRelationshipName, RoomResourceName, IprLicenseTypeName,
+    LiaisonStatementTagName, FeedbackTypeName, LiaisonStatementState, StreamName,
+    BallotPositionName, DBTemplateTypeName, NomineePositionStateName)
 
 
 class TimeSlotTypeNameResource(ModelResource):
diff --git a/ietf/nomcom/resources.py b/ietf/nomcom/resources.py
@@ -5,8 +5,8 @@
 
 from ietf import api
 
-from ietf.nomcom.models import *        # pyflakes:ignore
-
+from ietf.nomcom.models import (NomCom, Position, Nominee, ReminderDates, NomineePosition,
+    Feedback, Nomination, FeedbackLastSeen )
 
 from ietf.group.resources import GroupResource
 class NomComResource(ModelResource):
diff --git a/ietf/person/resources.py b/ietf/person/resources.py
@@ -5,7 +5,7 @@
 
 from ietf import api
 
-from ietf.person.models import *        # pyflakes:ignore
+from ietf.person.models import Person, Email, Alias, PersonHistory
 
 
 from ietf.utils.resources import UserResource
diff --git a/ietf/redirects/resources.py b/ietf/redirects/resources.py
@@ -5,7 +5,7 @@
 
 from ietf import api
 
-from ietf.redirects.models import *     # pyflakes:ignore
+from ietf.redirects.models import Redirect, Suffix, Command
 
 
 class RedirectResource(ModelResource):
diff --git a/ietf/settings_releasetest.py b/ietf/settings_releasetest.py
@@ -43,5 +43,5 @@ def __getitem__(self, item):
         },
     }
 
-if TEST_CODE_COVERAGE_CHECKER and not TEST_CODE_COVERAGE_CHECKER._started:
-    TEST_CODE_COVERAGE_CHECKER.start()
+if TEST_CODE_COVERAGE_CHECKER and not TEST_CODE_COVERAGE_CHECKER._started: # pyflakes:ignore
+    TEST_CODE_COVERAGE_CHECKER.start()                          # pyflakes:ignore
diff --git a/ietf/settings_sqlitetest.py b/ietf/settings_sqlitetest.py
@@ -6,7 +6,7 @@
 #
 
 import os 
-from settings import *                  # pyflakes:ignore
+from settings import *                                          # pyflakes:ignore
 
 # Workaround to avoid spending minutes stepping through the migrations in
 # every test run.  The result of this is to use the 'syncdb' way of creating
@@ -37,7 +37,7 @@ def __getitem__(self, item):
         },
     }
 
-if TEST_CODE_COVERAGE_CHECKER and not TEST_CODE_COVERAGE_CHECKER._started:
-    TEST_CODE_COVERAGE_CHECKER.start()
+if TEST_CODE_COVERAGE_CHECKER and not TEST_CODE_COVERAGE_CHECKER._started: # pyflakes:ignore
+    TEST_CODE_COVERAGE_CHECKER.start()                          # pyflakes:ignore
 
 NOMCOM_PUBLIC_KEYS_DIR=os.path.abspath("tmp-nomcom-public-keys-dir")
diff --git a/ietf/submit/resources.py b/ietf/submit/resources.py
@@ -5,7 +5,7 @@
 
 from ietf import api
 
-from ietf.submit.models import *        # pyflakes:ignore
+from ietf.submit.models import Preapproval, SubmissionCheck, Submission, SubmissionEvent
 
 
 from ietf.person.resources import PersonResource
diff --git a/ietf/utils/management/commands/pyflakes.py b/ietf/utils/management/commands/pyflakes.py
@@ -61,6 +61,8 @@ def check(codeString, filename, verbosity=1):
         # honour pyflakes:ignore comments
         messages = [message for message in w.messages
                     if lines[message.lineno-1].find('pyflakes:ignore') < 0]
+        # honour pyflakes:
+
         messages.sort(lambda a, b: cmp(a.lineno, b.lineno))
         if verbosity > 0:
             if len(messages):
