From 494f498d17bfd73d6524f45a10c75433f9328e0c Mon Sep 17 00:00:00 2001
From: Moon Sungjoon <sumoon@seoulsaram.org>
Date: Sun, 23 Jul 2023 11:30:27 +0900
Subject: [PATCH] Remove pipes module and use shlex instead

Thanks: https://github.com/tox-dev/tox/pull/2418/files

Closes #373
---
 dangerzone/gui/logic.py                    | 5 ++---
 dangerzone/isolation_provider/container.py | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dangerzone/gui/logic.py b/dangerzone/gui/logic.py
index 7dcbfe3..c1810b1 100644
--- a/dangerzone/gui/logic.py
+++ b/dangerzone/gui/logic.py
@@ -1,6 +1,5 @@
 import logging
 import os
-import pipes
 import platform
 import shlex
 import subprocess
@@ -68,7 +67,7 @@ class DangerzoneGui(DangerzoneCore):
             args = ["open", "-a", "Preview.app", filename]
 
             # Run
-            args_str = " ".join(pipes.quote(s) for s in args)
+            args_str = " ".join(shlex.quote(s) for s in args)
             log.info(Fore.YELLOW + "> " + Fore.CYAN + args_str)
             subprocess.run(args)
 
@@ -89,7 +88,7 @@ class DangerzoneGui(DangerzoneCore):
                     args[i] = filename
 
             # Open as a background process
-            args_str = " ".join(pipes.quote(s) for s in args)
+            args_str = " ".join(shlex.quote(s) for s in args)
             log.info(Fore.YELLOW + "> " + Fore.CYAN + args_str)
             subprocess.Popen(args)
 
diff --git a/dangerzone/isolation_provider/container.py b/dangerzone/isolation_provider/container.py
index 2873ef3..8d26e48 100644
--- a/dangerzone/isolation_provider/container.py
+++ b/dangerzone/isolation_provider/container.py
@@ -3,8 +3,8 @@ import json
 import logging
 import os
 import pathlib
-import pipes
 import platform
+import shlex
 import shutil
 import subprocess
 import tempfile
@@ -152,7 +152,7 @@ class Container(IsolationProvider):
         document: Document,
         args: List[str],
     ) -> int:
-        args_str = " ".join(pipes.quote(s) for s in args)
+        args_str = " ".join(shlex.quote(s) for s in args)
         log.info("> " + args_str)
 
         with subprocess.Popen(