From 5c09dcdb981df7837ac1bb75547d23fc7d8946d0 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Thu, 11 Jun 2020 14:24:29 +0200 Subject: [PATCH] Grammar: whitespace is a word Signed-off-by: Christian Heimes Reviewed-By: Alexander Bokovoy Reviewed-By: Rob Crittenden --- ipalib/util.py | 2 +- ipapython/directivesetter.py | 4 ++-- ipaserver/install/server/install.py | 2 +- ipaserver/p11helper.py | 2 +- ipatests/test_integration/test_nfs.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ipalib/util.py b/ipalib/util.py index e0c658c51..803c18972 100644 --- a/ipalib/util.py +++ b/ipalib/util.py @@ -151,7 +151,7 @@ def isvalid_base64(data): The character set must only include of a-z, A-Z, 0-9, + or / and be padded with = to be a length divisible by 4 (so only 0-2 =s are - allowed). Its length must be divisible by 4. White space is + allowed). Its length must be divisible by 4. Whitespace is not significant so it is removed. This doesn't guarantee we have a base64-encoded value, just that it diff --git a/ipapython/directivesetter.py b/ipapython/directivesetter.py index b03c580ee..f4e496c7f 100644 --- a/ipapython/directivesetter.py +++ b/ipapython/directivesetter.py @@ -138,7 +138,7 @@ def set_directive_lines(quotes, separator, k, v, lines, comment): v_quoted = quote_directive_value(v, '"') if quotes else v new_line = ''.join([k, separator, v_quoted, '\n']) - # Special case: consider space as "white space" so tabs are allowed + # Special case: consider space as "whitespace" so tabs are allowed if separator == ' ': separator = '[ \t]+' @@ -178,7 +178,7 @@ def get_directive(filename, directive, separator=' '): :returns: The (unquoted) value if the directive was found, None otherwise """ - # Special case: consider space as "white space" so tabs are allowed + # Special case: consider space as "whitespace" so tabs are allowed if separator == ' ': separator = '[ \t]+' diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index b53c58e2a..d6513c53c 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -80,7 +80,7 @@ def validate_dm_password(password): # Actual behavior of setup-ds.pl is that it does not accept white # space characters in password when called interactively but does when # provided such password in INF file. But it ignores leading and trailing - # white spaces in INF file. + # whitespaces in INF file. # Disallow leading/trailing whaitespaces if password.strip() != password: diff --git a/ipaserver/p11helper.py b/ipaserver/p11helper.py index bf629ee5e..b1e6021d8 100644 --- a/ipaserver/p11helper.py +++ b/ipaserver/p11helper.py @@ -913,7 +913,7 @@ class P11_Helper: check_return_value(rv, 'get token info') # softhsm always returns label 32 bytes long with padding made of - # white spaces (#32), so we have to rstrip() padding and compare + # whitespaces (#32), so we have to rstrip() padding and compare # Label was created by softhsm-util so it is not our fault that # there are #32 as padding (cffi initializes structures with # zeroes) diff --git a/ipatests/test_integration/test_nfs.py b/ipatests/test_integration/test_nfs.py index 532dd61af..8c622de2b 100644 --- a/ipatests/test_integration/test_nfs.py +++ b/ipatests/test_integration/test_nfs.py @@ -294,7 +294,7 @@ class TestIpaClientAutomountFileRestore(IntegrationTest): ): # In order to get a more pure sum, one that ignores the Generated - # header and any white space we have to do a bit of work... + # header and any whitespace we have to do a bit of work... sha256nsswitch_cmd = \ 'egrep -v "Generated|^$" /etc/nsswitch.conf | sed "s/\\s//g" ' \ '| sort | sha256sum'