Skip to content

Commit ee50e92

Browse files
committed
Another minimal refactoring.
- Legacy-Id: 783
1 parent d28bf58 commit ee50e92

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

ietf/utils/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from cache_foreign_key import FKAsOneToOne
66
from templated_form import makeTemplatedForm
77
from soup2text import TextSoup, soup2text
8-
from draft_search import draft_search
8+
from draft_search import draft_search, normalize_draftname
99

1010
makeFormattingForm = makeTemplatedForm
1111

ietf/utils/draft_search.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
import re
33
from ietf.idtracker.models import InternetDraft
44

5-
def draft_search(s):
5+
def normalize_draftname(string):
6+
string = string.strip()
7+
string = re.sub("\.txt$","",string)
8+
string = re.sub("-\d\d$","",string)
9+
return string
10+
11+
def draft_search(string):
612
drafts = []
7-
if s:
8-
# normalize the draft name.
9-
s = s.strip()
10-
s = re.sub("\.txt$","",s)
11-
s = re.sub("-\d\d$","",s)
12-
drafts = InternetDraft.objects.filter(filename__contains=s)
13+
if string:
14+
string = normalize_draftname(string)
15+
drafts = InternetDraft.objects.filter(filename__contains=string)
1316
return drafts
1417

0 commit comments

Comments
 (0)