fix: Fix warnings in text and manpage (#775)

* fix: Fix FutureWarning in xml2rfc/writers/text.py * fix: Remove rfc2629-xhtml.ent from doc template rfc2629-xhtml.ent is no longer needed.
ietf-tools · May 11, 2022 · 07ef95e · 07ef95e
1 parent 42568b3
commit 07ef95e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/xml2rfc/templates/doc.xml b/xml2rfc/templates/doc.xml
@@ -1,5 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>  <!-- -*- indent-with-tabs: 0 -*- -->
-<!DOCTYPE rfc SYSTEM "rfc2629-xhtml.ent">
+<!DOCTYPE rfc [
+  <!ENTITY nbsp    "&#160;">
+  <!ENTITY zwsp   "&#8203;">
+  <!ENTITY nbhy   "&#8209;">
+  <!ENTITY wj     "&#8288;">
+]>
 <rfc submissionType='independent' ipr="none " docName="xml2rfc-docs-{{version}}"
            category="info"
            xmlns:xi="http://www.w3.org/2001/XInclude" version="3"

diff --git a/xml2rfc/writers/text.py b/xml2rfc/writers/text.py
@@ -371,7 +371,7 @@ def render(self, e, width, **kw):
 
     def add_pageno_placeholders(self):
         toc = self.root.find('./front/toc/section')
-        if toc:
+        if toc is not None:
             for e in toc.xpath('.//xref[2]'):
                 e.set('pageno', '0000')