Made ietf/meeting pyflakes-clean. Removed some debug-related dead code.

- Legacy-Id: 7473

ietf/meeting/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from ietf.meeting.models import *
+from ietf.meeting.models import Meeting, Room, Session, TimeSlot, Constraint
 
 class RoomAdmin(admin.ModelAdmin):
     list_display = ["id", "meeting", "name", "capacity", ]

ietf/meeting/ajax.py

@@ -1,16 +1,15 @@
 import json
 
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, redirect
-from django.http import HttpResponseRedirect, HttpResponse
+from django.http import HttpResponse
 
 from dajaxice.decorators import dajaxice_register
-from ietf.ietfauth.utils import role_required, has_role, user_is_person
-from ietf.name.models import TimeSlotTypeName
 
+from ietf.ietfauth.utils import role_required, has_role, user_is_person
 from ietf.meeting.helpers import get_meeting, get_schedule, get_schedule_by_id, agenda_permissions
-from ietf.meeting.views   import edit_timeslots, edit_agenda
 from ietf.meeting.models import TimeSlot, Session, Schedule, Room, Constraint
+from ietf.meeting.views   import edit_timeslots, edit_agenda
+from ietf.name.models import TimeSlotTypeName
 
 import debug                            # pyflakes:ignore
 

ietf/meeting/feeds.py

@@ -1,4 +1,4 @@
-import re, os, datetime
+import os
 
 from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed

ietf/meeting/helpers.py

@@ -1,11 +1,8 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
 import datetime
-import os
-
 import pytz
 
-from django.http import Http404
 from django.http import HttpRequest
 from django.db.models import Max, Q
 from django.conf import settings
@@ -15,11 +12,10 @@ from django.shortcuts import get_object_or_404
 
 import debug                            # pyflakes:ignore
 
-from ietf.ietfauth.utils import has_role, user_is_person
-from ietf.utils.history import find_history_active_at
-from ietf.doc.models import Document, State
-from ietf.meeting.models import Meeting
 from ietf.group.models import Group
+from ietf.ietfauth.utils import has_role, user_is_person
+from ietf.meeting.models import Meeting
+from ietf.utils.history import find_history_active_at
 
 def find_ads_for_meeting(meeting):
     ads = []

ietf/meeting/management/commands/schedwrite.py

@@ -1,7 +1,7 @@
-from django.core.management.base import BaseCommand
+from django.core.management.base import BaseCommand, CommandError
 from django.core import serializers
 from optparse import make_option
-import sys
+
 
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
@@ -16,8 +16,6 @@ class Command(BaseCommand):
     args = 'meetingname [owner] schedname'
 
     def handle(self, *labels, **options):
-        from django.conf import settings
-        from django.test.utils import get_runner
 
         meetingname = labels[0]
         schedname   = labels[1]

ietf/meeting/migrations/0001_initial.py

@@ -1,8 +1,5 @@
 # encoding: utf-8
-import datetime
-from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 class Migration(SchemaMigration):
 

ietf/meeting/migrations/0002_auto__add_field_session_short.py

@@ -1,8 +1,6 @@
 # encoding: utf-8
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 class Migration(SchemaMigration):
 

ietf/meeting/migrations/0003_auto__add_field_meeting_agenda_note.py

@@ -1,8 +1,6 @@
 # encoding: utf-8
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 class Migration(SchemaMigration):
 

ietf/meeting/migrations/0004_auto__add_scheduledsession__add_namedagenda__add_field_meeting_officia.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

ietf/meeting/migrations/0005_auto__add_field_scheduledsession_modified__chg_field_scheduledsession_.py

@@ -2,7 +2,6 @@
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

ietf/meeting/migrations/0006_scheduled_session_fixup.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
-import datetime
 import sys
-from south.db import db
+
 from south.v2 import DataMigration
-from django.db import models
 
 class Migration(DataMigration):
 

ietf/meeting/migrations/0009_auto__add_field_scheduledsession_extendedfrom.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

ietf/meeting/migrations/0010_add_recorded_badness.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

ietf/meeting/migrations/0011_bepresent.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-import datetime
 import sys
-from south.db import db
+
 from south.v2 import DataMigration
-from django.db import models
+
 from ietf.meeting.models import Meeting
 
 def make_essential_person(session, person):

ietf/meeting/migrations/0012_auto__add_field_scheduledsession_pinned.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

ietf/meeting/migrations/0013_auto__del_field_timeslot_session.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

ietf/meeting/models.py

@@ -1,6 +1,7 @@
 # old meeting models can be found in ../proceedings/models.py
 
-import pytz, datetime
+import pytz
+import datetime
 from urlparse import urljoin
 import copy
 import os
@@ -10,15 +11,15 @@ import debug                            # pyflakes:ignore
 
 from django.db import models
 from django.conf import settings
-from timedeltafield import TimedeltaField
-
 # mostly used by json_dict()
 from django.template.defaultfilters import slugify, date as date_format, time as time_format
 
-from ietf.group.models import Group
-from ietf.person.models import Person
+from timedeltafield import TimedeltaField
+
 from ietf.doc.models import Document
+from ietf.group.models import Group
 from ietf.name.models import MeetingTypeName, TimeSlotTypeName, SessionStatusName, ConstraintName
+from ietf.person.models import Person
 
 countries = pytz.country_names.items()
 countries.sort(lambda x,y: cmp(x[1], y[1]))
@@ -215,7 +216,7 @@ class Room(models.Model):
         days, time_slices, slots  = self.meeting.build_timeslices()
         for day in days:
             for ts in slots[day]:
-                ts0 = TimeSlot.objects.create(type_id=ts.type_id,
+                TimeSlot.objects.create(type_id=ts.type_id,
                                     meeting=self.meeting,
                                     name=ts.name,
                                     time=ts.time,

ietf/meeting/test_data.py

@@ -1,10 +1,10 @@
 import datetime
 
-from ietf.utils.test_data import make_test_data
-from ietf.meeting.models import Meeting, Room, TimeSlot, Session, Schedule, ScheduledSession
-from ietf.person.models import Person
 from ietf.doc.models import Document, State
 from ietf.group.models import Group
+from ietf.meeting.models import Meeting, Room, TimeSlot, Session, Schedule, ScheduledSession
+from ietf.person.models import Person
+from ietf.utils.test_data import make_test_data
 
 
 def make_meeting_test_data():

ietf/meeting/tests_api.py

@@ -1,15 +1,14 @@
-import datetime, json
+import datetime
+import json
 from urlparse import urlsplit
 
-from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse as urlreverse
 
-from ietf.utils import TestCase
-from ietf.person.models import Person
 from ietf.group.models import Group
 from ietf.meeting.models import Schedule, TimeSlot, Session, ScheduledSession, Meeting, Constraint
-from ietf.meeting.helpers import get_meeting
 from ietf.meeting.test_data import make_meeting_test_data
+from ietf.person.models import Person
+from ietf.utils import TestCase
 
 
 class ApiTests(TestCase):
@@ -24,10 +23,10 @@ class ApiTests(TestCase):
         meeting = make_meeting_test_data()
         session = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
         mars_scheduled = ScheduledSession.objects.get(session=session)
-        mars_slot = mars_scheduled.timeslot
+        #mars_slot = mars_scheduled.timeslot ## never used
 
         ames_scheduled = ScheduledSession.objects.get(session__meeting=meeting, session__group__acronym="ames")
-        ames_slot = ames_scheduled.timeslot
+        #ames_slot = ames_scheduled.timeslot ## never used
 
         def do_post(to):
             # move this session from one timeslot to another
@@ -140,7 +139,7 @@ class ApiTests(TestCase):
         self.assertTrue(not TimeSlot.objects.filter(pk__in=timeslots_before))
 
     def test_group_json(self):
-        meeting = make_meeting_test_data()
+        make_meeting_test_data()
         group = Group.objects.get(acronym="mars")
 
         url = urlreverse("ietf.group.ajax.group_json", kwargs=dict(acronym=group.acronym))
@@ -150,7 +149,7 @@ class ApiTests(TestCase):
         self.assertEqual(info["name"], group.name)
 
     def test_person_json(self):
-        meeting = make_meeting_test_data()
+        make_meeting_test_data()
         person = Person.objects.get(user__username="ad")
 
         url = urlreverse("ietf.person.ajax.person_json", kwargs=dict(personid=person.pk))

ietf/meeting/tests_views.py

@@ -1,18 +1,16 @@
-import os, shutil, datetime
+import os
+import shutil
+import datetime
 
 from django.core.urlresolvers import reverse as urlreverse
 from django.conf import settings
 
 from pyquery import PyQuery
 
-from ietf.utils.mail import outbox
-from ietf.utils.test_utils import login_testing_unauthorized
-from ietf.utils import TestCase
-
 from ietf.doc.models import Document
-from ietf.group.models import Group
-from ietf.meeting.models import Session, TimeSlot, ScheduledSession
+from ietf.meeting.models import Session, TimeSlot
 from ietf.meeting.test_data import make_meeting_test_data
+from ietf.utils import TestCase
 
 class MeetingTests(TestCase):
     def setUp(self):

ietf/meeting/urls.py

@@ -1,7 +1,8 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from django.conf.urls import patterns, url, include
+from django.conf.urls import patterns
 from django.views.generic import RedirectView
+
 from ietf.meeting import views
 from ietf.meeting import ajax
 

ietf/meeting/views.py

@@ -4,14 +4,14 @@ import datetime
 import os
 import re
 import tarfile
-import debug                            # pyflakes:ignore
 import urllib
 import json
-
 from tempfile import mkstemp
 
+import debug                            # pyflakes:ignore
+
 from django import forms
-from django.shortcuts import render_to_response, get_object_or_404, redirect
+from django.shortcuts import render_to_response, redirect
 from django.http import HttpResponse, Http404
 from django.core.urlresolvers import reverse
 from django.db.models import Q
@@ -24,19 +24,17 @@ from django.db.models import Max
 from django.forms.models import modelform_factory
 from django.views.decorators.csrf import ensure_csrf_cookie
 
-from ietf.utils.pipe import pipe
-from ietf.ietfauth.utils import role_required, has_role
 from ietf.doc.models import Document, State
-from ietf.person.models  import Person
-from ietf.meeting.models import Meeting, TimeSlot, Session, Schedule
 from ietf.group.models import Group
-
+from ietf.ietfauth.utils import role_required, has_role
+from ietf.meeting.models import Meeting, TimeSlot, Session, Schedule
 from ietf.meeting.helpers import get_areas
 from ietf.meeting.helpers import build_all_agenda_slices, get_wg_name_list
-from ietf.meeting.helpers import get_scheduledsessions_from_schedule, get_all_scheduledsessions_from_schedule
+from ietf.meeting.helpers import get_all_scheduledsessions_from_schedule
 from ietf.meeting.helpers import get_modified_from_scheduledsessions
 from ietf.meeting.helpers import get_wg_list, find_ads_for_meeting
 from ietf.meeting.helpers import get_meeting, get_schedule, agenda_permissions, meeting_updated
+from ietf.utils.pipe import pipe
 
 @decorator_from_middleware(GZipMiddleware)
 def materials(request, meeting_num=None):
@@ -205,19 +203,8 @@ def edit_agenda(request, num=None, schedule_name=None):
         return agenda_create(request, num, schedule_name)
 
     user  = request.user
-    requestor = "AnonymousUser"
-    if not user.is_anonymous():
-        #print "user: %s" % (user)
-        try:
-            requestor = user.person
-        except Person.DoesNotExist:
-            # if we can not find them, leave them alone, only used for debugging.
-            pass
-
     meeting = get_meeting(num)
-    #sys.stdout.write("requestor: %s for sched_name: %s \n" % ( requestor, schedule_name ))
     schedule = get_schedule(meeting, schedule_name)
-    #sys.stdout.write("2 requestor: %u for sched owned by: %u \n" % ( requestor.id, schedule.owner.id ))
 
     meeting_base_url = request.build_absolute_uri(meeting.base_url())
     site_base_url = request.build_absolute_uri('/')[:-1] # skip the trailing slash
@@ -231,8 +218,6 @@ def edit_agenda(request, num=None, schedule_name=None):
     can_see, can_edit = agenda_permissions(meeting, schedule, user)
 
     if not can_see:
-        #sys.stdout.write("visible: %s public: %s owner: %s request from: %s\n" % (
-        #        schedule.visible, schedule.public, schedule.owner, requestor))
         return HttpResponse(render_to_string("meeting/private_agenda.html",
                                              {"schedule":schedule,
                                               "meeting": meeting,