Improve language.

This commit is contained in:
Felix Fontein
2024-12-28 14:30:49 +01:00
parent 04c97728dc
commit f69536ef3b
34 changed files with 89 additions and 89 deletions
+8 -8
View File
@@ -276,7 +276,7 @@ class APIClient(
return response.text
def _post_json(self, url, data, **kwargs):
# Go <1.1 can't unserialize null to a string
# Go <1.1 cannot unserialize null to a string
# so we do this disgusting thing here.
data2 = {}
if data is not None and isinstance(data, dict):
@@ -316,8 +316,8 @@ class APIClient(
# close TLS sockets.
sock._response = response
except AttributeError:
# UNIX sockets can't have attributes set on them, but that's
# fine because we won't be doing TLS over them
# UNIX sockets cannot have attributes set on them, but that's
# fine because we will not be doing TLS over them
pass
return sock
@@ -340,7 +340,7 @@ class APIClient(
data += reader.read(reader._fp.chunk_left)
yield data
else:
# Response isn't chunked, meaning we probably
# Response is not chunked, meaning we probably
# encountered an error immediately
yield self._result(response, json=decode)
@@ -419,7 +419,7 @@ class APIClient(
response.close()
def _disable_socket_timeout(self, socket):
""" Depending on the combination of python version and whether we're
""" Depending on the combination of python version and whether we are
connecting over http or https, we might need to access _sock, which
may or may not exist; or we may need to just settimeout on socket
itself, which also may or may not have settimeout on it. To avoid
@@ -440,7 +440,7 @@ class APIClient(
if hasattr(s, 'gettimeout'):
timeout = s.gettimeout()
# Don't change the timeout if it is already disabled.
# Do not change the timeout if it is already disabled.
if timeout is None or timeout == 0.0:
continue
@@ -456,7 +456,7 @@ class APIClient(
def _get_result_tty(self, stream, res, is_tty):
# We should also use raw streaming (without keep-alive)
# if we're dealing with a tty-enabled container.
# if we are dealing with a tty-enabled container.
if is_tty:
return self._stream_raw_result(res) if stream else \
self._result(res, binary=True)
@@ -506,7 +506,7 @@ class APIClient(
def _set_auth_headers(self, headers):
log.debug('Looking for auth config')
# If we don't have any auth data so far, try reloading the config
# If we do not have any auth data so far, try reloading the config
# file one more time in case anything showed up in there.
if not self._auth_configs or self._auth_configs.is_empty:
log.debug("No auth config in memory - loading from filesystem")
+2 -2
View File
@@ -72,7 +72,7 @@ class DaemonApiMixin(object):
If the server returns an error.
"""
# If we don't have any auth data so far, try reloading the config file
# If we do not have any auth data so far, try reloading the config file
# one more time in case anything showed up in there.
# If dockercfg_path is passed check to see if the config file exists,
# if so load that config.
@@ -107,7 +107,7 @@ class DaemonApiMixin(object):
def ping(self):
"""
Checks the server is responsive. An exception will be raised if it
isn't responding.
is not responding.
Returns:
(bool) The response from the server.
+2 -2
View File
@@ -170,7 +170,7 @@ class AuthConfig(dict):
with open(config_file) as f:
config_dict = json.load(f)
except (IOError, KeyError, ValueError) as e:
# Likely missing new Docker config file or it's in an
# Likely missing new Docker config file or it is in an
# unknown format, continue to attempt to read old location
# and format.
log.debug(e)
@@ -194,7 +194,7 @@ class AuthConfig(dict):
return cls(res, credstore_env)
log.debug(
"Couldn't find auth-related section ; attempting to interpret "
"Could not find auth-related section ; attempting to interpret "
"as auth-only file"
)
return cls({'auths': cls.parse_auth(config_dict)}, credstore_env)
+1 -1
View File
@@ -52,7 +52,7 @@ class APIError(_HTTPError, DockerException):
"""
def __init__(self, message, response=None, explanation=None):
# requests 1.2 supports response as a keyword argument, but
# requests 1.1 doesn't
# requests 1.1 does not
super(APIError, self).__init__(message)
self.response = response
self.explanation = explanation
@@ -106,7 +106,7 @@ class NpipeHTTPAdapter(BaseHTTPAdapter):
def request_url(self, request, proxies):
# The select_proxy utility in requests errors out when the provided URL
# doesn't have a hostname, like is the case when using a UNIX socket.
# does not have a hostname, like is the case when using a UNIX socket.
# Since proxies are an irrelevant notion in the case of UNIX sockets
# anyway, we simply return the path URL directly.
# See also: https://github.com/docker/docker-sdk-python/issues/811
@@ -107,7 +107,7 @@ class UnixHTTPAdapter(BaseHTTPAdapter):
def request_url(self, request, proxies):
# The select_proxy utility in requests errors out when the provided URL
# doesn't have a hostname, like is the case when using a UNIX socket.
# does not have a hostname, like is the case when using a UNIX socket.
# Since proxies are an irrelevant notion in the case of UNIX sockets
# anyway, we simply return the path URL directly.
# See also: https://github.com/docker/docker-py/issues/811
+1 -1
View File
@@ -67,7 +67,7 @@ class CancellableStream(object):
sock = sock_raw._sock
elif hasattr(sock_fp, 'channel'):
# We're working with a paramiko (SSH) channel, which doesn't
# We are working with a paramiko (SSH) channel, which does not
# support cancelable streams with the current implementation
raise DockerException(
'Cancellable streams not supported for the SSH protocol'
+4 -4
View File
@@ -100,7 +100,7 @@ def create_archive(root, files=None, fileobj=None, gzip=False,
i.mtime = int(i.mtime)
if IS_WINDOWS_PLATFORM:
# Windows doesn't keep track of the execute bit, so we make files
# Windows does not keep track of the execute bit, so we make files
# and directories executable by default.
i.mode = i.mode & 0o755 | 0o111
@@ -113,7 +113,7 @@ def create_archive(root, files=None, fileobj=None, gzip=False,
'Can not read file in context: {0}'.format(full_path)
)
else:
# Directories, FIFOs, symlinks... don't need to be read.
# Directories, FIFOs, symlinks... do not need to be read.
t.addfile(i, None)
for name, contents in extra_files:
@@ -210,10 +210,10 @@ class PatternMatcher(object):
continue
if match:
# If we want to skip this file and it's a directory
# If we want to skip this file and it is a directory
# then we should first check to see if there's an
# excludes pattern (e.g. !dir/file) that starts with this
# dir. If so then we can't skip this dir.
# dir. If so then we cannot skip this dir.
skip = True
for pat in self.patterns:
+1 -1
View File
@@ -70,7 +70,7 @@ def load_general_config(config_path=None):
with open(config_file) as f:
return json.load(f)
except (IOError, ValueError) as e:
# In the case of a legacy `.dockercfg` file, we won't
# In the case of a legacy `.dockercfg` file, we will not
# be able to load any JSON data.
log.debug(e)
+2 -2
View File
@@ -48,7 +48,7 @@ def fnmatch(name, pat):
An initial period in FILENAME is not special.
Both FILENAME and PATTERN are first case-normalized
if the operating system requires it.
If you don't want this, use fnmatchcase(FILENAME, PATTERN).
If you do not want this, use fnmatchcase(FILENAME, PATTERN).
"""
name = name.lower()
@@ -58,7 +58,7 @@ def fnmatch(name, pat):
def fnmatchcase(name, pat):
"""Test whether FILENAME matches PATTERN, including case.
This is a version of fnmatch() which doesn't case-normalize
This is a version of fnmatch() which does not case-normalize
its arguments.
"""
+2 -2
View File
@@ -64,7 +64,7 @@ def read(socket, n=4096):
len(e.args) > 0 and
e.args[0] == NPIPE_ENDED)
if is_pipe_ended:
# npipes don't support duplex sockets, so we interpret
# npipes do not support duplex sockets, so we interpret
# a PIPE_ENDED error as a close operation (0-length read).
return ''
raise
@@ -73,7 +73,7 @@ def read(socket, n=4096):
def read_exactly(socket, n):
"""
Reads exactly n bytes from socket
Raises SocketError if there isn't enough data
Raises SocketError if there is not enough data
"""
data = binary_type()
while len(data) < n:
+2 -2
View File
@@ -160,7 +160,7 @@ def convert_volume_binds(binds):
mode = 'rw'
# NOTE: this is only relevant for Linux hosts
# (doesn't apply in Docker Desktop)
# (does not apply in Docker Desktop)
propagation_modes = [
'rshared',
'shared',
@@ -391,7 +391,7 @@ def kwargs_from_env(ssl_version=None, assert_hostname=None, environment=None):
if not tls_verify and assert_hostname is None:
# assert_hostname is a subset of TLS verification,
# so if it's not set already then set it to false.
# so if it is not set already then set it to false.
assert_hostname = False
params['tls'] = TLSConfig(