Skip to content

bpo-37616: Fix incorrect zip path for 3.10 prep#14874

Closed
nsiregar wants to merge 2 commits intopython:masterfrom
nsiregar:bpo-37616-zip-path-incorrect
Closed

bpo-37616: Fix incorrect zip path for 3.10 prep#14874
nsiregar wants to merge 2 commits intopython:masterfrom
nsiregar:bpo-37616-zip-path-incorrect

Conversation

@nsiregar
Copy link
Copy Markdown
Contributor

@nsiregar nsiregar commented Jul 21, 2019 •
edited by bedevere-bot
Loading

[3.10 prep] fix incorrect zip path

https://bugs.python.org/issue37616

ZackerySpytz
ZackerySpytz reviewed Jul 22, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@ZackerySpytz ZackerySpytz left a comment

Choose a reason for hiding this comment

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

I'm not sure if this fix is correct.

Comment thread Misc/NEWS.d/next/Core and Builtins/2019-07-21-11-11-58.bpo-37616.0pEhuj.rst Outdated
Copy link
Copy Markdown
Contributor

@ZackerySpytz ZackerySpytz Jul 22, 2019

Choose a reason for hiding this comment

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

Please use proper sentences in news entries.

I believe using single backquotes around "getpath" is incorrect (as per https://devguide.python.org/documenting). Also, I think the full file path should be used (instead of just "getpath").

sys.path is not a module.

Comment thread Modules/getpath.c Outdated
Comment thread Modules/getpath.c Outdated
Comment thread Modules/getpath.c Outdated
@nsiregar nsiregar force-pushed the bpo-37616-zip-path-incorrect branch from b425a05 to 13bde0b Compare July 22, 2019 13:36
@nsiregar
Copy link
Copy Markdown
Contributor Author

nsiregar commented Jul 22, 2019 •
edited
Loading

Should I change the algorithm to replace 00 in python00.zip with any concatenated version number?

@csabella
Copy link
Copy Markdown
Contributor

csabella commented Feb 6, 2020

@nsiregar, please resolve the merge conflict. Thank you!

@nsiregar nsiregar force-pushed the bpo-37616-zip-path-incorrect branch from 13bde0b to 420335e Compare February 9, 2020 03:49
@nsiregar
Copy link
Copy Markdown
Contributor Author

nsiregar commented Feb 9, 2020

@csabella I've resolved the conflict

@nsiregar nsiregar force-pushed the bpo-37616-zip-path-incorrect branch from 420335e to d644b66 Compare February 13, 2020 01:47
@nsiregar nsiregar force-pushed the bpo-37616-zip-path-incorrect branch from d644b66 to 10d41ce Compare February 14, 2020 01:13
brettcannon
brettcannon reviewed Mar 3, 2020
View reviewed changes
Comment thread Misc/NEWS.d/next/Core and Builtins/2019-07-21-11-11-58.bpo-37616.0pEhuj.rst
Comment on lines +1 to +2
Update ``Module/getpath.c`` read python zip path if python
version size more than 2 digit.
Copy link
Copy Markdown
Member

@brettcannon brettcannon Mar 3, 2020

Choose a reason for hiding this comment

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

Suggested change
Update ``Module/getpath.c`` read python zip path if python
version size more than 2 digit.
Update ``Module/getpath.c`` to read the stdlib from a zip file when the minor version is more than a single digit.

@brettcannon
Copy link
Copy Markdown
Member

brettcannon commented Mar 3, 2020 •
edited
Loading

The memmove doesn't seem like the right solution here. Why not have two template file paths and then use the appropriate one based on the number of digits required?

@nsiregar
Copy link
Copy Markdown
Contributor Author

nsiregar commented Mar 4, 2020

working on it

@ambv
Copy link
Copy Markdown
Contributor

ambv commented May 19, 2020

Since this wasn't merged in time, we went with b4d4aef

@ambv ambv closed this May 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brettcannon brettcannon brettcannon left review comments

@ronaldoussoren ronaldoussoren Awaiting requested review from ronaldoussoren

+1 more reviewer

@ZackerySpytz ZackerySpytz ZackerySpytz left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

awaiting review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@nsiregar @csabella @brettcannon @ambv @ronaldoussoren @ZackerySpytz @the-knights-who-say-ni @bedevere-bot