- This documentation applies to xml2rfc version 3.17.1.¶
+ This documentation applies to xml2rfc version 3.17.2.¶
@@ -6366,7 +6366,7 @@
The following variables are available for use in an xml2rfc
- manpage Jinja2 template, as of xml2rfc version 3.17.1:¶
+ manpage Jinja2 template, as of xml2rfc version 3.17.2:¶
{{ bare_latin_tags }}:
diff --git a/tests/valid/draft-miek-test.html b/tests/valid/draft-miek-test.html
index 9d077d83..4e78423d 100644
--- a/tests/valid/draft-miek-test.html
+++ b/tests/valid/draft-miek-test.html
@@ -16,7 +16,7 @@
This version is adapted to work with "xml2rfc" version 2.x.
' name="description">
-
+
@@ -26,11 +26,11 @@
diff --git a/tests/valid/draft-template-old.exp.xml b/tests/valid/draft-template-old.exp.xml
index dcb87511..d204e7ce 100644
--- a/tests/valid/draft-template-old.exp.xml
+++ b/tests/valid/draft-template-old.exp.xml
@@ -516,7 +516,6 @@ main(int argc, char *argv[])
- Guidelines for Writing RFC Text on Security Considerations
@@ -530,7 +529,6 @@ main(int argc, char *argv[])
-
@@ -617,7 +615,6 @@ main(int argc, char *argv[])
Communications of the ACM, vol. 59, no. 9, pp. 88-97
-
diff --git a/tests/valid/draft-template.exp.xml b/tests/valid/draft-template.exp.xml
index e5ae7b27..7a2fa0e5 100644
--- a/tests/valid/draft-template.exp.xml
+++ b/tests/valid/draft-template.exp.xml
@@ -453,7 +453,6 @@ main(int argc, char *argv[])
-
@@ -468,9 +467,8 @@ main(int argc, char *argv[])
-
-
+ Guidelines for Writing an IANA Considerations Section in RFCs
@@ -485,7 +483,6 @@ main(int argc, char *argv[])
-
@@ -558,7 +555,6 @@ main(int argc, char *argv[])
Communications of the ACM, vol. 59, no. 9, pp. 88-97
-
diff --git a/tests/valid/draft-template.html b/tests/valid/draft-template.html
index f383ba3a..faae88f5 100644
--- a/tests/valid/draft-template.html
+++ b/tests/valid/draft-template.html
@@ -11,15 +11,15 @@
Insert an abstract: MANDATORY. This template is for creating an
Internet Draft.
" name="description">
-
+
+
+
@@ -650,7 +650,7 @@ main(int argc, char *argv[])
-
+ Guidelines for Writing an IANA Considerations Section in RFCs
diff --git a/tests/valid/draft-template.text b/tests/valid/draft-template.text
index 00c0b69e..122da9fb 100644
--- a/tests/valid/draft-template.text
+++ b/tests/valid/draft-template.text
@@ -462,8 +462,8 @@ Table of Contents
an IANA Considerations Section in RFCs", Work in Progress,
Internet-Draft, draft-narten-iana-considerations-
rfc2434bis-09, March 26, 2008,
- .
+ .
[RFC2629] Rose, M., "Writing I-Ds and RFCs using XML", RFC 2629,
DOI 10.17487/RFC2629, June 1999,
diff --git a/tests/valid/draft-template.txt b/tests/valid/draft-template.txt
index 88db2cee..082ab3ac 100644
--- a/tests/valid/draft-template.txt
+++ b/tests/valid/draft-template.txt
@@ -567,8 +567,8 @@ Internet-Draft Abbreviated Title March 2009
an IANA Considerations Section in RFCs", Work in Progress,
Internet-Draft, draft-narten-iana-considerations-
rfc2434bis-09, 26 March 2008,
- .
+ .
[RFC2629] Rose, M., "Writing I-Ds and RFCs using XML", RFC 2629,
DOI 10.17487/RFC2629, June 1999,
diff --git a/tests/valid/draft-template.v3add-xinclude.xml b/tests/valid/draft-template.v3add-xinclude.xml
index 7092bd32..7f22e8ef 100644
--- a/tests/valid/draft-template.v3add-xinclude.xml
+++ b/tests/valid/draft-template.v3add-xinclude.xml
@@ -893,7 +893,6 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt
-
diff --git a/tests/valid/draft-v3-features.prepped.xml b/tests/valid/draft-v3-features.prepped.xml
index cbd2c6c3..f312727a 100644
--- a/tests/valid/draft-v3-features.prepped.xml
+++ b/tests/valid/draft-v3-features.prepped.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -3977,7 +3977,6 @@ foo = bar
-
@@ -3994,7 +3993,6 @@ foo = bar
-
@@ -4009,7 +4007,6 @@ foo = bar
-
@@ -4025,7 +4022,6 @@ foo = bar
-
@@ -4041,7 +4037,6 @@ foo = bar
-
diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text
index ccbbaaa0..7f6294d2 100644
--- a/tests/valid/indexes.pages.text
+++ b/tests/valid/indexes.pages.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft May 31, 2023
+Internet-Draft June 5, 2023
Intended status: Experimental
-Expires: December 2, 2023
+Expires: December 7, 2023
xml2rfc index tests
@@ -26,7 +26,7 @@ Status of This Memo
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."
- This Internet-Draft will expire on December 2, 2023.
+ This Internet-Draft will expire on December 7, 2023.
Copyright Notice
@@ -53,9 +53,9 @@ Table of Contents
-Person Expires December 2, 2023 [Page 1]
+Person Expires December 7, 2023 [Page 1]
-Internet-Draft xml2rfc index tests May 2023
+Internet-Draft xml2rfc index tests June 2023
This is another section!
@@ -109,9 +109,9 @@ Index
-Person Expires December 2, 2023 [Page 2]
+Person Expires December 7, 2023 [Page 2]
-Internet-Draft xml2rfc index tests May 2023
+Internet-Draft xml2rfc index tests June 2023
E
@@ -165,4 +165,4 @@ Author's Address
-Person Expires December 2, 2023 [Page 3]
+Person Expires December 7, 2023 [Page 3]
diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml
index 2e729e7a..99601975 100644
--- a/tests/valid/indexes.prepped.xml
+++ b/tests/valid/indexes.prepped.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -20,7 +20,7 @@
-
+ Status of This Memo
@@ -41,7 +41,7 @@
material or to cite them other than as "work in progress."
- This Internet-Draft will expire on 2 December 2023.
+ This Internet-Draft will expire on 7 December 2023.
diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text
index f118ba8c..8cc97d1d 100644
--- a/tests/valid/indexes.text
+++ b/tests/valid/indexes.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft May 31, 2023
+Internet-Draft June 5, 2023
Intended status: Experimental
-Expires: December 2, 2023
+Expires: December 7, 2023
xml2rfc index tests
@@ -26,7 +26,7 @@ Status of This Memo
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."
- This Internet-Draft will expire on December 2, 2023.
+ This Internet-Draft will expire on December 7, 2023.
Copyright Notice
diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html
index b76b2f10..058878e6 100644
--- a/tests/valid/indexes.v3.html
+++ b/tests/valid/indexes.v3.html
@@ -6,7 +6,7 @@
xml2rfc index tests
-
+
@@ -19,11 +19,11 @@
Internet-Draft
xml2rfc index tests
-
May 2023
+
June 2023
Person
-
Expires December 2, 2023
+
Expires December 7, 2023
[Page]
@@ -36,12 +36,12 @@
indexes-00
Published:
-
+
Intended Status:
Experimental
Expires:
-
+
Author:
@@ -71,7 +71,7 @@
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."¶
- This Internet-Draft will expire on December 2, 2023.¶
+ This Internet-Draft will expire on December 7, 2023.¶
diff --git a/tests/valid/manpage.txt b/tests/valid/manpage.txt
index 0d725625..40fcc6ac 100644
--- a/tests/valid/manpage.txt
+++ b/tests/valid/manpage.txt
@@ -1,10 +1,10 @@
xml2rfc(1) xml2rfc(1)
- 31 May 2023
+ 5 June 2023
Xml2rfc Vocabulary Version 3 Schema
- xml2rfc release 3.17.1
- xml2rfc-docs-3.17.1
+ xml2rfc release 3.17.2
+ xml2rfc-docs-3.17.2
Abstract
@@ -54,7 +54,7 @@ Table of Contents
The latest version of this documentation is available in HTML form at
https://ietf-tools.github.io/xml2rfc/.
- This documentation applies to xml2rfc version 3.17.1.
+ This documentation applies to xml2rfc version 3.17.2.
2. Schema Version 3 Elements
@@ -4319,7 +4319,7 @@ Appendix C. xml2rfc Configuration Files
Appendix D. xml2rfc Documentation Template Variables
The following variables are available for use in an xml2rfc manpage
- Jinja2 template, as of xml2rfc version 3.17.1:
+ Jinja2 template, as of xml2rfc version 3.17.2:
{{ bare_latin_tags }}:
diff --git a/tests/valid/rfc7911.exp.xml b/tests/valid/rfc7911.exp.xml
index 4c4e571b..ea77cdce 100644
--- a/tests/valid/rfc7911.exp.xml
+++ b/tests/valid/rfc7911.exp.xml
@@ -268,7 +268,6 @@
-
@@ -283,7 +282,6 @@
-
@@ -299,7 +297,6 @@
-
@@ -327,7 +324,6 @@
-
@@ -415,7 +411,6 @@ I-D Needed -->
-
@@ -429,7 +424,6 @@ I-D Needed -->
-
diff --git a/tests/valid/rfc7911.html b/tests/valid/rfc7911.html
index 8d7e3341..82b50c9f 100644
--- a/tests/valid/rfc7911.html
+++ b/tests/valid/rfc7911.html
@@ -16,14 +16,14 @@
that each path is identified by a Path Identifier in addition to the
address prefix.
" name="description">
-
+
diff --git a/tests/valid/sourcecode.pages.text b/tests/valid/sourcecode.pages.text
index fdb4000b..697d4eac 100644
--- a/tests/valid/sourcecode.pages.text
+++ b/tests/valid/sourcecode.pages.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft May 31, 2023
+Internet-Draft June 5, 2023
Intended status: Experimental
-Expires: December 2, 2023
+Expires: December 7, 2023
xml2rfc sourcecode tests
@@ -26,7 +26,7 @@ Status of This Memo
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."
- This Internet-Draft will expire on December 2, 2023.
+ This Internet-Draft will expire on December 7, 2023.
Copyright Notice
@@ -53,9 +53,9 @@ Table of Contents
-Person Expires December 2, 2023 [Page 1]
+Person Expires December 7, 2023 [Page 1]
-Internet-Draft xml2rfc sourcecode tests May 2023
+Internet-Draft xml2rfc sourcecode tests June 2023
print("01")
@@ -109,9 +109,9 @@ Internet-Draft xml2rfc sourcecode tests May 2023
-Person Expires December 2, 2023 [Page 2]
+Person Expires December 7, 2023 [Page 2]
-Internet-Draft xml2rfc sourcecode tests May 2023
+Internet-Draft xml2rfc sourcecode tests June 2023
print("49")
@@ -165,9 +165,9 @@ Internet-Draft xml2rfc sourcecode tests May 2023
-Person Expires December 2, 2023 [Page 3]
+Person Expires December 7, 2023 [Page 3]
-Internet-Draft xml2rfc sourcecode tests May 2023
+Internet-Draft xml2rfc sourcecode tests June 2023
print("47")
@@ -221,4 +221,4 @@ Author's Address
-Person Expires December 2, 2023 [Page 4]
+Person Expires December 7, 2023 [Page 4]
diff --git a/tests/valid/sourcecode.prepped.xml b/tests/valid/sourcecode.prepped.xml
index 75d4c0e5..c65c6f69 100644
--- a/tests/valid/sourcecode.prepped.xml
+++ b/tests/valid/sourcecode.prepped.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -20,7 +20,7 @@
-
+ Status of This Memo
@@ -41,7 +41,7 @@
material or to cite them other than as "work in progress."
- This Internet-Draft will expire on 2 December 2023.
+ This Internet-Draft will expire on 7 December 2023.
diff --git a/tests/valid/sourcecode.text b/tests/valid/sourcecode.text
index 76ed1708..7b96ed2f 100644
--- a/tests/valid/sourcecode.text
+++ b/tests/valid/sourcecode.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft May 31, 2023
+Internet-Draft June 5, 2023
Intended status: Experimental
-Expires: December 2, 2023
+Expires: December 7, 2023
xml2rfc sourcecode tests
@@ -26,7 +26,7 @@ Status of This Memo
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."
- This Internet-Draft will expire on December 2, 2023.
+ This Internet-Draft will expire on December 7, 2023.
Copyright Notice
diff --git a/tests/valid/sourcecode.v3.html b/tests/valid/sourcecode.v3.html
index 29d1b8ab..dfe0c598 100644
--- a/tests/valid/sourcecode.v3.html
+++ b/tests/valid/sourcecode.v3.html
@@ -6,7 +6,7 @@
xml2rfc sourcecode tests
-
+
@@ -19,11 +19,11 @@
Internet-Draft
xml2rfc sourcecode tests
-
May 2023
+
June 2023
Person
-
Expires December 2, 2023
+
Expires December 7, 2023
[Page]
@@ -36,12 +36,12 @@
sourcecode-00
Published:
-
+
Intended Status:
Experimental
Expires:
-
+
Author:
@@ -71,7 +71,7 @@
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."¶
- This Internet-Draft will expire on December 2, 2023.¶
+ This Internet-Draft will expire on December 7, 2023.¶
diff --git a/xml2rfc/util/postal.py b/xml2rfc/util/postal.py
index 3faf6324..8ec62951 100644
--- a/xml2rfc/util/postal.py
+++ b/xml2rfc/util/postal.py
@@ -187,7 +187,7 @@ def get_normalized_address_info(writer, x, latin=False):
" Available elements for %s are: %s" % (address_field_elements[e], adr[e], country_info.name, ', '.join(elements)))
try:
i18naddress.normalize_address(adr)
- except i18naddress.InvalidAddress as e:
+ except i18naddress.InvalidAddressError as e:
list_parts = True
writer.note(x, "Postal address check failed for author %s." % full_author_name(author, latin))
for item in e.errors: