From 8f6a21daf6ea69845fc00f2d88d87fad67d39a0c Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 15 Mar 2014 17:38:56 +0000 Subject: [PATCH] Made ietf/iesg pyflakes-clean. - Legacy-Id: 7467 --- ietf/iesg/__init__.py | 1 - ietf/iesg/admin.py | 3 ++- ietf/iesg/agenda.py | 11 +++++------ ietf/iesg/models.py | 1 - ietf/iesg/tests.py | 21 ++++++++++++--------- ietf/iesg/urls.py | 3 +-- ietf/iesg/views.py | 28 +++++++++++++++------------- 7 files changed, 35 insertions(+), 33 deletions(-) diff --git a/ietf/iesg/__init__.py b/ietf/iesg/__init__.py index 9fbb746ea..0dc251ae6 100644 --- a/ietf/iesg/__init__.py +++ b/ietf/iesg/__init__.py @@ -2,7 +2,6 @@ # coding: latin-1 from types import ModuleType -import urls, models, views, feeds, admin # These people will be sent a stack trace if there's an uncaught exception in # code any of the modules imported above: diff --git a/ietf/iesg/admin.py b/ietf/iesg/admin.py index 8dfe86601..eddae67f6 100644 --- a/ietf/iesg/admin.py +++ b/ietf/iesg/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from ietf.iesg.models import * + +from ietf.iesg.models import TelechatDate, TelechatAgendaItem class TelechatAgendaItemAdmin(admin.ModelAdmin): pass diff --git a/ietf/iesg/agenda.py b/ietf/iesg/agenda.py index 7a373239f..4398f31cc 100644 --- a/ietf/iesg/agenda.py +++ b/ietf/iesg/agenda.py @@ -1,15 +1,15 @@ # utilities for constructing agendas for IESG telechats -import codecs, re, os, datetime - +import codecs +import datetime from collections import OrderedDict -from django.http import Http404 from django.conf import settings +from django.http import Http404 +from ietf.doc.models import Document, TelechatDocEvent, LastCallDocEvent, ConsensusDocEvent from ietf.iesg.models import TelechatDate, TelechatAgendaItem -from ietf.doc.models import Document, TelechatDocEvent, LastCallDocEvent, ConsensusDocEvent, DocEvent -from ietf.group.models import Group, GroupMilestone + def get_agenda_date(date=None): if not date: @@ -152,7 +152,6 @@ def fill_in_agenda_docs(date, sections, matches=None): matches = Document.objects.filter(docevent__telechatdocevent__telechat_date=date) matches = matches.select_related("stream", "group").distinct() - docs = [] for doc in matches: if doc.latest_event(TelechatDocEvent, type="scheduled_for_telechat").telechat_date != date: continue diff --git a/ietf/iesg/models.py b/ietf/iesg/models.py index a797f9ab6..e2d340df1 100644 --- a/ietf/iesg/models.py +++ b/ietf/iesg/models.py @@ -35,7 +35,6 @@ import datetime from django.db import models -from django.conf import settings class TelechatAgendaItem(models.Model): TYPE_CHOICES = ( diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py index 8b99fc758..ea7544999 100644 --- a/ietf/iesg/tests.py +++ b/ietf/iesg/tests.py @@ -1,18 +1,22 @@ -import os, shutil, json +import os +import shutil +import json +import datetime -from django.core.urlresolvers import reverse as urlreverse from django.conf import settings +from django.core.urlresolvers import reverse as urlreverse from pyquery import PyQuery -from ietf.utils.test_data import make_test_data -from ietf.doc.models import * -from ietf.person.models import Person +from ietf.doc.models import DocEvent, BallotDocEvent, BallotPositionDocEvent, TelechatDocEvent +from ietf.doc.models import Document, DocAlias, State, RelatedDocument from ietf.group.models import Group, GroupMilestone -from ietf.name.models import StreamName -from ietf.iesg.models import * -from ietf.utils.test_utils import TestCase, login_testing_unauthorized from ietf.iesg.agenda import get_agenda_date, agenda_data +from ietf.iesg.models import TelechatDate +from ietf.name.models import StreamName +from ietf.person.models import Person +from ietf.utils.test_data import make_test_data +from ietf.utils.test_utils import TestCase, login_testing_unauthorized class IESGTests(TestCase): def test_feed(self): @@ -403,7 +407,6 @@ class RescheduleOnAgendaTests(TestCase): e.save() form_id = draft.pk - telechat_date_before = e.telechat_date url = urlreverse('ietf.iesg.views.agenda_documents') diff --git a/ietf/iesg/urls.py b/ietf/iesg/urls.py index 9fe0c11e4..bacb79b63 100644 --- a/ietf/iesg/urls.py +++ b/ietf/iesg/urls.py @@ -32,8 +32,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from django.conf.urls import patterns, url -from django.conf import settings +from django.conf.urls import patterns from django.views.generic import RedirectView urlpatterns = patterns('', diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py index 1d7d71bad..2d9ba73ed 100644 --- a/ietf/iesg/views.py +++ b/ietf/iesg/views.py @@ -32,28 +32,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 codecs, re, os, glob, datetime -import tarfile, StringIO, time +import os +import datetime +import tarfile +import StringIO +import time import itertools import json -from django.core.urlresolvers import reverse as urlreverse -from django.http import Http404, HttpResponse, HttpResponseForbidden, HttpResponseRedirect -from django.template import RequestContext, Context, loader -from django.shortcuts import render_to_response, get_object_or_404, render, redirect + +from django import forms from django.conf import settings from django.db import models -from django import forms +from django.http import HttpResponse +from django.shortcuts import render_to_response, render, redirect +from django.template import RequestContext + -from ietf.iesg.models import TelechatDate, TelechatAgendaItem -from ietf.ipr.models import IprDocAlias from ietf.doc.models import Document, TelechatDocEvent, LastCallDocEvent, ConsensusDocEvent, DocEvent, IESG_BALLOT_ACTIVE_STATES -from ietf.group.models import Group, GroupMilestone -from ietf.person.models import Person - from ietf.doc.utils import update_telechat, augment_events_with_revision +from ietf.group.models import GroupMilestone +from ietf.iesg.agenda import agenda_data, agenda_sections, fill_in_agenda_docs, get_agenda_date +from ietf.iesg.models import TelechatDate from ietf.ietfauth.utils import has_role, role_required, user_is_person -from ietf.iesg.agenda import * +from ietf.person.models import Person def review_decisions(request, year=None): events = DocEvent.objects.filter(type__in=("iesg_disapproved", "iesg_approved"))