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.

levkowetz · levkowetz · commit 03c18bd33d60 · 2007-06-05T16:58:58.000Z
- Legacy-Id: 235
diff --git 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
@@ -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
@@ -1 +1 @@
-from form_decorator import *
+from form_decorator import form_decorator
diff --git a/ietf/contrib/wizard.py b/ietf/contrib/wizard.py
@@ -29,7 +29,7 @@
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,8 +5,6 @@
 
 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
@@ -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 import RequestContext
 from ietf.utils import log
 import sys
+import time
 
 def add_headers(msg):
     if not(msg.has_key('Message-ID')):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from django.conf.urls.defaults import *`
	`1`	`+from django.conf.urls.defaults import patterns`
`2`	`2`	`from ietf.announcements.models import Announcement`
`3`	`3`
`4`	`4`	`nomcom_dict = {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from form_decorator import *`
	`1`	`+from form_decorator import form_decorator`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from django.db import models`
	`1`	`+#from django.db import models`
`2`	`2`
`3`	`3`	`alphabet = [chr(65 + i) for i in range(0, 26)]`
`4`	`4`	`orgs_dict = {`