From 03c18bd33d60e35caa14e259a4e244fb0e8e4213 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Tue, 5 Jun 2007 16:58:58 +0000
Subject: [PATCH] Fixing a bunch of nits pyflakes were complaining about, in
 order to get a clean run.  There are still at least 2 cases of using
 undefined values which needs scrutiny.  - Legacy-Id: 235

---
 ietf/agenda/models.py                       | 5 +----
 ietf/announcements/urls.py                  | 2 +-
 ietf/contrib/__init__.py                    | 2 +-
 ietf/contrib/wizard.py                      | 2 +-
 ietf/idindex/models.py                      | 2 +-
 ietf/idindex/urls.py                        | 3 +--
 ietf/idindex/views.py                       | 4 ++--
 ietf/idtracker/models.py                    | 2 +-
 ietf/idtracker/templatetags/ietf_filters.py | 2 +-
 ietf/idtracker/urls.py                      | 2 +-
 ietf/idtracker/views.py                     | 4 ++--
 ietf/iesg/urls.py                           | 2 +-
 ietf/iesg/views.py                          | 4 ++--
 ietf/ietfauth/urls.py                       | 2 +-
 ietf/ipr/models.py                          | 2 +-
 ietf/ipr/urls.py                            | 2 +-
 ietf/liaisons/urls.py                       | 2 +-
 ietf/mailinglists/urls.py                   | 4 ++--
 ietf/meeting/models.py                      | 6 +++---
 ietf/meeting/urls.py                        | 4 ++--
 ietf/meeting/views.py                       | 4 ++--
 ietf/my/models.py                           | 2 +-
 ietf/my/urls.py                             | 2 +-
 ietf/my/views.py                            | 2 +-
 ietf/proceedings/models.py                  | 2 +-
 ietf/redirects/urls.py                      | 2 +-
 ietf/tests.py                               | 1 +
 ietf/urls.py                                | 2 +-
 ietf/utils/__init__.py                      | 2 --
 ietf/utils/mail.py                          | 3 ++-
 30 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/ietf/agenda/models.py b/ietf/agenda/models.py
index cff65c809..f2fb241a8 100644
--- a/ietf/agenda/models.py
+++ b/ietf/agenda/models.py
@@ -1,5 +1,2 @@
-from django.db import models
-from ietf.proceedings.models import Meeting, MeetingVenue, WgMeetingSession, WgAgenda 
 # Create your models here.
-from ietf.idtracker.models import Acronym, PersonOrOrgInfo, IRTF
-import datetime
+
diff --git a/ietf/announcements/urls.py b/ietf/announcements/urls.py
index 7b00235a0..c0ecc1ce5 100644
--- a/ietf/announcements/urls.py
+++ b/ietf/announcements/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from ietf.announcements.models import Announcement
 
 nomcom_dict = {
diff --git a/ietf/contrib/__init__.py b/ietf/contrib/__init__.py
index df69334ae..372329849 100644
--- a/ietf/contrib/__init__.py
+++ b/ietf/contrib/__init__.py
@@ -1 +1 @@
-from form_decorator import *
+from form_decorator import form_decorator
diff --git a/ietf/contrib/wizard.py b/ietf/contrib/wizard.py
index c1639f3a0..caaf7f9fc 100644
--- a/ietf/contrib/wizard.py
+++ b/ietf/contrib/wizard.py
@@ -29,7 +29,7 @@ from django.shortcuts import render_to_response
 from django.template.context import RequestContext
 
 from django import newforms as forms
-import cPickle as pickle
+#import cPickle as pickle
 import md5
 
 class Wizard( object ):
diff --git a/ietf/idindex/models.py b/ietf/idindex/models.py
index d15fc91b3..4b4c67290 100644
--- a/ietf/idindex/models.py
+++ b/ietf/idindex/models.py
@@ -1,4 +1,4 @@
-from django.db import models
+#from django.db import models
 
 alphabet = [chr(65 + i) for i in range(0, 26)]
 orgs_dict = {
diff --git a/ietf/idindex/urls.py b/ietf/idindex/urls.py
index c28913b5e..cee707e26 100644
--- a/ietf/idindex/urls.py
+++ b/ietf/idindex/urls.py
@@ -1,7 +1,6 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from ietf.idtracker.models import InternetDraft
 from ietf.idindex import views
-from ietf.idindex import forms
 from ietf.idindex.views import alphabet, orgs
 
 info_dict = {
diff --git a/ietf/idindex/views.py b/ietf/idindex/views.py
index 6d5e12187..e55b3342f 100644
--- a/ietf/idindex/views.py
+++ b/ietf/idindex/views.py
@@ -1,8 +1,8 @@
-from django.http import HttpResponse,HttpResponseRedirect
+from django.http import HttpResponse
 from django.views.generic.list_detail import object_list
 from django.db.models import Q
 from django.http import Http404
-from django.template import RequestContext, Context, loader
+from django.template import RequestContext, loader
 from django.shortcuts import render_to_response
 from ietf.idtracker.models import Acronym, IETFWG, InternetDraft
 from ietf.idindex.forms import IDIndexSearchForm
diff --git a/ietf/idtracker/models.py b/ietf/idtracker/models.py
index b89348aff..142480959 100644
--- a/ietf/idtracker/models.py
+++ b/ietf/idtracker/models.py
@@ -1,5 +1,5 @@
 from django.db import models
-from ietf.utils import FKAsOneToOne, log
+from ietf.utils import FKAsOneToOne
 
 class Acronym(models.Model):
     acronym_id = models.AutoField(primary_key=True)
diff --git a/ietf/idtracker/templatetags/ietf_filters.py b/ietf/idtracker/templatetags/ietf_filters.py
index c4a0b4948..42fc32ac4 100644
--- a/ietf/idtracker/templatetags/ietf_filters.py
+++ b/ietf/idtracker/templatetags/ietf_filters.py
@@ -7,7 +7,7 @@ try:
 except ImportError:
     from email import Utils as emailutils
 import re
-from ietf.utils import log
+#from ietf.utils import log
 
 register = template.Library()
 
diff --git a/ietf/idtracker/urls.py b/ietf/idtracker/urls.py
index 4f1526d83..cce6586ab 100644
--- a/ietf/idtracker/urls.py
+++ b/ietf/idtracker/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from ietf.idtracker.models import IDInternal, IDState, IDSubState, DocumentComment, BallotInfo
 from ietf.idtracker import views
 
diff --git a/ietf/idtracker/views.py b/ietf/idtracker/views.py
index 0b0e6899b..59c9ccfdb 100644
--- a/ietf/idtracker/views.py
+++ b/ietf/idtracker/views.py
@@ -1,7 +1,7 @@
 # Create your views here.
-from django.http import HttpResponse,HttpResponseRedirect
+from django.http import HttpResponseRedirect
 from django import newforms as forms
-from django.template import RequestContext, Context, loader
+from django.template import RequestContext
 from django.shortcuts import get_object_or_404, render_to_response
 from django.db.models import Q
 from django.views.generic.list_detail import object_detail, object_list
diff --git a/ietf/iesg/urls.py b/ietf/iesg/urls.py
index 55f0cbf6c..20c656d2a 100644
--- a/ietf/iesg/urls.py
+++ b/ietf/iesg/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from ietf.iesg import views
 from ietf.iesg.models import TelechatMinutes
 from ietf.idtracker.models import BallotInfo
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index d072bbf9d..6dfc2178e 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -1,6 +1,6 @@
 # Create your views here.
-from django.views.generic.date_based import archive_index
-from ietf.idtracker.models import BallotInfo, IDInternal, InternetDraft
+#from django.views.generic.date_based import archive_index
+from ietf.idtracker.models import IDInternal, InternetDraft
 from django.views.generic.list_detail import object_list
 from django.http import Http404
 import datetime 
diff --git a/ietf/ietfauth/urls.py b/ietf/ietfauth/urls.py
index bd7af30bb..f78244a92 100644
--- a/ietf/ietfauth/urls.py
+++ b/ietf/ietfauth/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from ietf.my.views import my
 
 urlpatterns = patterns('django.contrib.auth.views',
diff --git a/ietf/ipr/models.py b/ietf/ipr/models.py
index d204cd3b9..d3f4816f8 100644
--- a/ietf/ipr/models.py
+++ b/ietf/ipr/models.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django import newforms as forms
+#from django import newforms as forms
 from ietf.idtracker.views import InternetDraft
 from ietf.idtracker.models import Rfc
 
diff --git a/ietf/ipr/urls.py b/ietf/ipr/urls.py
index af43b6591..9922b871a 100644
--- a/ietf/ipr/urls.py
+++ b/ietf/ipr/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from ietf.ipr import models, views
 
 urlpatterns = patterns('',
diff --git a/ietf/liaisons/urls.py b/ietf/liaisons/urls.py
index 62e1324d4..b1ec937b9 100644
--- a/ietf/liaisons/urls.py
+++ b/ietf/liaisons/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from ietf.liaisons.models import LiaisonDetail, LiaisonManagers
 
 info_dict = {
diff --git a/ietf/mailinglists/urls.py b/ietf/mailinglists/urls.py
index 3f566c62d..51c817dc4 100644
--- a/ietf/mailinglists/urls.py
+++ b/ietf/mailinglists/urls.py
@@ -1,8 +1,8 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from ietf.idtracker.models import Area
 from ietf.mailinglists import views
 from ietf.mailinglists.models import NonWgMailingList
-from ietf.mailinglists.forms import NonWgStep1
+#from ietf.mailinglists.forms import NonWgStep1
 
 urlpatterns = patterns('django.views.generic.list_detail',
      (r'^area_lists/$', 'object_list', { 'queryset': Area.objects.filter(status=1).select_related().order_by('acronym.acronym'), 'template_name': 'mailinglists/areas_list.html' }),
diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
index a4426df42..dbf24aa25 100644
--- a/ietf/meeting/models.py
+++ b/ietf/meeting/models.py
@@ -1,11 +1,11 @@
-from django.db import models
+#from django.db import models
 #from django.db import models
 
-from ietf.proceedings import models
+#from ietf.proceedings import models
 #from ietf.proceedings.models import Meeting, MeetingVenue, WgMeetingSession, WgAgenda
 #from ietf.proceedings.models import NonSession, NonSessionRef,SessionName
  
-import datetime
+#import datetime
 
 
 # Create your models here.
diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py
index b49e27437..9206b1b4c 100644
--- a/ietf/meeting/urls.py
+++ b/ietf/meeting/urls.py
@@ -1,5 +1,5 @@
-from django.conf.urls.defaults import *
-from ietf.meeting import models, views
+from django.conf.urls.defaults import patterns
+from ietf.meeting import views
 
 urlpatterns = patterns('',
     (r'^(?P<meeting_num>\d+)/agenda.(?P<html_or_txt>\S+)$', views.show_html_agenda),
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 1d12cfe3f..c89186959 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -1,7 +1,7 @@
 # Create your views here.
-import models
+#import models
 from django.shortcuts import render_to_response as render
-from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, SessionName, NonSession, MeetingVenue, IESGHistory, WgAgenda, Minute, Proceeding
+from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, NonSession, MeetingVenue, IESGHistory, Proceeding
 from django.views.generic.list_detail import object_list
 from django.http import Http404
 from  django.db.models import Q
diff --git a/ietf/my/models.py b/ietf/my/models.py
index 71a836239..54f60fe21 100644
--- a/ietf/my/models.py
+++ b/ietf/my/models.py
@@ -1,3 +1,3 @@
-from django.db import models
+#from django.db import models
 
 # Create your models here.
diff --git a/ietf/my/urls.py b/ietf/my/urls.py
index 2bc33532c..2bdc33fed 100644
--- a/ietf/my/urls.py
+++ b/ietf/my/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from ietf.my import views
 
 urlpatterns = patterns('',
diff --git a/ietf/my/views.py b/ietf/my/views.py
index e667588e3..62af922ba 100644
--- a/ietf/my/views.py
+++ b/ietf/my/views.py
@@ -1,6 +1,6 @@
 from django.template import RequestContext
 from django.shortcuts import render_to_response
-from ietf.idtracker.models import PersonOrOrgInfo
+#from ietf.idtracker.models import PersonOrOrgInfo
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ObjectDoesNotExist
 
diff --git a/ietf/proceedings/models.py b/ietf/proceedings/models.py
index 3b064514d..1328fc25e 100644
--- a/ietf/proceedings/models.py
+++ b/ietf/proceedings/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 from ietf.idtracker.models import Acronym, PersonOrOrgInfo, IRTF, AreaGroup, Area, IETFWG
 import datetime
-from ietf.utils import log
+#from ietf.utils import log
 
 # group_acronym is either an IETF Acronym
 #  or an IRTF one, depending on the value of irtf.
diff --git a/ietf/redirects/urls.py b/ietf/redirects/urls.py
index 60306b3c3..6834f1151 100644
--- a/ietf/redirects/urls.py
+++ b/ietf/redirects/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 
 urlpatterns = patterns('',
      (r'^(?P<script>.*.cgi)$', 'ietf.redirects.views.redirect'),
diff --git a/ietf/tests.py b/ietf/tests.py
index 5f6ce6871..e4371c1f7 100644
--- a/ietf/tests.py
+++ b/ietf/tests.py
@@ -34,6 +34,7 @@ def get_patterns(module):
     return all
 
 class UrlTestCase(TestCase):
+    fixtures = ['/www/tools.ietf.org/events/raw/sqldump/ietf_db_dump.xml', ]
     def setUp(self):
         from django.test.client import Client
         self.client = Client()
diff --git a/ietf/urls.py b/ietf/urls.py
index 3abc9e324..69fb66f3c 100644
--- a/ietf/urls.py
+++ b/ietf/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, include
 
 from ietf.iesg.feeds import IESGMinutes
 from ietf.idtracker.feeds import DocumentComments
diff --git a/ietf/utils/__init__.py b/ietf/utils/__init__.py
index b0f17e22f..b01f5b7df 100644
--- a/ietf/utils/__init__.py
+++ b/ietf/utils/__init__.py
@@ -5,8 +5,6 @@ from templated_form import makeTemplatedForm
 
 makeFormattingForm = makeTemplatedForm
 
-__all__ = ["orl", "flattenl", "log", "FKAsOneToOne", "makeTemplatedForm", "makeFormattingForm"]
-
 # See http://docs.python.org/tut/node8.html regarding the use of __all__ and
 # also regarding the practice of using "from xxx import *" in interactive
 # sessions vs. in source files.
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index a50655f76..39a1b352d 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -1,4 +1,4 @@
-from email.Utils import *
+from email.Utils import make_msgid, formatdate, formataddr, parseaddr, getaddresses
 from email.MIMEText import MIMEText
 from email.MIMEMessage import MIMEMessage
 from email.MIMEMultipart import MIMEMultipart
@@ -8,6 +8,7 @@ from django.template.loader import render_to_string
 from django.template import RequestContext
 from ietf.utils import log
 import sys
+import time
 
 def add_headers(msg):
     if not(msg.has_key('Message-ID')):