Skip to content

Commit 3ec7e86

Browse files
committed
Converted leading tabs to spaces in ietf/**/*.py
- Legacy-Id: 16310
1 parent d7f5c84 commit 3ec7e86

25 files changed

Lines changed: 270 additions & 268 deletions

File tree

ietf/doc/feeds.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ def title(self, obj):
2222
return "Changes for %s" % obj.display_name()
2323

2424
def link(self, obj):
25-
if obj is None:
26-
raise FeedDoesNotExist
25+
if obj is None:
26+
raise FeedDoesNotExist
2727
return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=obj.canonical_name()))
2828

2929
def subtitle(self, obj):
@@ -32,7 +32,7 @@ def subtitle(self, obj):
3232
def items(self, obj):
3333
events = obj.docevent_set.all().order_by("-time","-id")
3434
augment_events_with_revision(obj, events)
35-
return events
35+
return events
3636

3737
def item_title(self, item):
3838
return "[%s] %s [rev. %s]" % (item.by, truncatewords(strip_tags(item.desc), 15), item.rev)
@@ -41,10 +41,10 @@ def item_description(self, item):
4141
return truncatewords_html(format_textarea(item.desc), 20)
4242

4343
def item_pubdate(self, item):
44-
return item.time
44+
return item.time
4545

4646
def item_author_name(self, item):
47-
return str(item.by)
47+
return str(item.by)
4848

4949
def item_link(self, item):
5050
return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk
@@ -62,9 +62,9 @@ def items(self):
6262
d.lc_event = d.latest_event(LastCallDocEvent, type="sent_last_call")
6363

6464
docs = [d for d in docs if d.lc_event]
65-
docs.sort(key=lambda d: d.lc_event.expires)
65+
docs.sort(key=lambda d: d.lc_event.expires)
6666

67-
return docs
67+
return docs
6868

6969
def item_title(self, item):
7070
return "%s (%s - %s)" % (item.name,

ietf/doc/mails.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ def email_state_changed(request, doc, text, mailtrigger_id=None):
3333
cc=cc)
3434

3535
def email_ad_approved_doc(request, doc, text):
36-
to = "iesg@iesg.org"
37-
bcc = "iesg-secretary@ietf.org"
38-
frm = request.user.person.formatted_email()
39-
send_mail(request, to, frm,
40-
"Approved: %s" % doc.filename_with_rev(),
41-
"doc/mail/ad_approval_email.txt",
42-
dict(text=text,
43-
docname=doc.filename_with_rev()),
44-
bcc=bcc)
36+
to = "iesg@iesg.org"
37+
bcc = "iesg-secretary@ietf.org"
38+
frm = request.user.person.formatted_email()
39+
send_mail(request, to, frm,
40+
"Approved: %s" % doc.filename_with_rev(),
41+
"doc/mail/ad_approval_email.txt",
42+
dict(text=text,
43+
docname=doc.filename_with_rev()),
44+
bcc=bcc)
4545

4646
def email_stream_changed(request, doc, old_stream, new_stream, text=""):
4747
"""Email the change text to the notify group and to the stream chairs"""

ietf/doc/templatetags/ietf_filters.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ def sanitize(value):
146146
def square_brackets(value):
147147
"""Adds square brackets around text."""
148148
if isinstance(value, (bytes,str)):
149-
if value == "":
150-
value = " "
149+
if value == "":
150+
value = " "
151151
return "[ %s ]" % value
152152
elif value > 0:
153153
return "[ X ]"

ietf/doc/tests_draft.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def test_ad_approved(self):
4040

4141
url = urlreverse('ietf.doc.views_draft.change_state', kwargs=dict(name=draft.name))
4242
login_testing_unauthorized(self, "ad", url)
43-
43+
4444
# normal get
4545
r = self.client.get(url)
4646
self.assertEqual(r.status_code, 200)

ietf/doc/views_draft.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def change_state(request, name):
134134
email_state_changed(request, doc, msg,'doc_state_edited')
135135

136136
if new_state.slug == "approved" and new_tags == [] and has_role(request.user, "Area Director"):
137-
email_ad_approved_doc(request, doc, comment)
137+
email_ad_approved_doc(request, doc, comment)
138138

139139
if prev_state and prev_state.slug in ("ann", "rfcqueue") and new_state.slug not in ("rfcqueue", "pub"):
140140
email_pulled_from_rfc_queue(request, doc, comment, prev_state, new_state)
@@ -578,7 +578,7 @@ def to_iesg(request,name):
578578
doc.notify = notify
579579
changes.append("State Change Notice email list changed to %s" % doc.notify)
580580

581-
# Get the last available writeup
581+
# Get the last available writeup
582582
previous_writeup = doc.latest_event(WriteupDocEvent,type="changed_protocol_writeup")
583583
if previous_writeup != None:
584584
changes.append(previous_writeup.text)
@@ -904,7 +904,7 @@ def edit_shepherd_writeup(request, name):
904904
writeup = form.cleaned_data['content']
905905
e = WriteupDocEvent(doc=doc, rev=doc.rev, by=login, type="changed_protocol_writeup")
906906

907-
# Add the shepherd writeup to description if the document is in submitted for publication state
907+
# Add the shepherd writeup to description if the document is in submitted for publication state
908908
stream_state = doc.get_state("draft-stream-%s" % doc.stream_id)
909909
iesg_state = doc.get_state("draft-iesg")
910910
if (iesg_state or (stream_state and stream_state.slug=='sub-pub')):

ietf/group/feeds.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ def title(self, obj):
2121
return "Changes for %s %s" % (obj.acronym, obj.type)
2222

2323
def link(self, obj):
24-
if not obj:
25-
raise FeedDoesNotExist
24+
if not obj:
25+
raise FeedDoesNotExist
2626
return obj.about_url()
2727

2828
def description(self, obj):
29-
return self.title(obj)
29+
return self.title(obj)
3030

3131
def items(self, obj):
3232
events = list(obj.groupevent_set.all().select_related("group"))
@@ -44,7 +44,7 @@ def item_link(self, obj):
4444
return obj.group.about_url()
4545

4646
def item_pubdate(self, obj):
47-
return obj.time
47+
return obj.time
4848

4949
def item_title(self, obj):
5050
title = "%s - %s" % (truncatewords(strip_tags(obj.desc), 10), obj.by)

ietf/group/forms.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ def clean_txt(self):
4848

4949
def clean(self):
5050
if (self.cleaned_data['content'] and self.cleaned_data['content'].strip() and self.cleaned_data['txt']):
51-
raise forms.ValidationError("Cannot enter both text box and TXT file")
52-
elif (self.cleaned_data['content'] and not self.cleaned_data['content'].strip() and not self.cleaned_data['txt']):
51+
raise forms.ValidationError("Cannot enter both text box and TXT file")
52+
elif (self.cleaned_data['content'] and not self.cleaned_data['content'].strip() and not self.cleaned_data['txt']):
5353
raise forms.ValidationError("NULL input is not a valid option")
5454
elif (self.cleaned_data['txt'] and not self.cleaned_data['txt'].strip()) :
55-
raise forms.ValidationError("NULL TXT file input is not a valid option")
55+
raise forms.ValidationError("NULL TXT file input is not a valid option")
5656

5757
class ConcludeGroupForm(forms.Form):
5858
instructions = forms.CharField(widget=forms.Textarea(attrs={'rows': 30}), required=True, strip=False)

0 commit comments

Comments
 (0)