FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-39899: Make pathlib use `os.path.expanduser()` to expand home directories by barneygale · Pull Request #18841 · python/cpython · GitHub

/ cpython Public

bpo-39899: Make pathlib use os.path.expanduser() to expand home directories - #18841

Merged
zooba merged 1 commit into
python:masterfrom
barneygale:bpo-39899-pathlib-expanduser-reimpl
Apr 7, 2021
ConversationCommits (1)ChecksFiles changed
Merged

bpo-39899: Make pathlib use os.path.expanduser() to expand home directories#18841
zooba merged 1 commit into
python:masterfrom
barneygale:bpo-39899-pathlib-expanduser-reimpl

Conversation

barneygale commented Mar 8, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

os.path.expanduser(): don't guess other Windows users' home directories if the basename of the current user's home directory doesn't match their username.

This makes ntpath.expanduser() match pathlib.Path.expanduser() in this regard, and is more in line with posixpath.expanduser()'s cautious approach.

Also remove the near-duplicate implementation of expanduser() in pathlib, and by doing so fix a bug where KeyError could be raised when expanding another user's home directory on Windows.

https://bugs.python.org/issue39899

the-knights-who-say-ni commented Mar 8, 2020

Copy link
Copy Markdown

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

CLA Missing

Our records indicate the following people have not signed the CLA:

@barneygale

For legal reasons we need all the people listed to sign the CLA before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

If you have recently signed the CLA, please wait at least one business day
before our records are updated.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

barneygale force-pushed the bpo-39899-pathlib-expanduser-reimpl branch 3 times, most recently from 0e82850 to b9b9801 Compare March 10, 2020 20:23
pitrou reviewed Apr 17, 2020
View reviewed changes

pitrou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I see no problem with this personally but I would like advice from our Windows experts, @zooba and @pfmoore, especially on the os.path.expanduser changes.

Comment thread Lib/ntpath.py Outdated
barneygale force-pushed the bpo-39899-pathlib-expanduser-reimpl branch from b9b9801 to 2a49892 Compare January 21, 2021 23:52

barneygale commented Jan 22, 2021

Copy link
Copy Markdown
Contributor Author

Updated to use os.fsdecode() per review comments. Thanks for your help so far @pitrou.

@pfmoore @zooba flagging this with you again per pitrou's recommendation!

zooba commented Apr 7, 2021

Copy link
Copy Markdown
Member

I think this one is okay, but I need to spend a bit more time reading through it (it's pretty late here now and I'm too tired).

barneygale commented Apr 7, 2021

Copy link
Copy Markdown
Contributor Author

Yep understood! If it helps, the rough process here is:

  1. Bring os.path.expanduser() in line with pathlib's home directory resolution. They were already almost identical, but pathlib was slightly stricter in the rare scenario:
  • We're on Windows, and
  • USERNAME is set, and
  • It doesn't match the last component of the current user's home directory, and
  • We're querying for another user's home directory
  1. Delete pathlib's implementation in the name of DRY.

zooba reviewed Apr 7, 2021
View reviewed changes
Comment thread Lib/ntpath.py Outdated
barneygale force-pushed the bpo-39899-pathlib-expanduser-reimpl branch from 2a49892 to d7074c2 Compare April 7, 2021 22:03

barneygale commented Apr 7, 2021

Copy link
Copy Markdown
Contributor Author

Rebased to fix conflicts

zooba merged commit 3f3d82b into python:master Apr 7, 2021
bpo-39899: os.path.expanduser(): don't guess other Windows users' hom…
d7074c2 
…e directories if the basename of the current user's home directory doesn't match their username.

This makes `ntpath.expanduser()` match `pathlib.Path.expanduser()` in this regard, and is more in line with `posixpath.expanduser()`'s cautious approach.

Also remove the near-duplicate implementation of `expanduser()` in pathlib, and by doing so fix a bug where KeyError could be raised when expanding another user's home directory.
barneygale mentioned this pull request Apr 8, 2021
Merged
alexdelorenzo mentioned this pull request Apr 16, 2021
Open
barneygale mentioned this pull request May 15, 2021
Closed
akulakov mentioned this pull request Sep 6, 2021
Merged
barneygale mannequin mentioned this pull request Apr 10, 2022
Closed
This was referenced Aug 4, 2026
Merged
Merged
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

zooba zooba left review comments
pitrou pitrou left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

Back | FazBrowse Home | New Git URL