Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

bpo-26544: Fixed implementation of platform.libc_ver().#7684

Merged
serhiy-storchaka merged 4 commits into
python:masterpython/cpython:masterfrom
serhiy-storchaka:platform-libc_verserhiy-storchaka/cpython:platform-libc_verCopy head branch name to clipboard
Jul 9, 2018
Merged

bpo-26544: Fixed implementation of platform.libc_ver().#7684
serhiy-storchaka merged 4 commits into
python:masterpython/cpython:masterfrom
serhiy-storchaka:platform-libc_verserhiy-storchaka/cpython:platform-libc_verCopy head branch name to clipboard

Conversation

@serhiy-storchaka

@serhiy-storchaka serhiy-storchaka commented Jun 13, 2018 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

@serhiy-storchaka serhiy-storchaka added type-bug An unexpected behavior, bug, or error needs backport to 3.6 labels Jun 13, 2018
zhangyangyu
zhangyangyu reviewed Jun 19, 2018
View reviewed changes
Comment thread Lib/platform.py Outdated
if not m:
break
eof = True
binary = binary[max(pos, len(binary) - 1000):] + chunk

@zhangyangyu zhangyangyu Jun 19, 2018 •
edited
Loading

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.

IIUC, the added logic is to fix the bug the version info might just appear around the boundary of chunks. But according to the documentation and comment, it seems the original intention is to let the user choose an appropriate chunk size. If we change the logic, the parameter chunksize looks somewhat unnecessary.

BTW, the default argument of chunksize in doc conflicts with implementation. (2048 vs 16384)

@serhiy-storchaka serhiy-storchaka Jun 19, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

What are the documentation and comment about the original intention? I can't find anything.

@zhangyangyu zhangyangyu Jun 20, 2018

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.

I just infer from it. Otherwise I don't understand what's chunksize for. Anyway, it doesn't matter. I just think after this change, exposing chunksize seems somewhat superfluous.

zhangyangyu
zhangyangyu reviewed Jun 20, 2018
View reviewed changes
Comment thread Lib/platform.py Outdated
if not m:
break
eof = True
binary = binary[max(pos, len(binary) - 1000):] + chunk

@zhangyangyu zhangyangyu Jun 20, 2018

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.

Maybe it's better to put this line in an else block. No meaning to concatenate an empty bytes.

zhangyangyu
zhangyangyu approved these changes Jun 20, 2018
View reviewed changes

@zhangyangyu zhangyangyu 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.

LGTM. Only one tiny suggestion.

@serhiy-storchaka

serhiy-storchaka commented Jul 9, 2018

Copy link
Copy Markdown
Member Author

Thank you for you review and suggestion @zhangyangyu! It has helped me to rewrite the code in more efficient and clear way.

@serhiy-storchaka serhiy-storchaka merged commit 2a9b8ba into python:master Jul 9, 2018
@miss-islington

miss-islington commented Jul 9, 2018

Copy link
Copy Markdown
Contributor

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖

@serhiy-storchaka serhiy-storchaka deleted the platform-libc_ver branch July 9, 2018 08:47
@miss-islington

miss-islington commented Jul 9, 2018

Copy link
Copy Markdown
Contributor

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 2a9b8babf0d09946ebebfdb2931cc0d3db5a1d3d 3.7

@miss-islington

miss-islington commented Jul 9, 2018

Copy link
Copy Markdown
Contributor

Sorry, @serhiy-storchaka, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 2a9b8babf0d09946ebebfdb2931cc0d3db5a1d3d 2.7

@miss-islington

miss-islington commented Jul 9, 2018

Copy link
Copy Markdown
Contributor

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 2a9b8babf0d09946ebebfdb2931cc0d3db5a1d3d 3.6

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Jul 9, 2018
@serhiy-storchaka
[3.7] bpo-26544: Fixed implementation of platform.libc_ver(). (python…
024ee84 
…GH-7684).

(cherry picked from commit 2a9b8ba)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@bedevere-bot

bedevere-bot commented Jul 9, 2018

Copy link
Copy Markdown

GH-8193 is a backport of this pull request to the 3.7 branch.

serhiy-storchaka added a commit that referenced this pull request Jul 9, 2018
@serhiy-storchaka
[3.7] bpo-26544: Fixed implementation of platform.libc_ver(). (GH-7684)…
7c43b80 
…. (GH-8193)

(cherry picked from commit 2a9b8ba)
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 9, 2018
@serhiy-storchaka @miss-islington
[3.7] bpo-26544: Fixed implementation of platform.libc_ver(). (python…
7028d68 
…GH-7684). (pythonGH-8193)

(cherry picked from commit 2a9b8ba)
(cherry picked from commit 7c43b80)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Jul 9, 2018
@serhiy-storchaka
[2.7] [3.7] bpo-26544: Fixed implementation of platform.libc_ver(). (p…
259ea4f 
…ythonGH-7684). (pythonGH-8193)

(cherry picked from commit 2a9b8ba).
(cherry picked from commit 7c43b80)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
serhiy-storchaka pushed a commit that referenced this pull request Jul 9, 2018
@miss-islington @serhiy-storchaka
bpo-26544: Fixed implementation of platform.libc_ver(). (GH-7684). (G…
d73497b 
…H-8193) (GH-8195)

(cherry picked from commit 2a9b8ba)
(cherry picked from commit 7c43b80)
serhiy-storchaka added a commit that referenced this pull request Jul 9, 2018
@serhiy-storchaka
bpo-26544: Fixed implementation of platform.libc_ver(). (GH-7684). (G…
b1e6e56 
…H-8193) (GH-8196)

(cherry picked from commit 2a9b8ba).
(cherry picked from commit 7c43b80)
@bedevere-bot

bedevere-bot commented Jul 30, 2018

Copy link
Copy Markdown

GH-8196 is a backport of this pull request to the 2.7 branch.

@bedevere-bot

bedevere-bot commented Jul 30, 2018

Copy link
Copy Markdown

GH-8195 is a backport of this pull request to the 3.6 branch.

@serhiy-storchaka serhiy-storchaka removed their assignment Oct 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zhangyangyu zhangyangyu zhangyangyu approved these changes

Assignees

No one assigned

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@serhiy-storchaka @miss-islington @bedevere-bot @zhangyangyu @the-knights-who-say-ni
Morty Proxy This is a proxified and sanitized view of the page, visit original site.