Skip to content

Commit df432f8

Browse files
committed
Made ietf/person pyflakes-clean. Fixed a bug where Person.role_email() might blow up if given a group parameter.
- Legacy-Id: 7477
1 parent 563f584 commit df432f8

7 files changed

Lines changed: 12 additions & 22 deletions

File tree

ietf/person/admin.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from django.contrib import admin
2-
from models import *
3-
from name import name_parts
2+
3+
4+
from ietf.person.models import Email, Alias, Person
5+
from ietf.person.name import name_parts
46

57
class EmailAdmin(admin.ModelAdmin):
68
list_display = ["address", "person", "time", "active", ]

ietf/person/ajax.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
import datetime
2-
import logging
3-
import sys
41
import json
52

63
from django.shortcuts import get_object_or_404
7-
from django.http import HttpResponse, Http404
8-
9-
from dajaxice.core import dajaxice_functions
10-
from dajaxice.decorators import dajaxice_register
4+
from django.http import HttpResponse
115

126
from ietf.person.models import Person
137

ietf/person/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import debug # pyflakes:ignore
99

10-
from ietf.person.models import *
10+
from ietf.person.models import Email
1111

1212
def json_emails(emails):
1313
if isinstance(emails, basestring):

ietf/person/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def role_email(self, role_name, group=None):
4242
"""Lookup email for role for person, optionally on group which
4343
may be an object or the group acronym."""
4444
if group:
45+
from ietf.group.models import Group
4546
if isinstance(group, str) or isinstance(group, unicode):
4647
group = Group.objects.get(acronym=group)
4748
e = Email.objects.filter(person=self, role__group=group, role__name=role_name)

ietf/person/tests.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
1-
import os, shutil, datetime, json
1+
import json
22

3-
import django.test
43
from django.core.urlresolvers import reverse as urlreverse
54

6-
from pyquery import PyQuery
75

8-
from ietf.utils.mail import outbox
9-
from ietf.utils.test_utils import login_testing_unauthorized, TestCase
6+
from ietf.utils.test_utils import TestCase
107
from ietf.utils.test_data import make_test_data
118

12-
from ietf.name.models import *
13-
from ietf.group.models import *
14-
from ietf.person.models import *
15-
169
class PersonTests(TestCase):
1710
def test_ajax_search_emails(self):
1811
draft = make_test_data()

ietf/person/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.conf.urls import patterns, url
1+
from django.conf.urls import patterns
22
from ietf.person import ajax
33

44
urlpatterns = patterns('',

ietf/person/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from django.http import Http404, HttpResponse
1+
from django.http import HttpResponse
22

3-
from ietf.person.models import *
3+
from ietf.person.models import Email
44
from ietf.person.forms import json_emails
55

66
def ajax_search_emails(request):

0 commit comments

Comments
 (0)