Skip to content

Commit 12f6a55

Browse files
committed
Made ietf/liaisons pyflakes-clean, which also fixed several places the code would crash. The IRTF chair can never have been able to use the liaison tool without getting a server 500 ...
- Legacy-Id: 7471
1 parent 3ed7113 commit 12f6a55

10 files changed

Lines changed: 10 additions & 22 deletions

File tree

ietf/liaisons/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# coding: latin-1
33

44
from types import ModuleType
5-
import urls, models, views, forms, admin, utils, widgets, sitemaps, feeds
65

76
# These people will be sent a stack trace if there's an uncaught exception in
87
# code any of the modules imported above:

ietf/liaisons/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.contrib import admin
22

3-
from ietf.liaisons.models import *
3+
from ietf.liaisons.models import LiaisonStatement
44

55
class LiaisonStatementAdmin(admin.ModelAdmin):
66
list_display = ['id', 'title', 'from_name', 'to_name', 'submitted', 'purpose', 'related_to']

ietf/liaisons/feeds.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Copyright The IETF Trust 2007, All Rights Reserved
22

3-
import re, datetime
3+
import re
44

5-
from django.conf import settings
65
from django.contrib.syndication.views import Feed, FeedDoesNotExist
76
from django.utils.feedgenerator import Atom1Feed
87
from django.template.loader import render_to_string

ietf/liaisons/forms.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
from django import forms
55
from django.conf import settings
6-
from django.db.models import Q
76
from django.forms.util import ErrorList
87
from django.core.validators import validate_email, ValidationError
98
from django.template.loader import render_to_string

ietf/liaisons/management/commands/check_liaison_deadlines.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import datetime
22

3-
from django.conf import settings
43
from django.core.management.base import BaseCommand
5-
from django.template.loader import render_to_string
6-
from django.core.urlresolvers import reverse as urlreverse
74

85
from ietf.liaisons.models import LiaisonStatement
96
from ietf.liaisons.mails import possibly_send_deadline_reminder
@@ -20,4 +17,4 @@ def handle(self, *args, **options):
2017
for l in LiaisonStatement.objects.filter(action_taken=False, deadline__gte=cutoff).exclude(deadline=None):
2118
r = possibly_send_deadline_reminder(l)
2219
if r:
23-
print 'Liaison %05s#: Deadline reminder sent!' % liaison.pk
20+
print 'Liaison %05s#: Deadline reminder sent!' % l.pk

ietf/liaisons/management/commands/remind_update_sdo_list.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
from optparse import make_option
22

3-
from django.conf import settings
4-
from django.core.mail import EmailMessage
53
from django.core.management.base import BaseCommand
6-
from django.template.loader import render_to_string
74

85
from ietf.group.models import Group
96
from ietf.liaisons.mails import send_sdo_reminder

ietf/liaisons/sitemaps.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Copyright The IETF Trust 2007, All Rights Reserved
22
#
33
from django.contrib.sitemaps import Sitemap
4-
from django.conf import settings
54

65
from ietf.liaisons.models import LiaisonStatement
76

ietf/liaisons/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ def test_add_outgoing_liaison(self):
441441

442442
def test_send_sdo_reminder(self):
443443
make_test_data()
444-
liaison = make_liaison_models()
444+
make_liaison_models()
445445

446446
mailbox_before = len(outbox)
447447
send_sdo_reminder(Group.objects.filter(type="sdo")[0])

ietf/liaisons/utils.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
from django.db.models import Q
22

33
from ietf.group.models import Group, Role
4-
from ietf.person.models import Person
54
from ietf.liaisons.models import LiaisonStatement
65
from ietf.ietfauth.utils import has_role, passes_test_decorator
76

8-
from ietf.liaisons.accounts import (is_ietfchair, is_iabchair, is_iab_executive_director,
9-
get_ietf_chair, get_iab_chair, get_iab_executive_director,
7+
from ietf.liaisons.accounts import (is_ietfchair, is_iabchair, is_iab_executive_director, is_irtfchair,
8+
get_ietf_chair, get_iab_chair, get_iab_executive_director, get_irtf_chair,
109
is_secretariat, can_add_liaison, get_person_for_user, proxy_personify_role)
1110

1211
can_submit_liaison_required = passes_test_decorator(

ietf/liaisons/views.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
# Copyright The IETF Trust 2007, All Rights Reserved
2-
import datetime, json
2+
import datetime
3+
import json
34
from email.utils import parseaddr
45

5-
from django.conf import settings
6-
from django.core.urlresolvers import reverse
76
from django.core.validators import validate_email, ValidationError
8-
from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden
7+
from django.http import HttpResponse, HttpResponseForbidden
98
from django.shortcuts import render_to_response, get_object_or_404, redirect
109
from django.template import RequestContext
1110

1211
from ietf.liaisons.models import LiaisonStatement
1312
from ietf.liaisons.accounts import (get_person_for_user, can_add_outgoing_liaison,
14-
can_add_incoming_liaison, LIAISON_EDIT_GROUPS,
13+
can_add_incoming_liaison,
1514
is_ietfchair, is_iabchair, is_iab_executive_director,
1615
can_edit_liaison, is_secretariat)
1716
from ietf.liaisons.forms import liaison_form_factory

0 commit comments

Comments
 (0)