diff mbox series

[U-Boot,14/24] patman: Allow reading files in text mode

Message ID 20190518040054.230179-15-sjg@chromium.org
State Accepted
Commit 3c47e4105e0b467938660a986c261f2db10a2edd
Delegated to: Simon Glass
Headers show
Series binman: dtoc: Convert to Python 3 | expand

Commit Message

Simon Glass May 18, 2019, 4 a.m. UTC 
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>
---

 tools/patman/tools.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/tools/patman/tools.py b/tools/patman/tools.py
index bdc1953936c..8e9f22afe8a 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)))