Skip to content

Commit 254c3db

Browse files
levkowetzlevkowetz
committed
Style changes.
 - Legacy-Id: 11944
1 parent 47d6bbb commit 254c3db

4 files changed

Lines changed: 36 additions & 35 deletions

File tree

‎ietf/submit/resources.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
from tastypie.cache import SimpleCache
66

77
from ietf import api
8-
9-
from ietf.submit.models import Preapproval, \
10-
SubmissionCheck, Submission, SubmissionEmailEvent, SubmissionEvent
8+
from ietf.submit.models import ( Preapproval, SubmissionCheck, Submission,
9+
SubmissionEmailEvent, SubmissionEvent )
10+
from ietf.person.resources import PersonResource
1111

1212

13-
from ietf.person.resources import PersonResource
1413
class PreapprovalResource(ModelResource):
1514
by = ToOneField(PersonResource, 'by')
1615
class Meta:

‎ietf/submit/tests.py‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -960,15 +960,15 @@ def test_waiting_for_draft(self):
960960
Thank you
961961
""".format(datetime.datetime.now().ctime())
962962
message = email.message_from_string(message_string)
963-
submission, submission_email_event =\
963+
submission, submission_email_event = (
964964
add_submission_email(request=None,
965965
remote_ip ="192.168.0.1",
966966
name = "draft-my-new-draft",
967967
rev='00',
968968
submission_pk=None,
969969
message = message,
970970
by = Person.objects.get(name="(System)"),
971-
msgtype = "msgin")
971+
msgtype = "msgin") )
972972

973973
url = urlreverse('ietf.submit.views.manualpost')
974974
# Secretariat has access
@@ -1005,15 +1005,15 @@ def test_waiting_for_draft(self):
10051005
self.assertEqual(len(q('.waiting-for-draft a:contains("draft-my-new-draft")')), 0)
10061006

10071007
# Should now be able to add it again
1008-
submission, submission_email_event = \
1008+
submission, submission_email_event = (
10091009
add_submission_email(request=None,
10101010
remote_ip ="192.168.0.1",
10111011
name = "draft-my-new-draft",
10121012
rev='00',
10131013
submission_pk=None,
10141014
message = message,
10151015
by = Person.objects.get(name="(System)"),
1016-
msgtype = "msgin")
1016+
msgtype = "msgin") )
10171017

10181018

10191019
def test_waiting_for_draft_with_attachment(self):
@@ -1041,16 +1041,17 @@ def test_waiting_for_draft_with_attachment(self):
10411041
ZSBvZiBsaW5lcyAtIGJ1dCBpdCBjb3VsZCBiZSBhIGRyYWZ0Cg==
10421042
--------------090908050800030909090207--
10431043
""".format(frm, datetime.datetime.now().ctime())
1044+
10441045
message = email.message_from_string(message_string)
1045-
submission, submission_email_event = \
1046+
submission, submission_email_event = (
10461047
add_submission_email(request=None,
10471048
remote_ip ="192.168.0.1",
10481049
name = "draft-my-new-draft",
10491050
rev='00',
10501051
submission_pk=None,
10511052
message = message,
10521053
by = Person.objects.get(name="(System)"),
1053-
msgtype = "msgin")
1054+
msgtype = "msgin") )
10541055

10551056
manualpost_page_url = urlreverse('ietf.submit.views.manualpost')
10561057
# Secretariat has access
@@ -1135,8 +1136,7 @@ def check_manualpost_page(self, submission, submission_email_event,
11351136
is_secretariat):
11361137
# get the page listing manual posts
11371138
r, q = self.request_and_parse(the_url)
1138-
selector = "#waiting-for-draft a#add-submission-email{}:contains('Add email')". \
1139-
format(submission.pk, submission_name_fragment)
1139+
selector = "#waiting-for-draft a#add-submission-email%s:contains('Add email')" % submission.pk
11401140

11411141
if is_secretariat:
11421142
# Can add an email to the submission
@@ -1152,8 +1152,7 @@ def check_manualpost_page(self, submission, submission_email_event,
11521152
# Follow the link to the status page for this submission
11531153
r, q = self.request_and_parse(submission_url)
11541154

1155-
selector = "#history a#reply{}:contains('Reply')".\
1156-
format(submission.pk)
1155+
selector = "#history a#reply%s:contains('Reply')" % submission.pk
11571156

11581157
if is_secretariat:
11591158
# check that reply button is visible and get the form
@@ -1171,8 +1170,7 @@ def check_manualpost_page(self, submission, submission_email_event,
11711170
if is_secretariat:
11721171
# Now try to send an email using the send email link
11731172

1174-
selector = "a#send{}:contains('Send Email')". \
1175-
format(submission.pk)
1173+
selector = "a#send%s:contains('Send Email')" % submission.pk
11761174
send_url = self.get_href(q, selector)
11771175

11781176
self.do_submission_email(the_url = send_url,
@@ -1194,8 +1192,7 @@ def check_manualpost_page(self, submission, submission_email_event,
11941192
if is_secretariat:
11951193
# check that reply button is visible
11961194

1197-
reply_href = self.get_href(q, "#email-details a#reply{}:contains('Reply')". \
1198-
format(submission.pk))
1195+
reply_href = self.get_href(q, "#email-details a#reply%s:contains('Reply')" % submission.pk)
11991196

12001197
else:
12011198
# No reply button
@@ -1308,6 +1305,7 @@ def do_submission_email(self, the_url, to, body):
13081305
Date: {}
13091306
Subject: test
13101307
""".format(reply_to, to, datetime.datetime.now().ctime())
1308+
13111309
result = process_response_email(message_string)
13121310
self.assertIsInstance(result, Message)
13131311

‎ietf/submit/utils.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
from django.conf import settings
55

6-
from ietf.doc.models import Document, State, DocAlias, DocEvent, \
7-
DocumentAuthor, AddedMessageEvent
6+
from ietf.doc.models import ( Document, State, DocAlias, DocEvent,
7+
DocumentAuthor, AddedMessageEvent )
88
from ietf.doc.models import NewRevisionDocEvent
99
from ietf.doc.models import RelatedDocument, DocRelationshipName
1010
from ietf.doc.utils import add_state_change_event, rebuild_reference_relations

‎ietf/submit/views.py‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
from django.contrib import messages
99
from django.core.urlresolvers import reverse as urlreverse
1010
from django.core.validators import validate_email, ValidationError
11-
from django.http import HttpResponseRedirect, Http404, HttpResponseForbidden, \
12-
HttpResponse
11+
from django.http import HttpResponseRedirect, Http404, HttpResponseForbidden, HttpResponse
1312
from django.shortcuts import get_object_or_404, redirect, render
1413
from django.utils.module_loading import import_string
1514

@@ -21,14 +20,14 @@
2120
from ietf.ietfauth.utils import has_role, role_required
2221
from ietf.mailtrigger.utils import gather_address_lists
2322
from ietf.message.models import Message, MessageAttachment
24-
from ietf.submit.forms import SubmissionUploadForm, NameEmailForm, EditSubmissionForm, PreapprovalForm, ReplacesForm, \
25-
SubmissionEmailForm, MessageModelForm
26-
from ietf.submit.mail import send_full_url, send_approval_request_to_group, \
27-
send_submission_confirmation, send_manual_post_request, \
28-
add_submission_email, get_reply_to
29-
from ietf.submit.models import Submission, SubmissionCheck, Preapproval, DraftSubmissionStateName, \
30-
SubmissionEmailEvent
31-
from ietf.submit.utils import approvable_submissions_for_user, preapprovals_for_user, recently_approved_by_user
23+
from ietf.submit.forms import ( SubmissionUploadForm, NameEmailForm, EditSubmissionForm,
24+
PreapprovalForm, ReplacesForm, SubmissionEmailForm, MessageModelForm )
25+
from ietf.submit.mail import ( send_full_url, send_approval_request_to_group,
26+
send_submission_confirmation, send_manual_post_request, add_submission_email, get_reply_to )
27+
from ietf.submit.models import (Submission, SubmissionCheck, Preapproval,
28+
DraftSubmissionStateName, SubmissionEmailEvent )
29+
from ietf.submit.utils import ( approvable_submissions_for_user, preapprovals_for_user,
30+
recently_approved_by_user )
3231
from ietf.submit.utils import validate_submission, create_submission_event
3332
from ietf.submit.utils import docevent_from_submission
3433
from ietf.submit.utils import post_submission, cancel_submission, rename_submission_files
@@ -238,9 +237,14 @@ def submission_status(request, submission_id, access_token=None):
238237
can_edit = can_edit_submission(request.user, submission, access_token) and submission.state_id == "uploaded"
239238
can_cancel = (key_matched or is_secretariat) and submission.state.next_states.filter(slug="cancel")
240239
can_group_approve = (is_secretariat or is_chair) and submission.state_id == "grp-appr"
241-
can_force_post = is_secretariat and submission.state.next_states.filter(slug="posted") and submission.state_id != "waiting-for-draft"
242-
show_send_full_url = not key_matched and not is_secretariat and submission.state_id not in ("cancel", "posted")
243-
240+
can_force_post = (
241+
is_secretariat
242+
and submission.state.next_states.filter(slug="posted").exists()
243+
and submission.state_id != "waiting-for-draft")
244+
show_send_full_url = (
245+
not key_matched
246+
and not is_secretariat
247+
and not submission.state_id in ("cancel", "posted") )
244248
addrs = gather_address_lists('sub_confirmation_requested',submission=submission)
245249
confirmation_list = addrs.to
246250
confirmation_list.extend(addrs.cc)
@@ -637,15 +641,15 @@ def add_manualpost_email(request, submission_id=None, access_token=None):
637641
else:
638642
msgtype = 'msgout'
639643

640-
submission, submission_email_event = \
644+
submission, submission_email_event = (
641645
add_submission_email(request=request,
642646
remote_ip=request.META.get('REMOTE_ADDR', None),
643647
name = form.draft_name,
644648
rev=form.revision,
645649
submission_pk = submission_pk,
646650
message = message,
647651
by = request.user.person,
648-
msgtype = msgtype)
652+
msgtype = msgtype) )
649653

650654
messages.success(request, 'Email added.')
651655

0 commit comments

Comments
 (0)