Skip to content

Commit 43e472b

Browse files
committed
Remove IETFWG_DESCRIPTIONS_PATH which is no longer useful as all charter files will soon have been moved
- Legacy-Id: 7582
1 parent 357f88c commit 43e472b

2 files changed

Lines changed: 10 additions & 18 deletions

File tree

ietf/group/utils.py

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,21 @@ def save_group_in_history(group):
2828

2929
def get_charter_text(group):
3030
# get file path from settings. Syntesize file name from path, acronym, and suffix
31-
try:
32-
# Try getting charter from new charter tool
33-
c = group.charter
31+
c = group.charter
3432

35-
# find the latest, preferably approved, revision
36-
for h in group.charter.history_set.exclude(rev="").order_by("time"):
37-
h_appr = "-" not in h.rev
38-
c_appr = "-" not in c.rev
39-
if (h.rev > c.rev and not (c_appr and not h_appr)) or (h_appr and not c_appr):
40-
c = h
33+
# find the latest, preferably approved, revision
34+
for h in group.charter.history_set.exclude(rev="").order_by("time"):
35+
h_appr = "-" not in h.rev
36+
c_appr = "-" not in c.rev
37+
if (h.rev > c.rev and not (c_appr and not h_appr)) or (h_appr and not c_appr):
38+
c = h
4139

42-
filename = os.path.join(c.get_file_path(), "%s-%s.txt" % (c.canonical_name(), c.rev))
40+
filename = os.path.join(c.get_file_path(), "%s-%s.txt" % (c.canonical_name(), c.rev))
41+
try:
4342
with open(filename) as f:
4443
return f.read()
4544
except IOError:
46-
try:
47-
filename = os.path.join(settings.IETFWG_DESCRIPTIONS_PATH, group.acronym) + ".desc.txt"
48-
desc_file = open(filename)
49-
desc = desc_file.read()
50-
except BaseException:
51-
desc = 'Error Loading Work Group Description'
52-
return desc
45+
return 'Error Loading Group Charter'
5346

5447
def get_area_ads_emails(area):
5548
if area.acronym == 'none':

ietf/settings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ def skip_suspicious_operations(record):
265265
MINUTES_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/minutes/%(wg)s.%(ext)s'
266266
SLIDES_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/slides/%(wg)s-*'
267267
IPR_DOCUMENT_PATH = '/a/www/ietf-ftp/ietf/IPR/'
268-
IETFWG_DESCRIPTIONS_PATH = '/a/www/www6s/wg-descriptions/'
269268
IESG_TASK_FILE = '/a/www/www6/iesg/internal/task.txt'
270269
IESG_ROLL_CALL_FILE = '/a/www/www6/iesg/internal/rollcall.txt'
271270
IESG_MINUTES_FILE = '/a/www/www6/iesg/internal/minutes.txt'

0 commit comments

Comments
 (0)