patch.py: Use shlex instead of deprecated pipe
PATCH 1/1 patch.py: Use shlex instead of deprecated pipe
From: Ola x Nilsson <[email protected]>
The pipe library is deprecated in Python 3.11 and will be removed in Python 3.13. pipe.quote is just an import of shlex.quote anyway.
Clean up imports while we're at it.
Signed-off-by Ola x Nilsson <[email protected]>
Signed-off-by Luca Ceresoli <[email protected]>
---
This was already backported to dunfell in:
https://lists.openembedded.org/g/openembedded-core/message/189665
but it's missing in kirkstone.
With pipes removed in python-3.13 it's one of reasons why kirkstone doesn't parse with python-3.13 on host
meta/lib/oe/patch.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
meta/lib/oe/patch.py +5 -6
@@ -2,9 +2,11 @@ # SPDX-License-Identifier: GPL-2.0-only # +import os +import shlex +import subprocess import oe.path import oe.types -import subprocess class NotFoundError(bb.BBHandledException): def __init__(self, path):
@@ -25,8 +27,6 @@ class CmdError(bb.BBHandledException): def runcmd(args, dir = None): - import pipes - if dir: olddir = os.path.abspath(os.curdir) if not os.path.exists(dir):
@@ -35,7 +35,7 @@ def runcmd(args, dir = None): # print("cwd: %s -> %s" % (olddir, dir)) try: - args = [ pipes.quote(str(arg)) for arg in args ] + args = [ shlex.quote(str(arg)) for arg in args ] cmd = " ".join(args) # print("cmd: %s" % cmd) proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
@@ -215,7 +215,7 @@ class PatchTree(PatchSet): with open(self.seriespath, 'w') as f: for p in patches: f.write(p) - + def Import(self, patch, force = None): """""" PatchSet.Import(self, patch, force)
@@ -919,4 +919,3 @@ def should_apply(parm, d): return False, "applies to later version" return True, None -
Signature · 1 line
2.47.0