From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 17 Apr 2024 09:53:40 +0000 (+0300)
Subject: gh-117503: Fix support of non-ASCII user names in posixpath.expanduser() (GH-117504)
X-Git-Tag: v3.13.0b1~385
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51132da0c4dac13500d9bb86b2fdad42091d3fd9;p=thirdparty%2FPython%2Fcpython.git

gh-117503: Fix support of non-ASCII user names in posixpath.expanduser() (GH-117504)

They are now supported in bytes paths as well as in string paths.
---

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index dd29fbb1614a..11cbaca53edb 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -262,7 +262,7 @@ def expanduser(path):
             return path
         name = path[1:i]
         if isinstance(name, bytes):
-            name = name.decode('ascii')
+            name = os.fsdecode(name)
         try:
             pwent = pwd.getpwnam(name)
         except KeyError:
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 7c122e6204b1..604af5bafa7f 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -344,6 +344,17 @@ class PosixPathTest(unittest.TestCase):
                 for path in ('~', '~/.local', '~vstinner/'):
                     self.assertEqual(posixpath.expanduser(path), path)
 
+    @unittest.skipIf(sys.platform == "vxworks",
+                     "no home directory on VxWorks")
+    def test_expanduser_pwd2(self):
+        pwd = import_helper.import_module('pwd')
+        for e in pwd.getpwall():
+            name = e.pw_name
+            home = e.pw_dir
+            self.assertEqual(posixpath.expanduser('~' + name), home)
+            self.assertEqual(posixpath.expanduser(os.fsencode('~' + name)),
+                             os.fsencode(home))
+
     NORMPATH_CASES = [
         ("", "."),
         ("/", "/"),
diff --git a/Misc/NEWS.d/next/Library/2024-04-03-15-04-23.gh-issue-117503.NMfwup.rst b/Misc/NEWS.d/next/Library/2024-04-03-15-04-23.gh-issue-117503.NMfwup.rst
new file mode 100644
index 000000000000..f0ea513ac9d4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-04-03-15-04-23.gh-issue-117503.NMfwup.rst
@@ -0,0 +1,2 @@
+Fix support of non-ASCII user names in bytes paths in
+:func:`os.path.expanduser` on Posix.