From: Simon Glass <sjg@chromium.org>
Date: Sat, 18 May 2019 04:00:44 +0000 (-0600)
Subject: patman: Allow reading files in text mode
X-Git-Tag: v2019.10-rc1~32^2~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3c47e4105e0b467938660a986c261f2db10a2edd;p=oweals%2Fu-boot.git

patman: Allow reading files in text mode

While reading files in binary mode is the norm, sometimes we want to use
text mode. Add an optional parameter to handle this.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/patman/tools.py b/tools/patman/tools.py
index bdc1953936..8e9f22afe8 100644
--- a/tools/patman/tools.py
+++ b/tools/patman/tools.py
@@ -214,7 +214,7 @@ def Filename(fname):
     # If not found, just return the standard, unchanged path
     return fname
 
-def ReadFile(fname):
+def ReadFile(fname, binary=True):
     """Read and return the contents of a file.
 
     Args:
@@ -223,7 +223,7 @@ def ReadFile(fname):
     Returns:
       data read from file, as a string.
     """
-    with open(Filename(fname), 'rb') as fd:
+    with open(Filename(fname), binary and 'rb' or 'r') as fd:
         data = fd.read()
     #self._out.Info("Read file '%s' size %d (%#0x)" %
                    #(fname, len(data), len(data)))