mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-08 21:17:20 +00:00
[PR #11112/f5c2c8b9 backport][stable-12] replace redundant to_native()/to_text() occurrences, batch 7 (#11142)
replace redundant to_native()/to_text() occurrences, batch 7 (#11112)
* replace redundant to_native()/to_text() occurrences, batch 7
* add changelog frag
* made changes per review
(cherry picked from commit f5c2c8b9a2)
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
parent
f1d9a2b134
commit
04fb53e8a3
15 changed files with 41 additions and 38 deletions
|
|
@ -185,7 +185,7 @@ class RedfishUtils:
|
|||
timeout=timeout,
|
||||
)
|
||||
try:
|
||||
data = json.loads(to_native(resp.read()))
|
||||
data = json.loads(resp.read())
|
||||
except Exception:
|
||||
# No response data; this is okay in certain cases
|
||||
data = None
|
||||
|
|
@ -232,7 +232,7 @@ class RedfishUtils:
|
|||
force_basic_auth=basic_auth,
|
||||
)
|
||||
try:
|
||||
data = json.loads(to_native(resp.read()))
|
||||
data = json.loads(resp.read())
|
||||
except Exception:
|
||||
# No response data; this is okay in many cases
|
||||
data = None
|
||||
|
|
@ -407,7 +407,7 @@ class RedfishUtils:
|
|||
if "filename" in fields[form]:
|
||||
name = os.path.basename(fields[form]["filename"]).replace('"', '\\"')
|
||||
write_buffer(
|
||||
body, f'Content-Disposition: form-data; name="{to_text(form)}"; filename="{to_text(name)}"'
|
||||
body, f'Content-Disposition: form-data; name="{to_text(form)}"; filename="{to_native(name)}"'
|
||||
)
|
||||
else:
|
||||
write_buffer(body, f'Content-Disposition: form-data; name="{form}"')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue