summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-04-17 15:44:06 (GMT)
committerGitHub <noreply@github.com>2019-04-17 15:44:06 (GMT)
commit197f0447e3bcfa4f529fedab09966d7e3d283979 (patch)
tree8a8aa6dd1696d86512f7f438796c986c6224ef2c
parent693c104ae74feea11f0b51176dc91ecd153230c0 (diff)
downloadcpython-197f0447e3bcfa4f529fedab09966d7e3d283979.zip
cpython-197f0447e3bcfa4f529fedab09966d7e3d283979.tar.gz
cpython-197f0447e3bcfa4f529fedab09966d7e3d283979.tar.bz2
bpo-35755: Don't say "to mimick Unix which command behavior" (GH-12861)
-rw-r--r--Lib/distutils/spawn.py2
-rw-r--r--Lib/shutil.py2
-rw-r--r--Misc/NEWS.d/next/Library/2019-04-16-17-50-39.bpo-35755.Fg4EXb.rst3
3 files changed, 3 insertions, 4 deletions
diff --git a/Lib/distutils/spawn.py b/Lib/distutils/spawn.py
index 8883272..d3a12c2 100644
--- a/Lib/distutils/spawn.py
+++ b/Lib/distutils/spawn.py
@@ -188,7 +188,7 @@ def find_executable(executable, path=None):
# os.confstr() or CS_PATH is not available
path = os.defpath
# bpo-35755: Don't use os.defpath if the PATH environment variable is
- # set to an empty string to mimick Unix which command behavior
+ # set to an empty string
# PATH='' doesn't match, whereas PATH=':' looks in the current directory
if not path:
diff --git a/Lib/shutil.py b/Lib/shutil.py
index 34df9cc..6cfe373 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -1317,7 +1317,7 @@ def which(cmd, mode=os.F_OK | os.X_OK, path=None):
# os.confstr() or CS_PATH is not available
path = os.defpath
# bpo-35755: Don't use os.defpath if the PATH environment variable is
- # set to an empty string to mimick Unix which command behavior
+ # set to an empty string
# PATH='' doesn't match, whereas PATH=':' looks in the current directory
if not path:
diff --git a/Misc/NEWS.d/next/Library/2019-04-16-17-50-39.bpo-35755.Fg4EXb.rst b/Misc/NEWS.d/next/Library/2019-04-16-17-50-39.bpo-35755.Fg4EXb.rst
index 8e92ffd..d84f63b 100644
--- a/Misc/NEWS.d/next/Library/2019-04-16-17-50-39.bpo-35755.Fg4EXb.rst
+++ b/Misc/NEWS.d/next/Library/2019-04-16-17-50-39.bpo-35755.Fg4EXb.rst
@@ -2,5 +2,4 @@
``os.confstr("CS_PATH")`` if available instead of :data:`os.defpath`, if the
``PATH`` environment variable is not set. Moreover, don't use
``os.confstr("CS_PATH")`` nor :data:`os.defpath` if the ``PATH`` environment
-variable is set to an empty string to mimick Unix ``which`` command
-behavior.
+variable is set to an empty string.