Made ietf/secr/groups pyflakes-clean.

- Legacy-Id: 7480
This commit is contained in:
Henrik Levkowetz 2014-03-15 21:13:21 +00:00
parent b6f15be079
commit 8a6c121073
8 changed files with 18 additions and 47 deletions

View file

@ -2,7 +2,6 @@
import datetime, json
from django.http import HttpResponseRedirect, HttpResponseForbidden, Http404
from django.shortcuts import render_to_response, get_object_or_404, redirect
from django.template.loader import render_to_string
@ -26,7 +25,7 @@ from ietf.message.models import Message
from ietf.name.models import IntendedStdLevelName, DocTagName, StreamName
from ietf.person.forms import EmailsField
from ietf.person.models import Person, Email
from ietf.secr.lib import jsonapi
from ietf.secr.lib.template import jsonapi
from ietf.utils.mail import send_mail, send_mail_message
from ietf.utils.textupload import get_cleaned_text_file_content

View file

@ -1,3 +1,5 @@
import re
from django import forms
from django.db.models import Q
@ -5,9 +7,7 @@ from ietf.group.models import Group, GroupMilestone, Role
from ietf.name.models import GroupStateName, GroupTypeName, RoleName
from ietf.person.models import Person, Email
from ietf.secr.areas.forms import AWPForm
import re
# ---------------------------------------------
# Select Choices

View file

@ -1 +1 @@
from django.db import models

View file

@ -11,7 +11,7 @@ class GroupsTest(TestCase):
# ------- Test Search -------- #
def test_search(self):
"Test Search"
draft = make_test_data()
make_test_data()
group = Group.objects.all()[0]
url = reverse('groups_search')
post_data = {'group_acronym':group.acronym,'submit':'Search'}
@ -40,7 +40,7 @@ class GroupsTest(TestCase):
self.failUnless('This field is required' in response.content)
def test_add_group_dupe(self):
draft = make_test_data()
make_test_data()
group = Group.objects.all()[0]
area = Group.objects.filter(type='area')[0]
url = reverse('groups_add')
@ -58,7 +58,7 @@ class GroupsTest(TestCase):
self.failUnless('Group with this Acronym already exists' in response.content)
def test_add_group_success(self):
draft = make_test_data()
make_test_data()
area = Group.objects.filter(type='area')[0]
url = reverse('groups_add')
post_data = {'acronym':'test',
@ -74,7 +74,7 @@ class GroupsTest(TestCase):
# ------- Test View -------- #
def test_view(self):
draft = make_test_data()
make_test_data()
group = Group.objects.all()[0]
url = reverse('groups_view', kwargs={'acronym':group.acronym})
response = self.client.get(url)
@ -82,7 +82,7 @@ class GroupsTest(TestCase):
# ------- Test Edit -------- #
def test_edit_valid(self):
draft = make_test_data()
make_test_data()
group = Group.objects.filter(acronym='mars')[0]
area = Group.objects.filter(acronym='farfut')[0]
ad = Person.objects.get(name='Aread Irector')
@ -103,7 +103,7 @@ class GroupsTest(TestCase):
# ------- Test People -------- #
def test_people_delete(self):
draft = make_test_data()
make_test_data()
group = Group.objects.filter(acronym='mars')[0]
role = group.role_set.all()[0]
url = reverse('groups_delete_role', kwargs={'acronym':group.acronym,'id':role.id})
@ -113,7 +113,7 @@ class GroupsTest(TestCase):
self.failUnless('deleted successfully' in response.content)
def test_people_add(self):
draft = make_test_data()
make_test_data()
person = Person.objects.get(name='Aread Irector')
group = Group.objects.filter(acronym='mars')[0]
url = reverse('groups_people', kwargs={'acronym':group.acronym})

View file

@ -1,15 +0,0 @@
import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
from ietf.group.models import *
import sys
def output_charter(group):
report = render_to_string('groups/text_charter.txt', context)
return report
group = Group.objects.get(acronym='alto')
output_charter(group)

View file

@ -1,4 +1,4 @@
from django.conf.urls import *
from django.conf.urls import patterns, url
urlpatterns = patterns('ietf.secr.groups.views',
url(r'^$', 'search', name='groups'),

View file

@ -1,27 +1,14 @@
from django.conf import settings
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.db.models import get_model
from django.core.exceptions import ObjectDoesNotExist
from django.forms.formsets import formset_factory
from django.forms.models import inlineformset_factory
from django.http import HttpResponseRedirect, HttpResponse
from django.shortcuts import render_to_response, get_object_or_404, redirect
from django.template import RequestContext
from django.template.loader import render_to_string
#from sec.utils.group import get_charter_text
from ietf.secr.utils.meeting import get_current_meeting
from ietf.group.models import ChangeStateGroupEvent, GroupEvent, GroupURL, Role
from ietf.group.models import Group, GroupMilestone, ChangeStateGroupEvent, GroupEvent, GroupURL, Role
from ietf.group.utils import save_group_in_history, get_charter_text
from ietf.person.name import name_parts
from ietf.wginfo.views import fill_in_charter_info
from forms import *
import os
import datetime
import json
from ietf.person.models import Person
from ietf.secr.groups.forms import GroupModelForm, GroupMilestoneForm, RoleForm, SearchForm
from ietf.secr.areas.forms import AWPForm
from ietf.secr.utils.meeting import get_current_meeting
# -------------------------------------------------
# Helper Functions

View file

@ -13,7 +13,7 @@ from django.template.loader import get_template
from django.utils.text import slugify
from django.db.models import Max,Count,get_model
from ietf.secr.lib import jsonapi
from ietf.secr.lib.template import jsonapi
from ietf.secr.proceedings.proc_utils import *
from ietf.secr.sreq.forms import GroupSelectForm
from ietf.secr.utils.decorators import check_permissions, sec_only