devtool: __init__: simplify replace_from_file

Mostly just remove some useless helper functions

Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py
index 717a60c039ff8e09fab90b9112e526956456bb83..969d6dc13ab13d172bf2827200b1cb44d88ebd26 100644 (file)
--- a/scripts/lib/devtool/__init__.py
+++ b/scripts/lib/devtool/__init__.py
@@ -295,32 +295,18 @@ def get_bbclassextend_targets(recipefile, pn):
 
 def replace_from_file(path, old, new):
     """Replace strings on a file"""
-
-    def read_file(path):
-        data = None
-        with open(path) as f:
-            data = f.read()
-        return data
-
-    def write_file(path, data):
-        if data is None:
-            return
-        wdata = data.rstrip() + "\n"
-        with open(path, "w") as f:
-            f.write(wdata)
-
-    # In case old is None, return immediately
     if old is None:
         return
+
     try:
-        rdata = read_file(path)
+        with open(path) as f:
+            rdata = f.read()
     except IOError as e:
         import errno
         # if file does not exit, just quit, otherwise raise an exception
         if e.errno == errno.ENOENT:
             return
-        else:
-            raise
+        raise
 
     old_contents = rdata.splitlines()
     new_contents = []
@@ -329,7 +315,10 @@ def replace_from_file(path, old, new):
             new_contents.append(old_content.replace(old, new))
         except ValueError:
             pass
-    write_file(path, "\n".join(new_contents))
+
+    wdata = ("\n".join(new_contents)).rstrip() + "\n"
+    with open(path, "w") as f:
+        f.write(wdata)
 
 
 def update_unlockedsigs(basepath, workspace, fixed_setup, extra=None):