From aeaf0413a680ba6097e1a9e7d03d621a4398ecb2 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 15 Mar 2014 23:24:19 +0000 Subject: [PATCH] Made ietf/secr/telechat pyflakes-clean. - Legacy-Id: 7486 --- ietf/secr/telechat/forms.py | 5 +++-- ietf/secr/telechat/models.py | 2 +- ietf/secr/telechat/tests.py | 15 ++++++--------- ietf/secr/telechat/urls.py | 2 +- ietf/secr/telechat/views.py | 22 ++++++++-------------- 5 files changed, 19 insertions(+), 27 deletions(-) diff --git a/ietf/secr/telechat/forms.py b/ietf/secr/telechat/forms.py index 73045f11c..0fe3b383c 100644 --- a/ietf/secr/telechat/forms.py +++ b/ietf/secr/telechat/forms.py @@ -1,9 +1,10 @@ +from django import forms + from ietf.iesg.models import TelechatAgendaItem from ietf.doc.models import State from ietf.name.models import BallotPositionName, DocTagName -from ietf.person.models import Person -from django import forms + # ------------------------------------------------- # Globals diff --git a/ietf/secr/telechat/models.py b/ietf/secr/telechat/models.py index 137941ffa..8b1378917 100644 --- a/ietf/secr/telechat/models.py +++ b/ietf/secr/telechat/models.py @@ -1 +1 @@ -from django.db import models + diff --git a/ietf/secr/telechat/tests.py b/ietf/secr/telechat/tests.py index 46a918a1f..a56ca5953 100644 --- a/ietf/secr/telechat/tests.py +++ b/ietf/secr/telechat/tests.py @@ -1,14 +1,11 @@ -from django.core.urlresolvers import reverse -from ietf.utils import TestCase - -from ietf.iesg.models import TelechatDate, TelechatAgendaItem -from ietf.person.models import Person -from ietf.utils.test_data import make_test_data - -from pyquery import PyQuery - import datetime +from django.core.urlresolvers import reverse + +from ietf.utils import TestCase +from ietf.iesg.models import TelechatDate + + SECR_USER='secretary' def augment_data(): diff --git a/ietf/secr/telechat/urls.py b/ietf/secr/telechat/urls.py index 261c947fb..5516a010e 100644 --- a/ietf/secr/telechat/urls.py +++ b/ietf/secr/telechat/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import * +from django.conf.urls import patterns, url urlpatterns = patterns('ietf.secr.telechat.views', url(r'^$', 'main', name='telechat'), diff --git a/ietf/secr/telechat/views.py b/ietf/secr/telechat/views.py index 08a63009d..eaba3a9de 100644 --- a/ietf/secr/telechat/views.py +++ b/ietf/secr/telechat/views.py @@ -1,25 +1,20 @@ +import os +import datetime + from django.contrib import messages -from django.core.urlresolvers import reverse -from django.db.models import Count -from django.forms.models import inlineformset_factory, modelformset_factory from django.forms.formsets import formset_factory -from django.http import HttpResponseRedirect, HttpResponse from django.shortcuts import render_to_response, get_object_or_404, redirect from django.template import RequestContext -from ietf.doc.models import DocEvent, Document, BallotDocEvent, BallotPositionDocEvent, TelechatDocEvent, WriteupDocEvent, save_document_in_history +from ietf.doc.models import DocEvent, Document, BallotDocEvent, BallotPositionDocEvent, WriteupDocEvent, save_document_in_history from ietf.doc.utils import get_document_content, add_state_change_event -from ietf.group.models import Group -from ietf.name.models import BallotPositionName from ietf.person.models import Person from ietf.doc.lastcall import request_last_call from ietf.doc.mails import email_ad, email_state_changed from ietf.iesg.models import TelechatDate, TelechatAgendaItem from ietf.iesg.agenda import agenda_data, get_doc_section +from ietf.secr.telechat.forms import BallotForm, ChangeStateForm, DateSelectForm, TELECHAT_TAGS, Telechat -from forms import * -import os -import datetime ''' EXPECTED CHANGES: @@ -165,7 +160,6 @@ def doc_detail(request, date, name): if doc.type_id == 'draft': state_type = 'draft-iesg' - started_process = doc.latest_event(type="started_iesg_process") login = request.user.person if doc.active_ballot(): @@ -361,8 +355,8 @@ def minutes(request, date): previous = TelechatDate.objects.filter(date__lt=current).order_by("-date")[0].date events = DocEvent.objects.filter(type='iesg_approved',time__gte=previous,time__lt=current,doc__type='draft') docs = [ e.doc for e in events ] - pa_docs = [ d for d in docs if d.intended_std_level.slug not in ('inf','exp','hist') ] - da_docs = [ d for d in docs if d.intended_std_level.slug in ('inf','exp','hist') ] + pa_docs = [ doc for doc in docs if doc.intended_std_level.slug not in ('inf','exp','hist') ] + da_docs = [ doc for doc in docs if doc.intended_std_level.slug in ('inf','exp','hist') ] agenda = agenda_data(date=date) @@ -387,7 +381,7 @@ def new(request): Telechat.objects.create(telechat_date=date) messages.success(request,'New Telechat Agenda created') - return redirect('telechat_doc', date=date, name=name) + return redirect('telechat_doc', date=date) def roll_call(request, date):