Skip to content

Commit 8a6c121

Browse files
committed
Made ietf/secr/groups pyflakes-clean.
- Legacy-Id: 7480
1 parent b6f15be commit 8a6c121

8 files changed

Lines changed: 18 additions & 47 deletions

File tree

ietf/doc/views_draft.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import datetime, json
44

5-
65
from django.http import HttpResponseRedirect, HttpResponseForbidden, Http404
76
from django.shortcuts import render_to_response, get_object_or_404, redirect
87
from django.template.loader import render_to_string
@@ -26,7 +25,7 @@
2625
from ietf.name.models import IntendedStdLevelName, DocTagName, StreamName
2726
from ietf.person.forms import EmailsField
2827
from ietf.person.models import Person, Email
29-
from ietf.secr.lib import jsonapi
28+
from ietf.secr.lib.template import jsonapi
3029
from ietf.utils.mail import send_mail, send_mail_message
3130
from ietf.utils.textupload import get_cleaned_text_file_content
3231

ietf/secr/groups/forms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
import re
2+
13
from django import forms
24
from django.db.models import Q
35

46
from ietf.group.models import Group, GroupMilestone, Role
57
from ietf.name.models import GroupStateName, GroupTypeName, RoleName
68
from ietf.person.models import Person, Email
79

8-
from ietf.secr.areas.forms import AWPForm
910

10-
import re
1111

1212
# ---------------------------------------------
1313
# Select Choices

ietf/secr/groups/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from django.db import models
1+

ietf/secr/groups/tests.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class GroupsTest(TestCase):
1111
# ------- Test Search -------- #
1212
def test_search(self):
1313
"Test Search"
14-
draft = make_test_data()
14+
make_test_data()
1515
group = Group.objects.all()[0]
1616
url = reverse('groups_search')
1717
post_data = {'group_acronym':group.acronym,'submit':'Search'}
@@ -40,7 +40,7 @@ def test_add_group_invalid(self):
4040
self.failUnless('This field is required' in response.content)
4141

4242
def test_add_group_dupe(self):
43-
draft = make_test_data()
43+
make_test_data()
4444
group = Group.objects.all()[0]
4545
area = Group.objects.filter(type='area')[0]
4646
url = reverse('groups_add')
@@ -58,7 +58,7 @@ def test_add_group_dupe(self):
5858
self.failUnless('Group with this Acronym already exists' in response.content)
5959

6060
def test_add_group_success(self):
61-
draft = make_test_data()
61+
make_test_data()
6262
area = Group.objects.filter(type='area')[0]
6363
url = reverse('groups_add')
6464
post_data = {'acronym':'test',
@@ -74,15 +74,15 @@ def test_add_group_success(self):
7474

7575
# ------- Test View -------- #
7676
def test_view(self):
77-
draft = make_test_data()
77+
make_test_data()
7878
group = Group.objects.all()[0]
7979
url = reverse('groups_view', kwargs={'acronym':group.acronym})
8080
response = self.client.get(url)
8181
self.assertEqual(response.status_code, 200)
8282

8383
# ------- Test Edit -------- #
8484
def test_edit_valid(self):
85-
draft = make_test_data()
85+
make_test_data()
8686
group = Group.objects.filter(acronym='mars')[0]
8787
area = Group.objects.filter(acronym='farfut')[0]
8888
ad = Person.objects.get(name='Aread Irector')
@@ -103,7 +103,7 @@ def test_edit_valid(self):
103103

104104
# ------- Test People -------- #
105105
def test_people_delete(self):
106-
draft = make_test_data()
106+
make_test_data()
107107
group = Group.objects.filter(acronym='mars')[0]
108108
role = group.role_set.all()[0]
109109
url = reverse('groups_delete_role', kwargs={'acronym':group.acronym,'id':role.id})
@@ -113,7 +113,7 @@ def test_people_delete(self):
113113
self.failUnless('deleted successfully' in response.content)
114114

115115
def test_people_add(self):
116-
draft = make_test_data()
116+
make_test_data()
117117
person = Person.objects.get(name='Aread Irector')
118118
group = Group.objects.filter(acronym='mars')[0]
119119
url = reverse('groups_people', kwargs={'acronym':group.acronym})

ietf/secr/groups/update_text_charters.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

ietf/secr/groups/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 *
1+
from django.conf.urls import patterns, url
22

33
urlpatterns = patterns('ietf.secr.groups.views',
44
url(r'^$', 'search', name='groups'),

ietf/secr/groups/views.py

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
1-
from django.conf import settings
21
from django.contrib import messages
3-
from django.core.urlresolvers import reverse
4-
from django.db.models import get_model
5-
from django.core.exceptions import ObjectDoesNotExist
6-
from django.forms.formsets import formset_factory
72
from django.forms.models import inlineformset_factory
8-
from django.http import HttpResponseRedirect, HttpResponse
93
from django.shortcuts import render_to_response, get_object_or_404, redirect
104
from django.template import RequestContext
11-
from django.template.loader import render_to_string
125

13-
#from sec.utils.group import get_charter_text
14-
from ietf.secr.utils.meeting import get_current_meeting
15-
from ietf.group.models import ChangeStateGroupEvent, GroupEvent, GroupURL, Role
6+
from ietf.group.models import Group, GroupMilestone, ChangeStateGroupEvent, GroupEvent, GroupURL, Role
167
from ietf.group.utils import save_group_in_history, get_charter_text
17-
from ietf.person.name import name_parts
18-
from ietf.wginfo.views import fill_in_charter_info
19-
20-
from forms import *
21-
22-
import os
23-
import datetime
24-
import json
8+
from ietf.person.models import Person
9+
from ietf.secr.groups.forms import GroupModelForm, GroupMilestoneForm, RoleForm, SearchForm
10+
from ietf.secr.areas.forms import AWPForm
11+
from ietf.secr.utils.meeting import get_current_meeting
2512

2613
# -------------------------------------------------
2714
# Helper Functions

ietf/secr/proceedings/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from django.utils.text import slugify
1414
from django.db.models import Max,Count,get_model
1515

16-
from ietf.secr.lib import jsonapi
16+
from ietf.secr.lib.template import jsonapi
1717
from ietf.secr.proceedings.proc_utils import *
1818
from ietf.secr.sreq.forms import GroupSelectForm
1919
from ietf.secr.utils.decorators import check_permissions, sec_only

0 commit comments

Comments
 (0)