Made ietf/secr/meetings pyflakes-clean and fixed a bug in the signature of is_combined()

- Legacy-Id: 7487

ietf/secr/meetings/forms.py

@@ -1,14 +1,13 @@
+import datetime
+import re
+
 from django import forms
-from django.db.models import Q
 
 from ietf.group.models import Group
 from ietf.meeting.models import Meeting, Room, TimeSlot, Session, ScheduledSession
 from ietf.meeting.timedeltafield import TimedeltaFormField, TimedeltaWidget
 from ietf.name.models import TimeSlotTypeName
 
-import datetime
-import itertools
-import re
 
 DAYS_CHOICES = ((-1,'Saturday'),
                 (0,'Sunday'),

ietf/secr/meetings/models.py

@@ -1,4 +1,3 @@
-from django.db import models
 #from sec.core.models import Meeting
 """
 import datetime

ietf/secr/meetings/tests.py

@@ -4,7 +4,6 @@ from ietf.utils import TestCase
 from ietf.meeting.models import Meeting
 from ietf.utils.test_data import make_test_data
 
-from pyquery import PyQuery
 
 SECR_USER='secretary'
 
@@ -17,7 +16,7 @@ class MainTestCase(TestCase):
 
     def test_view(self):
         "View Test"
-        draft = make_test_data()
+        make_test_data()
         meeting = Meeting.objects.all()[0]
         url = reverse('meetings_view', kwargs={'meeting_id':meeting.number})
         response = self.client.get(url, REMOTE_USER=SECR_USER)

ietf/secr/meetings/urls.py

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

ietf/secr/meetings/views.py

@@ -1,33 +1,35 @@
+import os
+import datetime
+import json
+
 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, Min, Q
+from django.db.models import Max
 from django.forms.formsets import formset_factory
-from django.forms.models import inlineformset_factory, modelformset_factory
+from django.forms.models import inlineformset_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 django.utils.functional import curry
 
 from ietf.utils.mail import send_mail
-from ietf.meeting.models import Meeting, Session, Room, TimeSlot, Schedule, ScheduledSession
+from ietf.meeting.models import Meeting, Session, Room, TimeSlot, ScheduledSession
 from ietf.meeting.helpers import get_schedule
 from ietf.group.models import Group
-from ietf.name.models import SessionStatusName, TimeSlotTypeName
 from ietf.person.models import Person
 from ietf.secr.meetings.blue_sheets import create_blue_sheets
+from ietf.secr.meetings.forms import ( BaseMeetingRoomFormSet, ExtraSessionForm, MeetingModelForm,
+    MeetingRoomForm, NewSessionForm, NonSessionEditForm, NonSessionForm, TimeSlotForm,
+    UploadBlueSheetForm, get_next_slot )
 from ietf.secr.proceedings.views import build_choices, handle_upload_file
 from ietf.secr.sreq.forms import GroupSelectForm
-from ietf.secr.sreq.views import get_initial_session, session_conflicts_as_string
+from ietf.secr.sreq.views import get_initial_session
 from ietf.secr.utils.mail import get_cc_list
 from ietf.secr.utils.meeting import get_upload_root, get_session, get_timeslot
 
-from forms import *
 
-import os
-import datetime
-import json
+
 
 # prep for agenda changes
 # --------------------------------------------------
@@ -79,7 +81,6 @@ def build_timeslots(meeting,room=None):
             source_meeting = get_last_meeting(meeting)
 
         delta = meeting.date - source_meeting.date
-        initial = []
         timeslots = []
         time_seen = set()
         for t in source_meeting.timeslot_set.filter(type='session'):
@@ -133,7 +134,7 @@ def get_last_meeting(meeting):
     last_number = int(meeting.number) - 1
     return Meeting.objects.get(number=last_number)
 
-def is_combined(session):
+def is_combined(session, meeting):
     '''
     Check to see if this session is using two combined timeslots
     '''
@@ -590,7 +591,6 @@ def schedule(request, meeting_id, acronym):
     group = get_object_or_404(Group, acronym=acronym)
     sessions = Session.objects.filter(meeting=meeting,group=group,status__in=('schedw','apprw','appr','sched','canceled'))
     legacy_session = get_initial_session(sessions)
-    session_conflicts = session_conflicts_as_string(group, meeting)
     now = datetime.datetime.now()
 
     # build initial