Made ietf/secr/{drafts,roles,ipradmin} pyflakes-clean.

- Legacy-Id: 7482

ietf/secr/drafts/email.py

@@ -1,17 +1,15 @@
+import datetime
+import glob
+import os
+import time
+
 from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
 from django.template.loader import render_to_string
 
 from ietf.message.models import Message, SendQueue
 from ietf.message.utils import send_scheduled_message_from_send_queue
 from ietf.doc.models import DocumentAuthor
 from ietf.person.models import Person
-from ietf.secr.utils.document import get_start_date
-
-import datetime
-import glob
-import os
-import time
 
 def announcement_from_form(data, **kwargs):
     '''

ietf/secr/drafts/forms.py

@@ -1,16 +1,15 @@
-from django import forms
-from django.forms.formsets import BaseFormSet
-
-from ietf.doc.models import *
-from ietf.name.models import IntendedStdLevelName
-from ietf.group.models import Group
-
-from ietf.secr.utils.ams_utils import get_base, get_revision
-from ietf.secr.groups.forms import RoleForm, get_person
-
 import datetime
 import re
-from os.path import splitext
+import os
+
+from django import forms
+
+from ietf.doc.models import Document, DocAlias, State
+from ietf.name.models import IntendedStdLevelName, DocRelationshipName
+from ietf.group.models import Group
+from ietf.person.models import Person, Email
+from ietf.secr.groups.forms import get_person
+
 
 # ---------------------------------------------
 # Select Choices
@@ -365,7 +364,7 @@ class UploadForm(forms.Form):
             names = []
             for file in (txt,xml,pdf,ps):
                 if file:
-                    base = splitext(file.name)[0]
+                    base = os.path.splitext(file.name)[0]
                     if base not in names:
                         names.append(base)
 
@@ -373,7 +372,7 @@ class UploadForm(forms.Form):
                 raise forms.ValidationError, "All files must have the same base name"
 
             # ensure that the basename is unique
-            base = splitext(txt.name)[0]
+            base = os.path.splitext(txt.name)[0]
             if Document.objects.filter(name=base[:-3]):
                 raise forms.ValidationError, "This document filename already exists: %s" % base[:-3]
 

ietf/secr/drafts/models.py

@@ -1 +1 @@
-from django.db import models
+

ietf/secr/drafts/tests.py

@@ -1,24 +1,23 @@
 from django.core.urlresolvers import reverse
-from ietf.utils import TestCase
 
+from ietf.utils import TestCase
 from ietf.doc.models import Document
 from ietf.utils.test_data import make_test_data
 
-from pyquery import PyQuery
 
 SECR_USER='secretary'
 
 class MainTestCase(TestCase):
     def test_main(self):
         "Main Test"
-        draft = make_test_data()
+        make_test_data()
         url = reverse('drafts')
         response = self.client.get(url, REMOTE_USER=SECR_USER)
         self.assertEqual(response.status_code, 200)
 
     def test_view(self):
         "View Test"
-        draft = make_test_data()
+        make_test_data()
         drafts = Document.objects.filter(type='draft')
         url = reverse('drafts_view', kwargs={'id':drafts[0].name})
         response = self.client.get(url, REMOTE_USER=SECR_USER)

ietf/secr/drafts/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('ietf.secr.drafts.views',
     url(r'^$', 'search', name='drafts'),

ietf/secr/drafts/views.py

@@ -1,34 +1,33 @@
-from django.conf import settings
-from django.contrib.auth.decorators import login_required
-from django.contrib import messages
-from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
-from django.core.urlresolvers import reverse
-from django.db.models import get_model, Max, Q
-from django.forms.formsets import formset_factory
-from django.forms.models import inlineformset_factory, modelformset_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 email import *
-from forms import *
-from ietf.meeting.models import Meeting
-from ietf.name.models import StreamName
-from ietf.doc.models import Document, DocumentAuthor
-from ietf.doc.utils import augment_with_start_time
-from ietf.submit.models import Submission, Preapproval, DraftSubmissionStateName, SubmissionEvent
-from ietf.utils.draft import Draft
-from ietf.secr.proceedings.proc_utils import get_progress_stats
-from ietf.secr.sreq.views import get_meeting
-from ietf.secr.utils.ams_utils import get_base, get_email
-from ietf.secr.utils.document import get_rfc_num, get_start_date
-
 import datetime
 import glob
 import os
 import shutil
-import textwrap
-import time
+
+from django.conf import settings
+from django.contrib import messages
+from django.db.models import Max
+from django.forms.formsets import formset_factory
+from django.shortcuts import render_to_response, get_object_or_404, redirect
+from django.template import RequestContext
+from django.template.loader import render_to_string
+
+#from email import *
+from ietf.doc.models import Document, DocumentAuthor, DocAlias, DocRelationshipName, RelatedDocument, State
+from ietf.doc.models import DocEvent, NewRevisionDocEvent
+from ietf.doc.models import save_document_in_history
+from ietf.meeting.models import Meeting
+from ietf.name.models import StreamName
+from ietf.person.models import Person
+from ietf.secr.drafts.email import announcement_from_form, get_email_initial
+from ietf.secr.drafts.forms import ( AddModelForm, AuthorForm, BaseRevisionModelForm, EditModelForm,
+                                    EmailForm, ExtendForm, ReplaceForm, RevisionModelForm, RfcModelForm,
+                                    RfcObsoletesForm, SearchForm, UploadForm, WithdrawForm )
+from ietf.secr.proceedings.proc_utils import get_progress_stats
+from ietf.secr.sreq.views import get_meeting
+from ietf.secr.utils.ams_utils import get_base
+from ietf.secr.utils.document import get_rfc_num, get_start_date
+from ietf.submit.models import Submission, Preapproval, DraftSubmissionStateName, SubmissionEvent
+from ietf.utils.draft import Draft
 
 
 # -------------------------------------------------
@@ -64,14 +63,6 @@ def get_action_details(draft, session):
         
     return result
 
-def get_doc_url(doc):
-    name = doc.name
-    if doc.get_state_slug() == "rfc":
-        aliases = self.docalias_set.filter(name__startswith="rfc")
-        if aliases:
-            name = aliases[0].name
-    return urlreverse('drafts_view', kwargs={ 'id': name })
-        
 def handle_uploaded_file(f):
     '''
     Save uploaded draft files to temporary directory
@@ -396,8 +387,6 @@ def do_withdraw(draft,request):
 # -------------------------------------------------
 def report_id_activity(start,end):
 
-    from django.db.models import Min
-    
     # get previous meeting
     meeting = Meeting.objects.filter(date__lt=datetime.datetime.now(),type='ietf').order_by('-date')[0]
     syear,smonth,sday = start.split('-')
@@ -437,9 +426,9 @@ def report_id_activity(start,end):
     monday = Meeting.get_ietf_monday()
     cutoff = monday + datetime.timedelta(days=3)
     ff1_date = cutoff - datetime.timedelta(days=28)
-    ff2_date = cutoff - datetime.timedelta(days=21)
-    ff3_date = cutoff - datetime.timedelta(days=14)
-    ff4_date = cutoff - datetime.timedelta(days=7)
+    #ff2_date = cutoff - datetime.timedelta(days=21)
+    #ff3_date = cutoff - datetime.timedelta(days=14)
+    #ff4_date = cutoff - datetime.timedelta(days=7)
     
     ff_docs = Document.objects.filter(type='draft').filter(docevent__type='new_revision',
                                                            docevent__newrevisiondocevent__rev='00',

ietf/secr/ipradmin/views.py

@@ -10,7 +10,7 @@ from django.core.urlresolvers import reverse
 from django.utils.safestring import mark_safe
 from django.shortcuts import redirect
 
-from ietf.secr.lib import template, jsonapi
+from ietf.secr.lib.template import template, jsonapi
 from ietf.secr.ipradmin.managers import IprDetailManager
 from ietf.secr.ipradmin.forms import IprDetailForm, IPRContactFormset
 from ietf.secr.utils.document import get_rfc_num, is_draft

ietf/secr/lib/__init__.py

@@ -1 +1 @@
-from template import template, jsonapi
+

ietf/secr/roles/forms.py

@@ -1,7 +1,8 @@
-from django import forms
-from ietf.secr.areas.models import *
 import re
 
+from django import forms
+
+
 class LiaisonForm(forms.Form):
     liaison_name = forms.CharField(max_length=100,label='Name',help_text="To see a list of people type the first name, or last name, or both.")
     affiliation = forms.CharField(max_length=50)

ietf/secr/roles/models.py

@@ -1 +1 @@
-from django.db import models
+

ietf/secr/roles/tests.py

@@ -5,7 +5,6 @@ from ietf.group.models import Group
 from ietf.person.models import Person
 from ietf.utils.test_data import make_test_data
 
-from pyquery import PyQuery
 import debug                            # pyflakes:ignore
 
 SECR_USER='secretary'
@@ -23,7 +22,7 @@ class MainTestCase(TestCase):
         self.assertEqual(response.status_code, 200)
 
     def test_roles_delete(self):
-        draft = make_test_data()
+        make_test_data()
         augment_data()
         group = Group.objects.filter(acronym='mars')[0]
         role = group.role_set.all()[0]
@@ -34,7 +33,7 @@ class MainTestCase(TestCase):
         self.failUnless('deleted successfully' in response.content)
 
     def test_roles_add(self):
-        draft = make_test_data()
+        make_test_data()
         augment_data()
         person = Person.objects.get(name='Aread Irector')
         group = Group.objects.filter(acronym='mars')[0]

ietf/secr/roles/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('ietf.secr.roles.views',
     url(r'^$', 'main', name='roles'),

ietf/secr/roles/views.py

@@ -1,19 +1,15 @@
 from django.contrib import messages
 from django.core.urlresolvers import reverse
-from django.db.models import Max
-from django.forms.formsets import formset_factory
-from django.http import HttpResponseRedirect, HttpResponse
+from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 
-from ietf.group.models import Group, GroupHistory, Role, RoleHistory
+from ietf.group.models import Group, Role
 from ietf.group.utils import save_group_in_history
 from ietf.secr.groups.forms import RoleForm
 from ietf.secr.sreq.forms import GroupSelectForm
 
-from forms import *
-import re
-import datetime
+#from forms import *
 
 # -------------------------------------------------
 # Helper Functions