gh-101531: Handle omitted leading zeroes in mac address on Darwin (#1… #105004
Conversation
evgeniiz321
commented
May 26, 2023
•
evgeniiz321
commented
- Issue: UUID's _arp_getnode does not account for omitted leading 0's in arp output on Darwin #101531
|
All commit authors signed the Contributor License Agreement. |
evgeniiz321
force-pushed
the
gh-101531
branch
4 times, most recently
from
d7ad703 to
edbb512
Compare
There was a problem hiding this comment.
Please add some additional tests as well,
Line 780 in fb02b66
This needs to be changed to handle more than just 'aix' and 'not aix', as well as adding a new test_parse_mac_macos method.
Likewise an addition to also test update to deal with the new behaviour (even TBH this should have been done while adding AIX support to the function), just add the a variant that tests with macOS values and settings.
Lib/uuid.py
Outdated
| @@ -427,7 +429,7 @@ def _find_mac_near_keyword(command, args, keywords, get_word_index): | |||
| if words[i] in keywords: | |||
| try: | |||
| word = words[get_word_index(i)] | |||
| mac = int(word.replace(_MAC_DELIM, b''), 16) | |||
| mac = _parse_mac(word) | |||
| except (ValueError, IndexError): | |||
There was a problem hiding this comment.
| except (ValueError, IndexError): | |
| except IndexError: |
_parse_mac should not raise ValueError, but returns None on invalid values.
Lib/uuid.py
Outdated
| @@ -66,6 +66,8 @@ | |||
| if _AIX: | |||
| _MAC_DELIM = b'.' | |||
| _MAC_OMITS_LEADING_ZEROES = True | |||
| if sys.platform in ('darwin', ): | |||
There was a problem hiding this comment.
| if sys.platform in ('darwin', ): | |
| if sys.platform == 'darwin': |
Using in to test the value is not necessary at this moment, can be changed when there is another platform that needs this.
|
A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated. Once you have made the requested changes, please leave a comment on this pull request containing the phrase |
evgeniiz321
force-pushed
the
gh-101531
branch
3 times, most recently
from
3e4b47d to
de560d0
Compare
|
I have made the requested changes; please review again |
|
Thanks for making the requested changes! @ronaldoussoren: please review the changes made to this pull request. |
