Made ietf/secr/proceedings pyflakes-clean.

- Legacy-Id: 7492

ietf/secr/proceedings/forms.py

@@ -1,14 +1,15 @@
+import os
+
 from django import forms
 from django.conf import settings
-from django.db.models import Max
 from django.template.defaultfilters import filesizeformat
 
 from ietf.doc.models import Document
 from ietf.name.models import DocTypeName
 from ietf.meeting.models import Meeting
 
-import os
-import re
+
+
 # ---------------------------------------------
 # Globals
 # ---------------------------------------------

ietf/secr/proceedings/models.py

@@ -1,12 +1,11 @@
+import os
+
 from django.conf import settings
 from django.db import models
-from django.shortcuts import get_object_or_404
 
 from ietf.meeting.models import Meeting
 from ietf.secr.utils.meeting import get_upload_root
 
-import datetime
-import os
 
 class InterimManager(models.Manager):
     '''A custom manager to limit objects to type=interim'''
@@ -68,6 +67,6 @@ class Registration(models.Model):
     country = models.CharField(max_length=2)
     
     def __unicode__(self):
-        return "%s %s" % (fname, lname)
+        return "%s %s" % (self.fname, self.lname)
     class Meta:
         db_table = 'registrations'

ietf/secr/proceedings/proc_utils.py

@@ -3,26 +3,27 @@ proc_utils.py
 
 This module contains all the functions for generating static proceedings pages
 '''
-from django.conf import settings
-from django.shortcuts import render_to_response
-from ietf.group.models import Group, Role
-from ietf.group.utils import get_charter_text
-from ietf.meeting.helpers import get_schedule, meeting_updated
-from ietf.meeting.models import Session, TimeSlot, Meeting, ScheduledSession
-from ietf.doc.models import Document, RelatedDocument, DocEvent
-from itertools import chain
-from ietf.secr.proceedings.models import Registration
-from ietf.secr.utils.document import get_rfc_num
-from ietf.secr.utils.group import groups_by_session
-from ietf.secr.utils.meeting import get_upload_root, get_proceedings_path, get_material, get_session
-from models import InterimMeeting    # proxy model
-
 from urllib2 import urlopen
 import datetime
 import glob
 import os
 import shutil
-import stat
+
+from django.conf import settings
+from django.shortcuts import render_to_response
+
+from ietf.doc.models import Document, RelatedDocument, DocEvent
+from ietf.group.models import Group, Role
+from ietf.group.utils import get_charter_text
+from ietf.meeting.helpers import get_schedule
+from ietf.meeting.models import Session, Meeting, ScheduledSession
+from ietf.secr.proceedings.models import InterimMeeting    # proxy model
+from ietf.secr.proceedings.models import Registration
+from ietf.secr.utils.document import get_rfc_num
+from ietf.secr.utils.group import groups_by_session
+from ietf.secr.utils.meeting import get_upload_root, get_proceedings_path, get_material, get_session
+
+
 
 # -------------------------------------------------
 # Helper Functions
@@ -80,9 +81,9 @@ def get_progress_stats(sdate,edate):
     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/proceedings/report_progress_report.py

@@ -7,7 +7,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
 from ietf.secr.proceedings.proc_utils import gen_progress
 from ietf.meeting.models import Meeting
 import datetime
-import sys
+
 
 now = datetime.date.today()
 meeting = Meeting.objects.filter(date__lte=now).order_by('-date')[0]

ietf/secr/proceedings/templatetags/ams_filters.py

@@ -1,6 +1,7 @@
 from django import template
+
 from ietf.person.models import Person
-import datetime
+
 
 register = template.Library()
 
@@ -63,7 +64,7 @@ def smart_login(user):
     Expects a Person object.  If person is a Secretariat returns "on behalf of the"
     '''
     if not isinstance (user, Person):
-        return value
+        return user
     if user.role_set.filter(name='secr',group__acronym='secretariat'):
         return '%s, on behalf of the' % user
     else:

ietf/secr/proceedings/tests.py

@@ -1,11 +1,11 @@
-from django.core.urlresolvers import reverse
-from ietf.utils import TestCase
+import debug                            # pyflakes:ignore
 
+from django.core.urlresolvers import reverse
+
+from ietf.utils import TestCase
 from ietf.meeting.models import Meeting
 from ietf.utils.test_data import make_test_data
 
-from pyquery import PyQuery
-import debug                            # pyflakes:ignore
 
 SECR_USER='secretary'
 

ietf/secr/proceedings/urls.py

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

ietf/secr/proceedings/views.py

@@ -1,44 +1,37 @@
-from django.conf import settings
-from django.contrib import messages
-from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
-from django.core.urlresolvers import reverse
-from django.db.models import Max
-from django.forms.formsets import formset_factory
-from django.forms.models import inlineformset_factory, modelformset_factory
-from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden
-from django.shortcuts import render_to_response, get_object_or_404
-from django.template import RequestContext
-from django.template import Context
-from django.template.loader import get_template
-from django.utils.text import slugify
-from django.db.models import Max,Count,get_model
-
-from ietf.secr.lib.template import jsonapi
-from ietf.secr.proceedings.proc_utils import *
-from ietf.secr.sreq.forms import GroupSelectForm
-from ietf.secr.utils.decorators import check_permissions, sec_only
-from ietf.secr.utils.document import get_rfc_num, get_full_path
-from ietf.secr.utils.group import get_my_groups, groups_by_session
-from ietf.secr.utils.meeting import get_upload_root, get_proceedings_path, get_material, get_timeslot
-
-from ietf.doc.models import Document, DocAlias, DocEvent, State, NewRevisionDocEvent, RelatedDocument
-from ietf.group.models import Group
-from ietf.group.utils import get_charter_text
-from ietf.ietfauth.utils import has_role
-from ietf.meeting.models import Meeting, Session, TimeSlot, ScheduledSession
-from ietf.name.models import MeetingTypeName, SessionStatusName
-from ietf.person.models import Person
-
-from forms import *
-from models import InterimMeeting    # proxy model
-
 import datetime
 import glob
 import itertools
 import os
-import re
 import shutil
-import zipfile
+
+from django.conf import settings
+from django.contrib import messages
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.urlresolvers import reverse
+from django.db.models import Max
+from django.http import HttpResponseRedirect
+from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
+from django.utils.text import slugify
+
+from ietf.secr.lib.template import jsonapi
+from ietf.secr.sreq.forms import GroupSelectForm
+from ietf.secr.utils.decorators import check_permissions, sec_only
+from ietf.secr.utils.document import get_full_path
+from ietf.secr.utils.group import get_my_groups, groups_by_session
+from ietf.secr.utils.meeting import get_upload_root, get_material, get_timeslot
+from ietf.doc.models import Document, DocAlias, DocEvent, State, NewRevisionDocEvent
+from ietf.group.models import Group
+from ietf.ietfauth.utils import has_role
+from ietf.meeting.models import Meeting, Session, TimeSlot, ScheduledSession
+from ietf.secr.proceedings.forms import EditSlideForm, InterimMeetingForm, ReplaceSlideForm, UnifiedUploadForm
+from ietf.secr.proceedings.proc_utils import ( gen_acknowledgement, gen_agenda, gen_areas, gen_attendees,
+    gen_group_pages, gen_index, gen_irtf, gen_overview, gen_plenaries, gen_progress, gen_research,
+    gen_training, create_proceedings, create_interim_directory )
+
+from ietf.secr.proceedings.models import InterimMeeting    # proxy model
+
+
 
 # -------------------------------------------------
 # Helper Functions
@@ -273,8 +266,6 @@ def ajax_order_slide(request):
 
     # get all the slides for this session
     session = slide.session_set.all()[0]
-    meeting = session.meeting
-    group = session.group
     qs = session.materials.exclude(states__slug='deleted').filter(type='slides').order_by('order')
 
     # move slide and reorder list
@@ -741,8 +732,6 @@ def select_interim(request):
         groups = get_my_groups(request.user)
         choices = build_choices(groups)
         group_form = GroupSelectForm(choices=choices)
-        irtf_form = None
-        training_form = None
 
     return render_to_response('proceedings/interim_select.html', {
         'group_form': group_form},