[ovs-dev] [PATCH 5/5] xml2nroff: Read whole file instead of line by line.

Russell Bryant russell at ovn.org
Thu Dec 10 19:29:14 UTC 2015


The previous code processed the input file line by line, but I think
it looks a little more straight forward to just process the whole file
at once.

This patch also explicitly closes the file after reading its contents.

Signed-off-by: Russell Bryant <russell at ovn.org>
---
 build-aux/xml2nroff | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/build-aux/xml2nroff b/build-aux/xml2nroff
index d55a0d3..00ef649 100755
--- a/build-aux/xml2nroff
+++ b/build-aux/xml2nroff
@@ -41,13 +41,11 @@ The following options are also available:
 
 
 def manpage_to_nroff(xml_file, subst, version=None):
-    f = open(xml_file)
-    content = []
-    for line in f:
-        for k, v in subst.iteritems():
-            line = line.replace(k, v)
-        content += [line]
-    doc = xml.dom.minidom.parseString(''.join(content)).documentElement
+    with open(xml_file) as f:
+        content = f.read()
+    for k, v in subst.iteritems():
+        content = content.replace(k, v)
+    doc = xml.dom.minidom.parseString(content).documentElement
 
     if version is None:
         version = "UNKNOWN"
-- 
2.5.0




More information about the dev mailing list