{{statement.title}}
- {% if statement.status == "replaced" %}Replaced{% endif %}
- {% endfor %}
+ {% endfor %}
+{% endfor %}
{% endblock %}
{% block js %}
diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py
index bfe5a56597..d0a5496283 100644
--- a/ietf/utils/test_runner.py
+++ b/ietf/utils/test_runner.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2020, All Rights Reserved
+# Copyright The IETF Trust 2009-2025, All Rights Reserved
# -*- coding: utf-8 -*-
#
# Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -54,7 +54,6 @@
import urllib3
import warnings
-from fnmatch import fnmatch
from typing import Callable, Optional
from urllib.parse import urlencode
@@ -414,8 +413,9 @@ def do_append(res, p0, p1, item):
res.append((str(item.pattern), item))
return res
+
_all_templates = None
-def get_template_paths(apps=None):
+def get_template_paths(apps=None) -> list[str]:
global _all_templates
if not _all_templates:
# TODO: Add app templates to the full list, if we are using
@@ -424,25 +424,26 @@ def get_template_paths(apps=None):
templatepaths = settings.TEMPLATES[0]['DIRS']
for templatepath in templatepaths:
for dirpath, dirs, files in os.walk(templatepath):
- if ".svn" in dirs:
- dirs.remove(".svn")
- relative_path = dirpath[len(templatepath)+1:]
- for file in files:
- ignore = False
- for pattern in settings.TEST_TEMPLATE_IGNORE:
- if fnmatch(file, pattern):
- ignore = True
- break
- if ignore:
- continue
- if relative_path != "":
- file = os.path.join(relative_path, file)
- templates.add(file)
- if apps:
- templates = [ t for t in templates if t.split(os.path.sep)[0] in apps ]
- _all_templates = templates
+ # glob against path from PROJECT_DIR
+ project_path = pathlib.Path(
+ dirpath.removeprefix(settings.PROJECT_DIR).lstrip("/")
+ )
+ # label entries with name relative to templatepath
+ relative_path = pathlib.Path(
+ dirpath.removeprefix(templatepath).lstrip("/")
+ )
+ if apps and relative_path.parts[0] not in apps:
+ continue # skip uninteresting apps
+ for filename in files:
+ file_path = project_path / filename
+ if not any(
+ file_path.match(pat) for pat in settings.TEST_TEMPLATE_IGNORE
+ ):
+ templates.add(relative_path / filename)
+ _all_templates = [str(t) for t in templates]
return _all_templates
+
def save_test_results(failures, test_labels):
# Record the test result in a file, in order to be able to check the
# results and avoid re-running tests if we've already run them with OK
diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py
index 872aa366b9..ce1842236d 100644
--- a/ietf/utils/tests.py
+++ b/ietf/utils/tests.py
@@ -19,7 +19,6 @@
from email.mime.image import MIMEImage
from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText
-from fnmatch import fnmatch
from importlib import import_module
from textwrap import dedent
from tempfile import mkdtemp
@@ -320,7 +319,7 @@ class TemplateChecksTestCase(TestCase):
def setUp(self):
super().setUp()
set_coverage_checking(False)
- self.paths = list(get_template_paths())
+ self.paths = get_template_paths() # already filtered ignores
self.paths.sort()
for path in self.paths:
try:
@@ -335,11 +334,7 @@ def tearDown(self):
def test_parse_templates(self):
errors = []
for path in self.paths:
- for pattern in settings.TEST_TEMPLATE_IGNORE:
- if fnmatch(path, pattern):
- continue
- if not path in self.templates:
-
+ if path not in self.templates:
try:
get_template(path)
except Exception as e:
@@ -709,6 +704,14 @@ def test_render_author_name(self):
)),
"Joanna Q. Public",
)
+ self.assertEqual(
+ XMLDraft.render_author_name(lxml.etree.Element(
+ "author",
+ fullname=chr(340)+"ich",
+ asciiFullname="Rich UTF-8",
+ )),
+ chr(340)+"ich (Rich UTF-8)",
+ )
self.assertEqual(
XMLDraft.render_author_name(lxml.etree.Element(
"author",
diff --git a/ietf/utils/xmldraft.py b/ietf/utils/xmldraft.py
index 7ef6605c78..f555a0a16a 100644
--- a/ietf/utils/xmldraft.py
+++ b/ietf/utils/xmldraft.py
@@ -233,6 +233,12 @@ def render_author_name(author_elt):
# Use fullname attribute, if present
fullname = author_elt.attrib.get("fullname", "").strip()
if fullname:
+ # If any 8bit chars in the fullname, try to append the author's
+ # name in ascii.
+ if any([x >= 0x80 for x in fullname.encode('utf8')]):
+ asciifullname = author_elt.attrib.get("asciiFullname", "").strip()
+ if asciifullname:
+ fullname = fullname + ' (' + asciifullname + ')'
return fullname
surname = author_elt.attrib.get("surname", "").strip()
initials = author_elt.attrib.get("initials", "").strip()