From 75dabfe7a8324a16687959cc401deb72b104a575 Mon Sep 17 00:00:00 2001 From: pxinwr Date: Fri, 18 Dec 2020 03:22:29 +0800 Subject: bpo-31904: posixpath.expanduser() handles None user home on VxWorks (GH-23530) --- Lib/posixpath.py | 3 +++ Misc/NEWS.d/next/Library/2020-11-27-18-09-59.bpo-31904.g8k43d.rst | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2020-11-27-18-09-59.bpo-31904.g8k43d.rst diff --git a/Lib/posixpath.py b/Lib/posixpath.py index ecb4e5a..62afbd0 100644 --- a/Lib/posixpath.py +++ b/Lib/posixpath.py @@ -262,6 +262,9 @@ def expanduser(path): # password database, return the path unchanged return path userhome = pwent.pw_dir + # if no user home, return the path unchanged on VxWorks + if userhome is None and sys.platform == "vxworks": + return path if isinstance(path, bytes): userhome = os.fsencode(userhome) root = b'/' diff --git a/Misc/NEWS.d/next/Library/2020-11-27-18-09-59.bpo-31904.g8k43d.rst b/Misc/NEWS.d/next/Library/2020-11-27-18-09-59.bpo-31904.g8k43d.rst new file mode 100644 index 0000000..5a687d1 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-11-27-18-09-59.bpo-31904.g8k43d.rst @@ -0,0 +1,2 @@ +:func:`posixpath.expanduser` returns the input *path* unchanged if +user home directory is None on VxWorks. -- cgit v0.12