From 5bbbe24e9143b38001cb92a6644153fb3a144bf3 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sat, 15 Mar 2014 21:37:19 +0000
Subject: [PATCH] Made ietf/secr/announcement pyflakes-clean.  - Legacy-Id:
 7481

---
 ietf/secr/announcement/forms.py  |  8 +++-----
 ietf/secr/announcement/models.py |  3 ---
 ietf/secr/announcement/tests.py  | 21 +++++++++------------
 ietf/secr/announcement/urls.py   |  2 +-
 ietf/secr/announcement/views.py  | 13 +++++--------
 5 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/ietf/secr/announcement/forms.py b/ietf/secr/announcement/forms.py
index ae37f31d7..7995aed41 100644
--- a/ietf/secr/announcement/forms.py
+++ b/ietf/secr/announcement/forms.py
@@ -1,12 +1,10 @@
 from django import forms
 from django.core.validators import validate_email
 
-from models import *
-from ietf.secr.utils.mail import MultiEmailField
-from ietf.secr.utils.group import current_nomcom
-
-from ietf.message.models import Message
+from ietf.group.models import Group, Role
 from ietf.ietfauth.utils import has_role
+from ietf.message.models import Message
+from ietf.secr.utils.group import current_nomcom
 
 # ---------------------------------------------
 # Globals
diff --git a/ietf/secr/announcement/models.py b/ietf/secr/announcement/models.py
index d3855c5b0..e69de29bb 100644
--- a/ietf/secr/announcement/models.py
+++ b/ietf/secr/announcement/models.py
@@ -1,3 +0,0 @@
-from django.db import models
-#from ietf.message.models import Message
-from ietf.group.models import Group, Role
diff --git a/ietf/secr/announcement/tests.py b/ietf/secr/announcement/tests.py
index 74b98a34c..58778578f 100644
--- a/ietf/secr/announcement/tests.py
+++ b/ietf/secr/announcement/tests.py
@@ -1,16 +1,13 @@
 from django.db import connection
 from django.core.urlresolvers import reverse
-from ietf.utils import TestCase
-from django.contrib.auth.models import User
-
-from ietf.group.models import Group
-from ietf.ietfauth.utils import has_role
-from ietf.person.models import Person
-from ietf.utils.mail import outbox
-from ietf.utils.test_data import make_test_data
 
 from pyquery import PyQuery
 
+from ietf.utils import TestCase
+from ietf.person.models import Person
+from ietf.utils.test_data import make_test_data
+
+
 SECR_USER='secretary'
 WG_USER=''
 AD_USER=''
@@ -19,7 +16,7 @@ class MainTestCase(TestCase):
     # ------- Test View -------- #
     def test_main(self):
         "Main Test"
-        draft = make_test_data()
+        make_test_data()
         url = reverse('announcement')
         r = self.client.get(url, REMOTE_USER=SECR_USER)
         self.assertEqual(r.status_code, 200)
@@ -30,7 +27,7 @@ class DummyCase(TestCase):
 class UnauthorizedCase(TestCase):
     def test_unauthorized(self):
         "Unauthorized Test"
-        draft = make_test_data()
+        make_test_data()
         url = reverse('announcement')
         person = Person.objects.filter(role__group__acronym='mars')[0]
         r = self.client.get(url,REMOTE_USER=person.user)
@@ -39,7 +36,7 @@ class UnauthorizedCase(TestCase):
 class SubmitCase(TestCase):
     def test_invalid_submit(self):
         "Invalid Submit"
-        draft = make_test_data()
+        make_test_data()
         url = reverse('announcement')
         post_data = {'id_subject':''}
         #self.client.login(remote_user='rcross')
@@ -50,7 +47,7 @@ class SubmitCase(TestCase):
         
     def test_valid_submit(self):
         "Valid Submit"
-        draft = make_test_data()
+        make_test_data()
         #ietf.utils.mail.test_mode = True
         url = reverse('announcement')
         redirect = reverse('announcement_confirm')
diff --git a/ietf/secr/announcement/urls.py b/ietf/secr/announcement/urls.py
index f31dd88de..4a318e1c9 100644
--- a/ietf/secr/announcement/urls.py
+++ b/ietf/secr/announcement/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('ietf.secr.announcement.views',
     url(r'^$', 'main', name='announcement'),
diff --git a/ietf/secr/announcement/views.py b/ietf/secr/announcement/views.py
index ed37f5e59..fe2418dd0 100644
--- a/ietf/secr/announcement/views.py
+++ b/ietf/secr/announcement/views.py
@@ -1,16 +1,13 @@
 from django.contrib import messages
-from django.core.urlresolvers import reverse
-from django.http import HttpResponse, HttpResponseForbidden
-from django.shortcuts import render_to_response, get_object_or_404, redirect
+from django.http import HttpResponseForbidden
+from django.shortcuts import render_to_response, redirect
 from django.template import RequestContext
 
+from ietf.group.models import Role
 from ietf.ietfauth.utils import has_role
-from ietf.utils.mail import send_mail_text
-from ietf.group.models import Group
-from ietf.secr.utils.group import current_nomcom
+from ietf.secr.announcement.forms import AnnounceForm
 from ietf.secr.utils.decorators import check_for_cancel
-
-from forms import *
+from ietf.utils.mail import send_mail_text
 
 # -------------------------------------------------
 # Helper Functions