diff --git a/src/rez/tests/test_shells.py b/src/rez/tests/test_shells.py index cf31219292..90d6c3068c 100644 --- a/src/rez/tests/test_shells.py +++ b/src/rez/tests/test_shells.py @@ -223,7 +223,7 @@ def _execute_code(func, expected_output): out, _ = p.communicate() self.assertEqual(p.returncode, 0) - # Powershell and Unix uses \n + # PowerShell and Unix uses \n sh = create_shell() output = out.strip().split(sh.line_terminator()) diff --git a/src/rez/util.py b/src/rez/util.py index bdc2df51f3..e2361d3053 100644 --- a/src/rez/util.py +++ b/src/rez/util.py @@ -86,7 +86,7 @@ def create_executable_script(filepath, body, program=None, py_script_mode=None): # default python, or in case of later python versions 'py' that should # try to use sensible python interpreters depending on the shebang line. # Compare PEP-397. - # In order to execution to work from windows we need to create a .py + # In order for execution to work in windows we need to create a .py # file and set the PATHEXT to include .py (as done by the shell plugins) # So depending on the py_script_mode we might need to create more then # one script diff --git a/src/rezplugins/shell/powershell_common/powershell_base.py b/src/rezplugins/shell/powershell_common/powershell_base.py index a54b5a83fd..0e22b952ba 100644 --- a/src/rezplugins/shell/powershell_common/powershell_base.py +++ b/src/rezplugins/shell/powershell_common/powershell_base.py @@ -12,7 +12,7 @@ class PowerShellBase(Shell): """ - Abstract base class for Powershell-like shells. + Abstract base class for PowerShell-like shells. """ expand_env_vars = True @@ -20,7 +20,7 @@ class PowerShellBase(Shell): _executable = None # Make sure that the $Env:VAR formats come before the $VAR formats since - # Powershell Environment variables are ambiguous with Unix paths. + # PowerShell Environment variables are ambiguous with Unix paths. ENV_VAR_REGEX = re.compile( "|".join([ "\\$[Ee][Nn][Vv]:([a-zA-Z_]+[a-zA-Z0-9_]*?)", # $Env:ENVVAR diff --git a/src/rezplugins/shell/pwsh.py b/src/rezplugins/shell/pwsh.py index 952210cff7..600ea3dd6f 100644 --- a/src/rezplugins/shell/pwsh.py +++ b/src/rezplugins/shell/pwsh.py @@ -28,7 +28,7 @@ def get_syspaths(cls): else: # TODO: Newer versions of pwsh will parse .profile via sh [1], so # we could use a similar technique as SH itself. For now, to - # support older pwsh version we depend on SH on unix like platforms + # support older pwsh version we depend on SH on Unix-like platforms # directly. # [1] https://github.com/PowerShell/PowerShell/pull/10050 from rezplugins.shell.sh import SH