Thanks to visit codestin.com
Credit goes to github.com

Skip to content

bpo-38671: Make sure to return an absolute path in pathlib._WindowsFlavour.resolve() #17716

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

Jump to bottom
Closed
wants to merge 5 commits into from
Closed

bpo-38671: Make sure to return an absolute path in pathlib._WindowsFlavour.resolve() #17716

wants to merge 5 commits into from

Conversation

uranusjr
Copy link
Contributor

@uranusjr uranusjr commented Dec 27, 2019 •
edited by bedevere-bot
Loading

@uranusjr uranusjr force-pushed the path-resolve-nonstrict-win branch 3 times, most recently from 78953ba to 34c68f7 Compare December 28, 2019 02:02
eryksun
eryksun reviewed Dec 28, 2019
View reviewed changes
@ofek
Copy link
Contributor

ofek commented Jul 14, 2020

Rebase?

@uranusjr
Copy link
Contributor Author

uranusjr commented Jul 15, 2020 •
edited
Loading

I’ll rebase and change the call to os.path.abspath().

Edit: Done. I ended up adding the os.path.abspath() call later in the function, since the non-absolute s is needed in early parts of the function. I also took the liberty to refactor the function slightly to avoid very deep indentations in the function.

@uranusjr uranusjr force-pushed the path-resolve-nonstrict-win branch 2 times, most recently from 80498e7 to 54b8063 Compare July 15, 2020 13:46
pitrou
pitrou reviewed Jul 15, 2020
View reviewed changes
pitrou
pitrou reviewed Jul 15, 2020
View reviewed changes
pitrou
pitrou reviewed Jul 15, 2020
View reviewed changes
@uranusjr
Copy link
Contributor Author

OK, I’ve

  1. Move the unit test under _BasePathTest so it is run for all platforms.
  2. Remove the _getfinalpathname check since it should now be available everywhere. This also allows some additional cleanups that aren’t exactly related to the .resolve() fix.
  3. Use _getfullpathname instead of abspath as suggested.

I split each of these changes into individual commits so they can be easily reverted if needed.

@uranusjr uranusjr force-pushed the path-resolve-nonstrict-win branch from 6b7ebcc to 42fd0b0 Compare July 19, 2020 14:50
@ofek
Copy link
Contributor

ofek commented Aug 11, 2020

Will this be in 3.9?

@ofek
Copy link
Contributor

ofek commented Sep 23, 2020

Any progress?

@ofek
Copy link
Contributor

ofek commented Oct 5, 2020

Is this just blocked on reviews?

eryksun
eryksun reviewed Oct 5, 2020
View reviewed changes
Lib/pathlib.py
@@ -194,25 +189,23 @@ def resolve(self, path, strict=False):
s = str(path)
if not s:
return os.getcwd()
if strict:
Copy link
Contributor

Choose a reason for hiding this comment

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

Lines 189-191 make a bad assumption that the current working directory (CWD) is a final path. The CWD is an absolute path but not a final path. The assignment should be something like s = str(path) or '.'. In practice it may never be an issue since PurePath.__str__ assigns and returns self._str = self._format_parsed_parts(self._drv, self._root, self._parts) or '.'.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The CWD is an absolute path but not a final path.

TIL.

I like the or '.' approach since it avoids special-casing things, but want @pitrou to take a look since this is inherited from the initial pathlib implementation.

eryksun
eryksun reviewed Oct 5, 2020
View reviewed changes
@uranusjr uranusjr requested a review from pitrou October 5, 2020 08:40
@prescod
Copy link

prescod commented Mar 9, 2021

Is this a case of letting the best be the enemy of the good? This bug is a real time-waster and can easily slip into cross-platform code. If the issues @eryksun highlights are pre-existing then perhaps you should merge it and then fix those separately?

@eryksun
Copy link
Contributor

eryksun commented Mar 9, 2021 •
edited by bedevere-bot
Loading

@prescod, I just created bpo-43455 for the os.getcwd() issue. It should not hold this issue up.

zooba
zooba reviewed Mar 9, 2021
View reviewed changes
@ofek
Copy link
Contributor

ofek commented Mar 10, 2021

Is it too late for this to be in 3.10?

@eryksun
Copy link
Contributor

eryksun commented Mar 10, 2021

@ofek, this is a bug fix, not a new feature. Even if it were, new features can be added to 3.10 until the first beta release in May. Hopefully it gets merged into the 3.8 branch in time for the 3.8.9 release in May, since it's the last bug-fix release for 3.8.

uranusjr added 4 commits April 27, 2021 16:28
@uranusjr
Prepend cwd if resolve can't find existing prefix
e503cd6 
This guarentees we are returning an absolute path when the input `path`
is relative. Nothing would change if `path` is already absolute.
@uranusjr
Use os.path.abspath() as fallback as suggested
3f9d1b8
@uranusjr
Use early returns to reduce indentation level
612b7f6
@uranusjr
Test non-exist resolve on all platforms
7cff82e
@uranusjr uranusjr force-pushed the path-resolve-nonstrict-win branch from 42fd0b0 to 8f20c10 Compare April 27, 2021 08:33
@uranusjr
Copy link
Contributor Author

Strong nudge.

Hopefully it gets merged into the 3.8 branch in time for the 3.8.9 release in May

This is our last chance.

@ofek
Copy link
Contributor

ofek commented May 2, 2021

Needs one final rebase

@uranusjr
Copy link
Contributor Author

uranusjr commented May 2, 2021 •
edited
Loading

I’ve rebased this multiple times and this time the new incoming changes is too much for me. I give up. Someone else can take over.

@uranusjr uranusjr closed this May 2, 2021
@barneygale barneygale mentioned this pull request May 17, 2021
Merged
@uranusjr uranusjr deleted the path-resolve-nonstrict-win branch March 3, 2022 10:04
@eryksun eryksun mentioned this pull request Jun 21, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eryksun eryksun eryksun left review comments

@pfmoore pfmoore pfmoore left review comments

@zooba zooba zooba left review comments

@pitrou pitrou Awaiting requested review from pitrou

Assignees
No one assigned
Labels
awaiting review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@uranusjr @ofek @prescod @eryksun @pfmoore @zooba @pitrou @the-knights-who-say-ni @bedevere-bot