fix(text): Capitalize "type" in non-ASCII artwork message (#1170)

kesara · web-flow · commit 83e897fe523a · 2024-10-01T09:41:43.000+13:00
* chore: Run yestests pre-changes * fix(text): Capitalize "type" in non-ASCII artwork message Fixes #1169 * chore: Run yestests post-changes
diff --git a/test.py b/test.py
@@ -712,18 +712,61 @@ def test_render_artwork_svg_only(self):
         self.writer.rfcnumber = 1234
         lines = self.writer.render_artwork(artwork, width=60)
         text = ''.join(line.text for line in lines)
-        self.assertIn("Artwork only available as svg", text)
+        self.assertIn("Artwork only available as SVG", text)
         self.assertIn(default_options.rfc_html_archive_url, text)
         self.assertIn('rfc1234.html', text)
 
         # for Draft
         self.writer.options.rfc = None
         lines = self.writer.render_artwork(artwork, width=60)
         text = ' '.join(line.text for line in lines)
-        self.assertIn("Artwork only available as svg", text)
+        self.assertIn("Artwork only available as SVG", text)
         self.assertIn(default_options.id_html_archive_url, text)
         self.assertIn(".html", text)
 
+    def test_render_artwork_binary_art_only(self):
+        artwork_str = '<artwork type="binary-art" src="foot.bin" />'
+        artwork = lxml.etree.fromstring(artwork_str)
+
+        # for RFC
+        self.writer.root = lxml.etree.fromstring(f'<rfc number="1234"></rfc>')
+        self.writer.options.rfc = True
+        self.writer.rfcnumber = 1234
+        lines = self.writer.render_artwork(artwork, width=60)
+        text = ''.join(line.text for line in lines)
+        self.assertIn("Artwork only available as BINARY-ART", text)
+        self.assertIn(default_options.rfc_html_archive_url, text)
+        self.assertIn('rfc1234.html', text)
+
+        # for Draft
+        self.writer.options.rfc = None
+        lines = self.writer.render_artwork(artwork, width=60)
+        text = ' '.join(line.text for line in lines)
+        self.assertIn("Artwork only available as BINARY-ART", text)
+        self.assertIn(default_options.id_html_archive_url, text)
+        self.assertIn(".html", text)
+
+    def test_render_artwork_non_ascii_unknown(self):
+        artwork_str = '<artwork src="foot.bin" />'
+        artwork = lxml.etree.fromstring(artwork_str)
+
+        # for RFC
+        self.writer.root = lxml.etree.fromstring(f'<rfc number="1234"></rfc>')
+        self.writer.options.rfc = True
+        self.writer.rfcnumber = 1234
+        lines = self.writer.render_artwork(artwork, width=60)
+        text = ''.join(line.text for line in lines)
+        self.assertIn("Artwork only available as (unknown type)", text)
+        self.assertIn(default_options.rfc_html_archive_url, text)
+        self.assertIn('rfc1234.html', text)
+
+        # for Draft
+        self.writer.options.rfc = None
+        lines = self.writer.render_artwork(artwork, width=60)
+        text = ' '.join(line.text for line in lines)
+        self.assertIn("Artwork only available as (unknown type)", text)
+        self.assertIn(default_options.id_html_archive_url, text)
+        self.assertIn(".html", text)
 
 
 class BaseV3WriterTest(unittest.TestCase):
diff --git a/tests/valid/draft-v3-features.text b/tests/valid/draft-v3-features.text
@@ -519,7 +519,7 @@ Table of Contents
 
    Text before...
 
-   (Artwork only available as svg: see
+   (Artwork only available as SVG: see
    https://www.ietf.org/archive/id/draft-v3-features.html)
 
    Text after...
@@ -528,7 +528,7 @@ Table of Contents
 
    Text before...
 
-   (Artwork only available as svg: see
+   (Artwork only available as SVG: see
    https://www.ietf.org/archive/id/draft-v3-features.html)
 
    Text after...
@@ -537,7 +537,7 @@ Table of Contents
 
    Text before...
 
-          (Artwork only available as svg: see
+          (Artwork only available as SVG: see
           https://www.ietf.org/archive/id/draft-v3-features.html)
 
    Text after...
@@ -546,14 +546,14 @@ Table of Contents
 
    Text before...
 
-                 (Artwork only available as svg: see
+                 (Artwork only available as SVG: see
                  https://www.ietf.org/archive/id/draft-v3-features.html)
 
    Text after...
 
 8.5.  included (type svg)
 
-   (Artwork only available as svg: see
+   (Artwork only available as SVG: see
    https://www.ietf.org/archive/id/draft-v3-features.html)
                 +--------------------+
                 | Included from file |
diff --git a/tests/valid/elements.bom.text b/tests/valid/elements.bom.text
@@ -355,12 +355,12 @@ Internet-Draft       Xml2rfc Vocabulary V3 Elements            July 2018
 
    *  Artset include with <xi:include>
 
-      (Artwork only available as svg: see
+      (Artwork only available as SVG: see
       https://www.ietf.org/archive/id/elements-00.html)
 
    *  Unicode SVG rendering test
 
-              (Artwork only available as svg: see
+              (Artwork only available as SVG: see
               https://www.ietf.org/archive/id/elements-00.html)
 
 4.  Ordered list with sub-elements
diff --git a/tests/valid/elements.pages.text b/tests/valid/elements.pages.text
@@ -355,12 +355,12 @@ Internet-Draft       Xml2rfc Vocabulary V3 Elements            July 2018
 
    *  Artset include with <xi:include>
 
-      (Artwork only available as svg: see
+      (Artwork only available as SVG: see
       https://www.ietf.org/archive/id/elements-00.html)
 
    *  Unicode SVG rendering test
 
-              (Artwork only available as svg: see
+              (Artwork only available as SVG: see
               https://www.ietf.org/archive/id/elements-00.html)
 
 4.  Ordered list with sub-elements
diff --git a/tests/valid/elements.text b/tests/valid/elements.text
@@ -302,12 +302,12 @@ Table of Contents
 
    *  Artset include with <xi:include>
 
-      (Artwork only available as svg: see
+      (Artwork only available as SVG: see
       https://www.ietf.org/archive/id/elements-00.html)
 
    *  Unicode SVG rendering test
 
-              (Artwork only available as svg: see
+              (Artwork only available as SVG: see
               https://www.ietf.org/archive/id/elements-00.html)
 
 4.  Ordered list with sub-elements
diff --git a/tests/valid/elements.wip.text b/tests/valid/elements.wip.text
@@ -355,12 +355,12 @@ Internet-Draft       Xml2rfc Vocabulary V3 Elements            July 2018
 
    *  Artset include with <xi:include>
 
-      (Artwork only available as svg: see
+      (Artwork only available as SVG: see
       https://www.ietf.org/archive/id/elements-00.html)
 
    *  Unicode SVG rendering test
 
-              (Artwork only available as svg: see
+              (Artwork only available as SVG: see
               https://www.ietf.org/archive/id/elements-00.html)
 
 4.  Ordered list with sub-elements
diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                        September 20, 2024
+Internet-Draft                                        September 26, 2024
 Intended status: Experimental                                           
-Expires: March 24, 2025
+Expires: March 30, 2025
 
 
                           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 March 24, 2025.
+   This Internet-Draft will expire on March 30, 2025.
 
 Copyright Notice
 
@@ -53,7 +53,7 @@ Table of Contents
 
 
 
-Person                   Expires March 24, 2025                 [Page 1]
+Person                   Expires March 30, 2025                 [Page 1]
 
 Internet-Draft             xml2rfc index tests            September 2024
 
@@ -109,7 +109,7 @@ Index
 
 
 
-Person                   Expires March 24, 2025                 [Page 2]
+Person                   Expires March 30, 2025                 [Page 2]
 
 Internet-Draft             xml2rfc index tests            September 2024
 
@@ -165,4 +165,4 @@ Author's Address
 
 
 
-Person                   Expires March 24, 2025                 [Page 3]
+Person                   Expires March 30, 2025                 [Page 3]
diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="https://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2024-09-20T06:09:45" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
+<rfc xmlns:xi="https://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2024-09-26T21:56:36" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
   <!-- xml2rfc v2v3 conversion 3.23.1 -->
   
     
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="20" month="09" year="2024"/>
+    <date day="26" month="09" year="2024"/>
     <boilerplate>
       <section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
         <name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
@@ -41,7 +41,7 @@
         material or to cite them other than as "work in progress."
         </t>
         <t indent="0" pn="section-boilerplate.1-4">
-        This Internet-Draft will expire on 24 March 2025.
+        This Internet-Draft will expire on 30 March 2025.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                        September 20, 2024
+Internet-Draft                                        September 26, 2024
 Intended status: Experimental                                           
-Expires: March 24, 2025
+Expires: March 30, 2025
 
 
                           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 March 24, 2025.
+   This Internet-Draft will expire on March 30, 2025.
 
 Copyright Notice
 
diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html
@@ -23,7 +23,7 @@
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires March 24, 2025</td>
+<td class="center">Expires March 30, 2025</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -36,12 +36,12 @@
 <dd class="internet-draft">indexes-00</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2024-09-20" class="published">September 20, 2024</time>
+<time datetime="2024-09-26" class="published">September 26, 2024</time>
     </dd>
 <dt class="label-intended-status">Intended Status:</dt>
 <dd class="intended-status">Experimental</dd>
 <dt class="label-expires">Expires:</dt>
-<dd class="expires"><time datetime="2025-03-24">March 24, 2025</time></dd>
+<dd class="expires"><time datetime="2025-03-30">March 30, 2025</time></dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
 <div class="author">
@@ -71,7 +71,7 @@ <h2 id="name-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."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
 <p id="section-boilerplate.1-4">
-        This Internet-Draft will expire on March 24, 2025.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on March 30, 2025.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">
diff --git a/tests/valid/manpage.txt b/tests/valid/manpage.txt
@@ -1,5 +1,5 @@
 xml2rfc(1)                                                    xml2rfc(1)
-                                                       20 September 2024
+                                                       26 September 2024
 
 
                   Xml2rfc Vocabulary Version 3 Schema
diff --git a/tests/valid/sourcecode.pages.text b/tests/valid/sourcecode.pages.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                        September 20, 2024
+Internet-Draft                                        September 26, 2024
 Intended status: Experimental                                           
-Expires: March 24, 2025
+Expires: March 30, 2025
 
 
                         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 March 24, 2025.
+   This Internet-Draft will expire on March 30, 2025.
 
 Copyright Notice
 
@@ -53,7 +53,7 @@ Table of Contents
 
 
 
-Person                   Expires March 24, 2025                 [Page 1]
+Person                   Expires March 30, 2025                 [Page 1]
 
 Internet-Draft          xml2rfc sourcecode tests          September 2024
 
@@ -109,7 +109,7 @@ Internet-Draft          xml2rfc sourcecode tests          September 2024
 
 
 
-Person                   Expires March 24, 2025                 [Page 2]
+Person                   Expires March 30, 2025                 [Page 2]
 
 Internet-Draft          xml2rfc sourcecode tests          September 2024
 
@@ -165,7 +165,7 @@ Internet-Draft          xml2rfc sourcecode tests          September 2024
 
 
 
-Person                   Expires March 24, 2025                 [Page 3]
+Person                   Expires March 30, 2025                 [Page 3]
 
 Internet-Draft          xml2rfc sourcecode tests          September 2024
 
@@ -221,4 +221,4 @@ Author's Address
 
 
 
-Person                   Expires March 24, 2025                 [Page 4]
+Person                   Expires March 30, 2025                 [Page 4]
diff --git a/tests/valid/sourcecode.prepped.xml b/tests/valid/sourcecode.prepped.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="https://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="sourcecode-00" prepTime="2024-09-20T06:09:52" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
+<rfc xmlns:xi="https://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="sourcecode-00" prepTime="2024-09-26T21:56:43" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
   <!-- xml2rfc v2v3 conversion 3.23.1 -->
   
     
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="20" month="09" year="2024"/>
+    <date day="26" month="09" year="2024"/>
     <boilerplate>
       <section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
         <name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
@@ -41,7 +41,7 @@
         material or to cite them other than as "work in progress."
         </t>
         <t indent="0" pn="section-boilerplate.1-4">
-        This Internet-Draft will expire on 24 March 2025.
+        This Internet-Draft will expire on 30 March 2025.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
diff --git a/tests/valid/sourcecode.text b/tests/valid/sourcecode.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                        September 20, 2024
+Internet-Draft                                        September 26, 2024
 Intended status: Experimental                                           
-Expires: March 24, 2025
+Expires: March 30, 2025
 
 
                         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 March 24, 2025.
+   This Internet-Draft will expire on March 30, 2025.
 
 Copyright Notice
 
diff --git a/tests/valid/sourcecode.v3.html b/tests/valid/sourcecode.v3.html
diff --git a/xml2rfc/writers/text.py b/xml2rfc/writers/text.py
