[3.13] gh-132710: only use stable _uuid.generate_time_safe() to deduce MAC address (GH-132901)
#134704
+370
−28
Conversation
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
…to deduce MAC address (pythonGH-132901) (cherry picked from commit 3bffada) Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
zanieb
added a commit
to astral-sh/python-build-standalone
that referenced
this pull request
Jun 6, 2025
Cherry-picks python/cpython#134704 See #587
zanieb
reviewed
Jun 6, 2025
| @@ -572,22 +572,24 @@ def _netstat_getnode(): | |||
| try: | |||
| import _uuid | |||
| _generate_time_safe = getattr(_uuid, "generate_time_safe", None) | |||
| _has_stable_extractable_node = _uuid.has_stable_extractable_node | |||
There was a problem hiding this comment.
Suggested change
| _has_stable_extractable_node = _uuid.has_stable_extractable_node | |
| _has_stable_extractable_node = getattr(_uuid, "has_stable_extractable_node", False) |
This failed downstream in astral-sh/python-build-standalone#634, I think you need to use getattr as above.
There was a problem hiding this comment.
(though maybe something else weird is going on)
There was a problem hiding this comment.
Hum, that's weird. The _uuid module should unconditionally have the attribute.
There was a problem hiding this comment.
That's what I thought from reading the patch too. I didn't dig deeper though, since this worked around the failing test.
|
Once this is merged, I'll need to incorporate #135226 as well. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(cherry picked from commit 3bffada)
An additional NEWS entry will be needed (I forgot to do it for the other twos, so I'll add a NEWS entry for 3.15 and 3.14 in a separate PR, and when this PR needs to be merged, then I'll add it as well)
libuuid#132710