Skip to content

fix: ensure unicode conversion -- again #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fstagni merged 2 commits into from
Mar 25, 2025
Merged

fix: ensure unicode conversion -- again #252

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb909fc
fix: ensure unicode conversion -- again
fstagni Mar 24, 2025
c28bedc
fix: use sys.version_info.major everywhere
fstagni Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions Pilot/pilotTools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ def sendMessage(url, pilotUUID, wnVO, method, rawMessage):
context.load_cert_chain(os.path.join(cert, "hostcert.pem"), os.path.join(cert, "hostkey.pem"))
raw_data = {"method": method, "args": message, "extraCredentials": '"hosts"'}

if sys.version_info[0] == 3:
if sys.version_info.major == 3:
data = urlencode(raw_data).encode("utf-8") # encode to bytes ! for python3
else:
# Python2
Expand Down Expand Up @@ -787,19 +787,17 @@ def executeAndGetOutput(self, cmd, environDict=None):
if not outChunk:
continue
dataWasRead = True
# Ensure outChunk is unicode in Python 2
if sys.version_info[0] < 3:
if sys.version_info.major == 2:
# Ensure outChunk is unicode in Python 2
if isinstance(outChunk, str):
outChunk = outChunk.decode("utf-8")
# Strip unicode replacement characters
outChunk = str(outChunk.replace("\ufffd", ""))

# Ensure correct type conversion in Python 2
if sys.version_info[0] < 3:
# Strip unicode replacement characters
# Ensure correct type conversion in Python 2
outChunk = str(outChunk.replace(u"\ufffd", ""))
# Avoid potential str() issues in Py2
outChunk = unicode(outChunk) # pylint: disable=undefined-variable
else:
outChunk = str(outChunk) # Python 3: Ensure it's a string
outChunk = str(outChunk.replace("\ufffd", "")) # Python 3: Ensure it's a string

if stream == _p.stderr:
sys.stderr.write(outChunk)
Expand Down