[Python-checkins] bpo-36264: Don't honor POSIX HOME in os.path.expanduser on Windows (GH-12282)
Steve Dower
webhook-mailer at python.org
Tue Mar 12 11:40:22 EDT 2019
https://github.com/python/cpython/commit/25ec4a45dcc36c8087f93bd1634b311613244fc6
commit: 25ec4a45dcc36c8087f93bd1634b311613244fc6
branch: master
author: Anthony Sottile <asottile at umich.edu>
committer: Steve Dower <steve.dower at microsoft.com>
date: 2019-03-12T08:39:57-07:00
summary:
bpo-36264: Don't honor POSIX HOME in os.path.expanduser on Windows (GH-12282)
files:
A Misc/NEWS.d/next/Windows/2019-03-11-09-33-47.bpo-36264.rTzWce.rst
M Lib/distutils/tests/test_config.py
M Lib/distutils/tests/test_dist.py
M Lib/ntpath.py
M Lib/test/test_netrc.py
M Lib/test/test_ntpath.py
diff --git a/Lib/distutils/tests/test_config.py b/Lib/distutils/tests/test_config.py
index 77ef788e2472..344084afb779 100644
--- a/Lib/distutils/tests/test_config.py
+++ b/Lib/distutils/tests/test_config.py
@@ -60,6 +60,7 @@ def setUp(self):
super(BasePyPIRCCommandTestCase, self).setUp()
self.tmp_dir = self.mkdtemp()
os.environ['HOME'] = self.tmp_dir
+ os.environ['USERPROFILE'] = self.tmp_dir
self.rc = os.path.join(self.tmp_dir, '.pypirc')
self.dist = Distribution()
diff --git a/Lib/distutils/tests/test_dist.py b/Lib/distutils/tests/test_dist.py
index 0a19f0fb6274..cc34725a99ef 100644
--- a/Lib/distutils/tests/test_dist.py
+++ b/Lib/distutils/tests/test_dist.py
@@ -463,7 +463,7 @@ def test_custom_pydistutils(self):
# win32-style
if sys.platform == 'win32':
# home drive should be found
- os.environ['HOME'] = temp_dir
+ os.environ['USERPROFILE'] = temp_dir
files = dist.find_config_files()
self.assertIn(user_filename, files,
'%r not found in %r' % (user_filename, files))
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 11bb297e16bf..b5e1d121fc57 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -299,9 +299,7 @@ def expanduser(path):
while i < n and path[i] not in _get_bothseps(path):
i += 1
- if 'HOME' in os.environ:
- userhome = os.environ['HOME']
- elif 'USERPROFILE' in os.environ:
+ if 'USERPROFILE' in os.environ:
userhome = os.environ['USERPROFILE']
elif not 'HOMEPATH' in os.environ:
return path
diff --git a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py
index ae53988c45a6..7ce7e565704f 100644
--- a/Lib/test/test_netrc.py
+++ b/Lib/test/test_netrc.py
@@ -154,6 +154,7 @@ def fake_expanduser(s):
called.append(s)
with support.EnvironmentVarGuard() as environ:
environ.set('HOME', fake_home)
+ environ.set('USERPROFILE', fake_home)
result = orig_expanduser(s)
return result
diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
index 223e50f12c6d..fc2398c2d518 100644
--- a/Lib/test/test_ntpath.py
+++ b/Lib/test/test_ntpath.py
@@ -262,20 +262,21 @@ def test_expanduser(self):
env['USERPROFILE'] = 'C:\\eric\\idle'
tester('ntpath.expanduser("~test")', 'C:\\eric\\test')
tester('ntpath.expanduser("~")', 'C:\\eric\\idle')
-
- env.clear()
- env['HOME'] = 'C:\\idle\\eric'
- tester('ntpath.expanduser("~test")', 'C:\\idle\\test')
- tester('ntpath.expanduser("~")', 'C:\\idle\\eric')
-
tester('ntpath.expanduser("~test\\foo\\bar")',
- 'C:\\idle\\test\\foo\\bar')
+ 'C:\\eric\\test\\foo\\bar')
tester('ntpath.expanduser("~test/foo/bar")',
- 'C:\\idle\\test/foo/bar')
+ 'C:\\eric\\test/foo/bar')
tester('ntpath.expanduser("~\\foo\\bar")',
- 'C:\\idle\\eric\\foo\\bar')
+ 'C:\\eric\\idle\\foo\\bar')
tester('ntpath.expanduser("~/foo/bar")',
- 'C:\\idle\\eric/foo/bar')
+ 'C:\\eric\\idle/foo/bar')
+
+ # bpo-36264: ignore `HOME` when set on windows
+ env.clear()
+ env['HOME'] = 'F:\\'
+ env['USERPROFILE'] = 'C:\\eric\\idle'
+ tester('ntpath.expanduser("~test")', 'C:\\eric\\test')
+ tester('ntpath.expanduser("~")', 'C:\\eric\\idle')
@unittest.skipUnless(nt, "abspath requires 'nt' module")
def test_abspath(self):
diff --git a/Misc/NEWS.d/next/Windows/2019-03-11-09-33-47.bpo-36264.rTzWce.rst b/Misc/NEWS.d/next/Windows/2019-03-11-09-33-47.bpo-36264.rTzWce.rst
new file mode 100644
index 000000000000..aae598658116
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2019-03-11-09-33-47.bpo-36264.rTzWce.rst
@@ -0,0 +1,2 @@
+Don't honor POSIX ``HOME`` in ``os.path.expanduser`` on windows. Patch by
+Anthony Sottile.
More information about the Python-checkins
mailing list