refactor: drop .txt from filename_with_rev()

Author: jennifer-richards

ietf/doc/mails.py

@@ -46,10 +46,10 @@ def email_ad_approved_doc(request, doc, text):
         bcc = "iesg-secretary@ietf.org"
         frm = request.user.person.formatted_email()
         send_mail(request, to, frm,
-                          "Approved: %s" % doc.filename_with_rev(),
+                          "Approved: %s.txt" % doc.filename_with_rev(),
                           "doc/mail/ad_approval_email.txt",
                           dict(text=text,
-                                   docname=doc.filename_with_rev()),
+                                   docname=doc.filename_with_rev() + ".txt"),
                           bcc=bcc)
 
 def email_ad_approved_conflict_review(request, review, ok_to_publish):

ietf/doc/models.py

@@ -961,10 +961,10 @@ def get_related_proceedings_material(self):
         return self.proceedingsmaterial_set.first()
 
     def file_tag(self):
-        return "<%s>" % self.filename_with_rev()
+        return "<%s.txt>" % self.filename_with_rev()
 
     def filename_with_rev(self):
-        return "%s-%s.txt" % (self.name, self.rev)
+        return f"{self.name}-{self.rev}"
 
     def latest_event(self, *args, **filter_args):
         """Get latest event of optional Python type and with filter

ietf/meeting/forms.py

@@ -354,7 +354,7 @@ def save_agenda(self):
         if self.instance.agenda():
             doc = self.instance.agenda()
             doc.rev = str(int(doc.rev) + 1).zfill(2)
-            doc.uploaded_filename = doc.filename_with_rev()
+            doc.uploaded_filename = doc.filename_with_rev() + ".txt"
             e = NewRevisionDocEvent.objects.create(
                 type='new_revision',
                 by=self.user.person,
@@ -381,7 +381,7 @@ def save_agenda(self):
                 rev=doc.rev,
                 desc='New revision available')
         # write file
-        path = os.path.join(self.instance.meeting.get_materials_path(), 'agenda', doc.filename_with_rev())
+        path = os.path.join(self.instance.meeting.get_materials_path(), 'agenda', doc.filename_with_rev() + ".txt")
         directory = os.path.dirname(path)
         if not os.path.exists(directory):
             os.makedirs(directory)

ietf/meeting/tests_views.py

@@ -5389,7 +5389,7 @@ def do_interim_request_single_virtual(self, emails_expected):
         # ensure agenda document was created
         self.assertEqual(session.materials.count(),1)
         doc = session.materials.first()
-        path = os.path.join(doc.get_file_path(),doc.filename_with_rev())
+        path = os.path.join(doc.get_file_path(),doc.filename_with_rev() + ".txt")
         self.assertTrue(os.path.exists(path))
         with Path(path).open() as f:
             self.assertEqual(f.read(), agenda)

ietf/templates/doc/document_draft.html

@@ -654,7 +654,7 @@
                 Referenced by
             </a>
             <a class="btn btn-primary btn-sm"
-               href="{{ settings.IDNITS_BASE_URL }}?url=https://www.ietf.org/archive/id/{{ doc.filename_with_rev }}"
+               href="{{ settings.IDNITS_BASE_URL }}?url=https://www.ietf.org/archive/id/{{ doc.filename_with_rev }}.txt"
                rel="nofollow"
                target="_blank">
                 <i class="bi bi-exclamation">
@@ -664,7 +664,7 @@
             {% if user|has_role:"Area Director" %}
             {# IDNITS3 is an experimental service, so only show it to Area Directors #}
              <a class="btn btn-primary btn-sm"
-               href="{{ settings.IDNITS3_BASE_URL }}?url=https://www.ietf.org/archive/id/{{ doc.filename_with_rev }}"
+               href="{{ settings.IDNITS3_BASE_URL }}?url=https://www.ietf.org/archive/id/{{ doc.filename_with_rev }}.txt"
                rel="nofollow"
                target="_blank">
                 <i class="bi bi-exclamation-diamond">

ietf/templates/doc/mail/approval_mail.txt

@@ -1,11 +1,11 @@
 {% load ietf_filters %}{%load mail_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
 To: {{ to }}{% if cc %}
 Cc: {{ cc }}{% endif %}
-Subject: {{ action_type }} Action: '{{ doc.title|clean_whitespace }}' to {{ doc|std_level_prompt }} ({{ doc.filename_with_rev }})
+Subject: {{ action_type }} Action: '{{ doc.title|clean_whitespace }}' to {{ doc|std_level_prompt }} ({{ doc.filename_with_rev }}.txt)
 
 {% filter wordwrap:78 %}The IESG has approved the following document{{ docs|pluralize }}:{% for d in docs %}
 - '{{ d.filled_title }}'
-  ({{ d.filename_with_rev }}) as {{ d|std_level_prompt }}{% endfor %}
+  ({{ d.filename_with_rev }}.txt) as {{ d|std_level_prompt }}{% endfor %}
 
 {{ made_by }}