Skip to content

gh-117201: Handle leading // for posixpath.commonpath #117202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nineteendo wants to merge 14 commits into from
Closed

gh-117201: Handle leading // for posixpath.commonpath #117202

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
247c9af
Handle leading `//` for `posixpath.commonpath`
nineteendo Mar 24, 2024
0c38276
raise TypeError for non-sequences
nineteendo Mar 24, 2024
a9b0832
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 26, 2024
a521282
Remove `break` & `else`
nineteendo Mar 26, 2024
b467e7e
Merge branch 'fix-commonpath' of https://github.com/nineteendo/cpytho…
nineteendo Mar 26, 2024
26eac21
Handle errors for iterable
nineteendo Mar 26, 2024
d83743d
Remove redundant check
nineteendo Mar 27, 2024
1ae0c43
raise TypeError for non-sequences
nineteendo Mar 28, 2024
e6de234
Update NEWS.d
nineteendo Mar 28, 2024
012c12e
Add newline
nineteendo Mar 28, 2024
fb1c91a
Speed up `posixpath.ismount`
nineteendo Mar 28, 2024
ca90fde
unnest `posixpath.expanduser`
nineteendo Mar 28, 2024
758e0d6
Speed up `posixpath.expanduser` & `posixpath.normpath`
nineteendo Mar 28, 2024
218e43e
Move refactoring to new branch
nineteendo Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
unnest posixpath.expanduser
  • Loading branch information
@nineteendo
nineteendo committed Mar 28, 2024
commit ca90fde42531efb86ab035ecafd0c0d54ff8cef0
34 changes: 17 additions & 17 deletions Lib/posixpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,37 +255,37 @@ def expanduser(path):
i = path.find(sep, 1)
if i < 0:
i = len(path)
if i == 1:
if 'HOME' not in os.environ:
try:
import pwd
except ImportError:
# pwd module unavailable, return path unchanged
return path
try:
userhome = pwd.getpwuid(os.getuid()).pw_dir
except KeyError:
# bpo-10496: if the current user identifier doesn't exist in the
# password database, return the path unchanged
return path
else:
userhome = os.environ['HOME']
else:
if i != 1:
try:
import pwd
except ImportError:
# pwd module unavailable, return path unchanged
return path
name = path[1:i]
if isinstance(name, bytes):
name = str(name, 'ASCII')
name = name.decode('ascii')
try:
pwent = pwd.getpwnam(name)
except KeyError:
# bpo-10496: if the user name from the path doesn't exist in the
# password database, return the path unchanged
return path
userhome = pwent.pw_dir
elif 'HOME' in os.environ:
userhome = os.environ['HOME']
else:
try:
import pwd
except ImportError:
# pwd module unavailable, return path unchanged
return path
try:
userhome = pwd.getpwuid(os.getuid()).pw_dir
except KeyError:
# bpo-10496: if the current user identifier doesn't exist in the
# password database, return the path unchanged
return path

# if no user home, return the path unchanged on VxWorks
if userhome is None and sys.platform == "vxworks":
return path
Expand Down