Made ietf/person pyflakes-clean. Fixed a bug where Person.role_email() might blow up if given a group parameter.

- Legacy-Id: 7477
This commit is contained in:
Henrik Levkowetz 2014-03-15 19:37:25 +00:00
parent 563f584a9e
commit df432f8888
7 changed files with 12 additions and 22 deletions

View file

@ -1,6 +1,8 @@
from django.contrib import admin
from models import *
from name import name_parts
from ietf.person.models import Email, Alias, Person
from ietf.person.name import name_parts
class EmailAdmin(admin.ModelAdmin):
list_display = ["address", "person", "time", "active", ]

View file

@ -1,13 +1,7 @@
import datetime
import logging
import sys
import json
from django.shortcuts import get_object_or_404
from django.http import HttpResponse, Http404
from dajaxice.core import dajaxice_functions
from dajaxice.decorators import dajaxice_register
from django.http import HttpResponse
from ietf.person.models import Person

View file

@ -7,7 +7,7 @@ from django.core.urlresolvers import reverse as urlreverse
import debug # pyflakes:ignore
from ietf.person.models import *
from ietf.person.models import Email
def json_emails(emails):
if isinstance(emails, basestring):

View file

@ -42,6 +42,7 @@ class PersonInfo(models.Model):
"""Lookup email for role for person, optionally on group which
may be an object or the group acronym."""
if group:
from ietf.group.models import Group
if isinstance(group, str) or isinstance(group, unicode):
group = Group.objects.get(acronym=group)
e = Email.objects.filter(person=self, role__group=group, role__name=role_name)

View file

@ -1,18 +1,11 @@
import os, shutil, datetime, json
import json
import django.test
from django.core.urlresolvers import reverse as urlreverse
from pyquery import PyQuery
from ietf.utils.mail import outbox
from ietf.utils.test_utils import login_testing_unauthorized, TestCase
from ietf.utils.test_utils import TestCase
from ietf.utils.test_data import make_test_data
from ietf.name.models import *
from ietf.group.models import *
from ietf.person.models import *
class PersonTests(TestCase):
def test_ajax_search_emails(self):
draft = make_test_data()

View file

@ -1,4 +1,4 @@
from django.conf.urls import patterns, url
from django.conf.urls import patterns
from ietf.person import ajax
urlpatterns = patterns('',

View file

@ -1,6 +1,6 @@
from django.http import Http404, HttpResponse
from django.http import HttpResponse
from ietf.person.models import *
from ietf.person.models import Email
from ietf.person.forms import json_emails
def ajax_search_emails(request):