Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/71678?usp=email )
Change subject: python: Remove Python 'pipes' module
......................................................................
python: Remove Python 'pipes' module
This is scheduled for removal from Python in 3.13:
https://docs.python.org/3/library/pipes.html.
The 'shlex.quote' function can replace the 'pipes.quote' function used
in "main.py". A special wrapper has been made to account for the Windows
case which 'shlex.quote' doesn't handle.
Change-Id: I9c84605f0ccd8468b9cab6cece6248ef8c2107f0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71678
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
---
M src/python/m5/main.py
1 file changed, 16 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index 4701dfa..ddcb024 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -496,10 +496,23 @@
% (socket.gethostname(), os.getpid())
)
- # in Python 3 pipes.quote() is moved to shlex.quote()
- import pipes
+ def quote(arg: str) -> str:
+ """Quotes a string for printing in a shell. In addition to
Unix,
+ this is designed to handle the problematic Windows cases where
+ 'shlex.quote' doesn't work"""
- print("command line:", " ".join(map(pipes.quote, sys.argv)))
+ if os.name == "nt" and os.sep == "\\":
+ # If a Windows machine, we manually quote the string.
+ arg = arg.replace('"', '\\"')
+ if re.search("\s", args):
+ # We quote args which have whitespace.
+ arg = '"' + arg + '"'
+ return arg
+ import shlex
+
+ return shlex.quote(arg)
+
+ print("command line:", " ".join(map(quote, sys.argv)))
print()
# check to make sure we can find the listed script
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/71678?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v23-0
Gerrit-Change-Id: I9c84605f0ccd8468b9cab6cece6248ef8c2107f0
Gerrit-Change-Number: 71678
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: kokoro <noreply+kok...@google.com>
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
