Skip to content

Commit c4c8eff

Browse files
committed
Made ietf/secr/sreq pyflakes-clean.
- Legacy-Id: 7491
1 parent 0b65b38 commit c4c8eff

6 files changed

Lines changed: 18 additions & 28 deletions

File tree

ietf/secr/sreq/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from django import forms
22

33
from ietf.group.models import Group
4-
import os
4+
55

66
# -------------------------------------------------
77
# Globals

ietf/secr/sreq/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/sreq/templatetags/ams_filters.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django import template
22
from ietf.person.models import Person
3-
import datetime
3+
44

55
register = template.Library()
66

@@ -63,7 +63,7 @@ def smart_login(user):
6363
Expects a Person object. If person is a Secretariat returns "on behalf of the"
6464
'''
6565
if not isinstance (user, Person):
66-
return value
66+
return user
6767
if user.role_set.filter(name='secr',group__acronym='secretariat'):
6868
return '%s, on behalf of the' % user
6969
else:

ietf/secr/sreq/tests.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
from django.conf import settings
2-
from django.contrib.auth.models import User
31
from django.core.urlresolvers import reverse
42

53
from ietf.utils import TestCase
64
from ietf.group.models import Group
7-
from ietf.ietfauth.utils import has_role
85
from ietf.utils.test_data import make_test_data
96

107
#from pyquery import PyQuery
@@ -26,7 +23,7 @@ def test_urls(self):
2623

2724
class MainTestCase(TestCase):
2825
def test_main(self):
29-
draft = make_test_data()
26+
make_test_data()
3027
url = reverse('sessions')
3128
r = self.client.get(url, REMOTE_USER=SECR_USER)
3229
self.assertEqual(r.status_code, 200)
@@ -37,7 +34,7 @@ def test_main(self):
3734

3835
class SubmitRequestCase(TestCase):
3936
def test_submit_request(self):
40-
draft = make_test_data()
37+
make_test_data()
4138
acronym = Group.objects.all()[0].acronym
4239
url = reverse('sessions_new',kwargs={'acronym':acronym})
4340
post_data = {'id_num_session':'1',

ietf/secr/sreq/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.sreq.views',
44
url(r'^$', 'main', name='sessions'),

ietf/secr/sreq/views.py

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
1+
import datetime
2+
import os
3+
14
from django.conf import settings
25
from django.contrib import messages
3-
from django.core.exceptions import ObjectDoesNotExist
4-
from django.core.urlresolvers import reverse
56
from django.db.models import Q
6-
from django.http import HttpResponse, HttpResponseRedirect, Http404
7+
from django.http import Http404
78
from django.shortcuts import render_to_response, get_object_or_404, redirect
89
from django.template import RequestContext
910

10-
from ietf.secr.utils.mail import get_ad_email_list, get_chair_email_list, get_cc_list
11-
from ietf.secr.utils.decorators import check_permissions, sec_only
12-
from ietf.secr.utils.group import get_my_groups, groups_by_session
13-
11+
from ietf.group.models import Group
1412
from ietf.ietfauth.utils import has_role
15-
from ietf.utils.mail import send_mail
1613
from ietf.meeting.models import Meeting, Session, Constraint
17-
18-
from ietf.group.models import Group, Role
1914
from ietf.name.models import SessionStatusName, ConstraintName
20-
21-
from forms import *
22-
23-
from itertools import chain
24-
import datetime
25-
import itertools
15+
from ietf.secr.sreq.forms import SessionForm, GroupSelectForm, ToolStatusForm
16+
from ietf.secr.utils.decorators import check_permissions, sec_only
17+
from ietf.secr.utils.group import groups_by_session
18+
from ietf.secr.utils.mail import get_ad_email_list, get_chair_email_list, get_cc_list
19+
from ietf.utils.mail import send_mail
2620

2721
# -------------------------------------------------
2822
# Globals
@@ -150,7 +144,7 @@ def send_notification(group,meeting,login,session,action):
150144
cc_list.append(login.role_email(role_name='wg').address)
151145
subject = '%s - Request for meeting session approval for IETF %s' % (group.acronym, meeting.number)
152146
template = 'sreq/session_approval_notification.txt'
153-
status_text = 'the %s Directors for approval' % group.parent
147+
#status_text = 'the %s Directors for approval' % group.parent
154148
send_mail(None,
155149
to_email,
156150
from_email,
@@ -482,7 +476,6 @@ def new(request, acronym):
482476
group = get_object_or_404(Group, acronym=acronym)
483477
meeting = get_meeting()
484478
session_conflicts = session_conflicts_as_string(group, meeting)
485-
user = request.user
486479

487480
if request.method == 'POST':
488481
button_text = request.POST.get('submit', '')

0 commit comments

Comments
 (0)