[PATCH 3/6] moveconfig: Drop check for old Python

Simon Glass sjg at chromium.org
Sat Dec 18 22:54:32 CET 2021


Python 2 is not supported anymore and Python 3 has had subprocess.DEVNULL
since version 3.3 which was released in 2012. Drop the unnecessary check.

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

 tools/moveconfig.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index 521297f7d58..0b33f3190e3 100755
--- a/tools/moveconfig.py
+++ b/tools/moveconfig.py
@@ -91,14 +91,6 @@ SIZES = {
 }
 
 ### helper functions ###
-def get_devnull():
-    """Get the file object of '/dev/null' device."""
-    try:
-        devnull = subprocess.DEVNULL # py3k
-    except AttributeError:
-        devnull = open(os.devnull, 'wb')
-    return devnull
-
 def check_top_directory():
     """Exit if we are not at the top of source directory."""
     for f in ('README', 'Licenses'):
@@ -1083,7 +1075,7 @@ class Slots:
         """
         self.args = args
         self.slots = []
-        devnull = get_devnull()
+        devnull = subprocess.DEVNULL
         make_cmd = get_make_cmd()
         for i in range(args.jobs):
             self.slots.append(Slot(toolchains, configs, args, progress,
-- 
2.34.1.173.g76aa8bc2d0-goog



More information about the U-Boot mailing list