From 58deee735436b5bf627afd8593c49d18cb8c8f73 Mon Sep 17 00:00:00 2001
From: Jake Hunsaker <jacob.r.hunsaker@gmail.com>
Date: Mon, 15 Apr 2024 18:33:45 -0400
Subject: [global] Update use of pipes with shlex

`pipes` is deprecated and being removed from Python in 3.13. Our usage
is exclusively `pipes.quote()`, which has actually been calling
`shlex.quote()` behind the scenes for some time (at least since 3.6).

Update our usage of `quote` to directly import from `shlex`.

Resolves: #3310

Signed-off-by: Jake Hunsaker <jacob.r.hunsaker@gmail.com>
---
 sos/collector/__init__.py            | 2 +-
 sos/collector/clusters/kubernetes.py | 2 +-
 sos/collector/clusters/ocp.py        | 2 +-
 sos/collector/clusters/ovirt.py      | 2 +-
 sos/collector/clusters/satellite.py  | 2 +-
 sos/collector/sosnode.py             | 2 +-
 sos/collector/transports/__init__.py | 2 +-
 sos/policies/runtimes/__init__.py    | 2 +-
 sos/policies/runtimes/crio.py        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sos/collector/__init__.py b/sos/collector/__init__.py
index b3ef6aea..023389d1 100644
--- a/sos/collector/__init__.py
+++ b/sos/collector/__init__.py
@@ -23,7 +23,7 @@ from datetime import datetime
 from concurrent.futures import ThreadPoolExecutor
 from getpass import getpass
 from pathlib import Path
-from pipes import quote
+from shlex import quote
 from textwrap import fill
 from sos.cleaner import SoSCleaner
 from sos.collector.sosnode import SosNode
diff --git a/sos/collector/clusters/kubernetes.py b/sos/collector/clusters/kubernetes.py
index 04752977..0108f974 100644
--- a/sos/collector/clusters/kubernetes.py
+++ b/sos/collector/clusters/kubernetes.py
@@ -8,7 +8,7 @@
 #
 # See the LICENSE file in the source distribution for further information.
 
-from pipes import quote
+from shlex import quote
 from sos.collector.clusters import Cluster
 
 
diff --git a/sos/collector/clusters/ocp.py b/sos/collector/clusters/ocp.py
index e0db93d3..020443ef 100644
--- a/sos/collector/clusters/ocp.py
+++ b/sos/collector/clusters/ocp.py
@@ -10,7 +10,7 @@
 
 import os
 
-from pipes import quote
+from shlex import quote
 from sos.collector.clusters import Cluster
 from sos.utilities import is_executable
 
diff --git a/sos/collector/clusters/ovirt.py b/sos/collector/clusters/ovirt.py
index 68ef8077..20e79f7d 100644
--- a/sos/collector/clusters/ovirt.py
+++ b/sos/collector/clusters/ovirt.py
@@ -10,7 +10,7 @@
 
 import fnmatch
 
-from pipes import quote
+from shlex import quote
 from sos.collector.clusters import Cluster
 
 ENGINE_KEY = '/etc/pki/ovirt-engine/keys/engine_id_rsa'
diff --git a/sos/collector/clusters/satellite.py b/sos/collector/clusters/satellite.py
index 5e28531d..465c1f4e 100644
--- a/sos/collector/clusters/satellite.py
+++ b/sos/collector/clusters/satellite.py
@@ -8,7 +8,7 @@
 #
 # See the LICENSE file in the source distribution for further information.
 
-from pipes import quote
+from shlex import quote
 from sos.collector.clusters import Cluster
 
 
diff --git a/sos/collector/sosnode.py b/sos/collector/sosnode.py
index f315c58a..bc8a468f 100644
--- a/sos/collector/sosnode.py
+++ b/sos/collector/sosnode.py
@@ -14,7 +14,7 @@ import logging
 import os
 import re
 
-from pipes import quote
+from shlex import quote
 from sos.policies import load
 from sos.policies.init_systems import InitSystem
 from sos.collector.transports.juju import JujuSSH
diff --git a/sos/collector/transports/__init__.py b/sos/collector/transports/__init__.py
index cce6f17f..dbabee4b 100644
--- a/sos/collector/transports/__init__.py
+++ b/sos/collector/transports/__init__.py
@@ -13,7 +13,7 @@ import logging
 import pexpect
 import re
 
-from pipes import quote
+from shlex import quote
 from sos.collector.exceptions import (ConnectionException,
                                       CommandTimeoutException)
 from sos.utilities import bold
diff --git a/sos/policies/runtimes/__init__.py b/sos/policies/runtimes/__init__.py
index d2837349..20492e20 100644
--- a/sos/policies/runtimes/__init__.py
+++ b/sos/policies/runtimes/__init__.py
@@ -10,7 +10,7 @@
 
 import re
 
-from pipes import quote
+from shlex import quote
 from sos.utilities import sos_get_command_output, is_executable
 
 
diff --git a/sos/policies/runtimes/crio.py b/sos/policies/runtimes/crio.py
index 4cae1ecc..c586866b 100644
--- a/sos/policies/runtimes/crio.py
+++ b/sos/policies/runtimes/crio.py
@@ -11,7 +11,7 @@ import json
 
 from sos.policies.runtimes import ContainerRuntime
 from sos.utilities import sos_get_command_output
-from pipes import quote
+from shlex import quote
 
 
 class CrioContainerRuntime(ContainerRuntime):
-- 
cgit