diff --git a/ietf/liaisons/__init__.py b/ietf/liaisons/__init__.py index aeccae32c..a285c3e43 100644 --- a/ietf/liaisons/__init__.py +++ b/ietf/liaisons/__init__.py @@ -2,7 +2,6 @@ # coding: latin-1 from types import ModuleType -import urls, models, views, forms, admin, utils, widgets, sitemaps, feeds # These people will be sent a stack trace if there's an uncaught exception in # code any of the modules imported above: diff --git a/ietf/liaisons/admin.py b/ietf/liaisons/admin.py index 21385011e..d0626aa54 100644 --- a/ietf/liaisons/admin.py +++ b/ietf/liaisons/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from ietf.liaisons.models import * +from ietf.liaisons.models import LiaisonStatement class LiaisonStatementAdmin(admin.ModelAdmin): list_display = ['id', 'title', 'from_name', 'to_name', 'submitted', 'purpose', 'related_to'] diff --git a/ietf/liaisons/feeds.py b/ietf/liaisons/feeds.py index 887b21b7d..44649fba8 100644 --- a/ietf/liaisons/feeds.py +++ b/ietf/liaisons/feeds.py @@ -1,8 +1,7 @@ # Copyright The IETF Trust 2007, All Rights Reserved -import re, datetime +import re -from django.conf import settings from django.contrib.syndication.views import Feed, FeedDoesNotExist from django.utils.feedgenerator import Atom1Feed from django.template.loader import render_to_string diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py index 43f3b22dc..ca1d73218 100644 --- a/ietf/liaisons/forms.py +++ b/ietf/liaisons/forms.py @@ -3,7 +3,6 @@ from email.utils import parseaddr from django import forms from django.conf import settings -from django.db.models import Q from django.forms.util import ErrorList from django.core.validators import validate_email, ValidationError from django.template.loader import render_to_string diff --git a/ietf/liaisons/management/commands/check_liaison_deadlines.py b/ietf/liaisons/management/commands/check_liaison_deadlines.py index 73dd585ef..1ba32a5e0 100644 --- a/ietf/liaisons/management/commands/check_liaison_deadlines.py +++ b/ietf/liaisons/management/commands/check_liaison_deadlines.py @@ -1,9 +1,6 @@ import datetime -from django.conf import settings from django.core.management.base import BaseCommand -from django.template.loader import render_to_string -from django.core.urlresolvers import reverse as urlreverse from ietf.liaisons.models import LiaisonStatement from ietf.liaisons.mails import possibly_send_deadline_reminder @@ -20,4 +17,4 @@ class Command(BaseCommand): for l in LiaisonStatement.objects.filter(action_taken=False, deadline__gte=cutoff).exclude(deadline=None): r = possibly_send_deadline_reminder(l) if r: - print 'Liaison %05s#: Deadline reminder sent!' % liaison.pk + print 'Liaison %05s#: Deadline reminder sent!' % l.pk diff --git a/ietf/liaisons/management/commands/remind_update_sdo_list.py b/ietf/liaisons/management/commands/remind_update_sdo_list.py index fb37be74f..e730ac637 100644 --- a/ietf/liaisons/management/commands/remind_update_sdo_list.py +++ b/ietf/liaisons/management/commands/remind_update_sdo_list.py @@ -1,9 +1,6 @@ from optparse import make_option -from django.conf import settings -from django.core.mail import EmailMessage from django.core.management.base import BaseCommand -from django.template.loader import render_to_string from ietf.group.models import Group from ietf.liaisons.mails import send_sdo_reminder diff --git a/ietf/liaisons/sitemaps.py b/ietf/liaisons/sitemaps.py index 161fed1c3..3bacf0d74 100644 --- a/ietf/liaisons/sitemaps.py +++ b/ietf/liaisons/sitemaps.py @@ -1,7 +1,6 @@ # Copyright The IETF Trust 2007, All Rights Reserved # from django.contrib.sitemaps import Sitemap -from django.conf import settings from ietf.liaisons.models import LiaisonStatement diff --git a/ietf/liaisons/tests.py b/ietf/liaisons/tests.py index 95456b4ff..a447dd14d 100644 --- a/ietf/liaisons/tests.py +++ b/ietf/liaisons/tests.py @@ -441,7 +441,7 @@ class LiaisonManagementTests(TestCase): def test_send_sdo_reminder(self): make_test_data() - liaison = make_liaison_models() + make_liaison_models() mailbox_before = len(outbox) send_sdo_reminder(Group.objects.filter(type="sdo")[0]) diff --git a/ietf/liaisons/utils.py b/ietf/liaisons/utils.py index 75e5f3766..91a4a10ee 100644 --- a/ietf/liaisons/utils.py +++ b/ietf/liaisons/utils.py @@ -1,12 +1,11 @@ from django.db.models import Q from ietf.group.models import Group, Role -from ietf.person.models import Person from ietf.liaisons.models import LiaisonStatement from ietf.ietfauth.utils import has_role, passes_test_decorator -from ietf.liaisons.accounts import (is_ietfchair, is_iabchair, is_iab_executive_director, - get_ietf_chair, get_iab_chair, get_iab_executive_director, +from ietf.liaisons.accounts import (is_ietfchair, is_iabchair, is_iab_executive_director, is_irtfchair, + get_ietf_chair, get_iab_chair, get_iab_executive_director, get_irtf_chair, is_secretariat, can_add_liaison, get_person_for_user, proxy_personify_role) can_submit_liaison_required = passes_test_decorator( diff --git a/ietf/liaisons/views.py b/ietf/liaisons/views.py index 0ad4f00d4..c197616a2 100644 --- a/ietf/liaisons/views.py +++ b/ietf/liaisons/views.py @@ -1,17 +1,16 @@ # Copyright The IETF Trust 2007, All Rights Reserved -import datetime, json +import datetime +import json from email.utils import parseaddr -from django.conf import settings -from django.core.urlresolvers import reverse from django.core.validators import validate_email, ValidationError -from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden +from django.http import HttpResponse, HttpResponseForbidden from django.shortcuts import render_to_response, get_object_or_404, redirect from django.template import RequestContext from ietf.liaisons.models import LiaisonStatement from ietf.liaisons.accounts import (get_person_for_user, can_add_outgoing_liaison, - can_add_incoming_liaison, LIAISON_EDIT_GROUPS, + can_add_incoming_liaison, is_ietfchair, is_iabchair, is_iab_executive_director, can_edit_liaison, is_secretariat) from ietf.liaisons.forms import liaison_form_factory