saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Do not drop buffering from kwargs to avoid errors

Browse source
This commit is contained in:
Pablo Suárez Hernández 2022-10-05 15:59:46 +01:00 • committed by Megan Wilhite
parent ef320e7835
commit d33366d9ae
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/utils/files.py
View file

@ -6,6 +6,7 @@ Functions for working with files
import codecs
import contextlib
import errno
import io
import logging
import os
import re
@ -383,9 +384,11 @@ def fopen(*args, **kwargs):
kwargs["newline"] = ""
# Workaround callers with bad buffering setting for binary files
if kwargs.get("buffering", -1) == 1 and 'b' in kwargs.get("mode", ""):
log.debug("Bad buffering specified for '%s'", args[0], stack_info=True)
del(kwargs["buffering"])
if kwargs.get("buffering") == 1 and "b" in kwargs.get("mode", ""):
log.debug(
"Line buffering (buffering=1) isn't supported in binary mode, the default buffer size will be used"
)
kwargs["buffering"] = io.DEFAULT_BUFFER_SIZE
f_handle = open(*args, **kwargs) # pylint: disable=resource-leakage