Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-30 13:11:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-38883: Don't use POSIX $HOME in pathlib.Path.home/expanduser on Windows (GH-17961)

Browse source 
In bpo-36264 os.path.expanduser was changed to ignore HOME on Windows.

Path.expanduser/home still honored HOME despite being documented as behaving the same
as os.path.expanduser. This makes them also ignore HOME so that both implementations
behave the same way again.
This commit is contained in:
Christoph Reiter 2020-01-28 10:41:50 +01:00 • committed by Steve Dower
parent 61f4db8c56
commit c45a2aa9e2
3 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/pathlib.py
View file

@ -253,9 +253,7 @@ def make_uri(self, path):
return 'file:' + urlquote_from_bytes(path.as_posix().encode('utf-8')) return 'file:' + urlquote_from_bytes(path.as_posix().encode('utf-8'))
def gethomedir(self, username): def gethomedir(self, username):
if 'HOME' in os.environ: if 'USERPROFILE' in os.environ:
userhome = os.environ['HOME']
elif 'USERPROFILE' in os.environ:
userhome = os.environ['USERPROFILE'] userhome = os.environ['USERPROFILE']
elif 'HOMEPATH' in os.environ: elif 'HOMEPATH' in os.environ:
try: try:

22
Lib/test/test_pathlib.py
View file

@ -1383,8 +1383,16 @@ def _test_home(self, p):
self.assertTrue(p.is_absolute()) self.assertTrue(p.is_absolute())
def test_home(self): def test_home(self):
p = self.cls.home() with support.EnvironmentVarGuard() as env:
self._test_home(p) self._test_home(self.cls.home())
env.clear()
env['USERPROFILE'] = os.path.join(BASE, 'userprofile')
self._test_home(self.cls.home())
# bpo-38883: ignore `HOME` when set on windows
env['HOME'] = os.path.join(BASE, 'home')
self._test_home(self.cls.home())
def test_samefile(self): def test_samefile(self):
fileA_path = os.path.join(BASE, 'fileA') fileA_path = os.path.join(BASE, 'fileA')
@ -2448,12 +2456,6 @@ def check():
self.assertEqual(p5.expanduser(), p5) self.assertEqual(p5.expanduser(), p5)
self.assertEqual(p6.expanduser(), p6) self.assertEqual(p6.expanduser(), p6)
# Test the first lookup key in the env vars.
env['HOME'] = 'C:\\Users\\alice'
check()
# Test that HOMEPATH is available instead.
env.pop('HOME', None)
env['HOMEPATH'] = 'C:\\Users\\alice' env['HOMEPATH'] = 'C:\\Users\\alice'
check() check()
@ -2466,6 +2468,10 @@ def check():
env['USERPROFILE'] = 'C:\\Users\\alice' env['USERPROFILE'] = 'C:\\Users\\alice'
check() check()
# bpo-38883: ignore `HOME` when set on windows
env['HOME'] = 'C:\\Users\\eve'
check()
class CompatiblePathTest(unittest.TestCase): class CompatiblePathTest(unittest.TestCase):
""" """

5
Misc/NEWS.d/next/Windows/2020-01-11-22-53-55.bpo-38883.X7FRaN.rst Normal file
View file

@ -0,0 +1,5 @@
:meth:`~pathlib.Path.home()` and :meth:`~pathlib.Path.expanduser()` on Windows
now prefer :envvar:`USERPROFILE` and no longer use :envvar:`HOME`, which is not
normally set for regular user accounts. This makes them again behave like
:func:`os.path.expanduser`, which was changed to ignore :envvar:`HOME` in 3.8,
see :issue:`36264`.