Skip to content

bpo-28009: Fix SkipUnless logic to be based on platform programs capable of introspection #12777

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

Merged
ncoghlan merged 7 commits into from
Jun 15, 2019
+47 −19
Merged

bpo-28009: Fix SkipUnless logic to be based on platform programs capable of introspection #12777

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9f1fe2f
Fix SkipUnless logic to be based on programs capable of introspection
aixtools Apr 11, 2019
ccbb61b
reformat to one-line where possible
aixtools Apr 11, 2019
c8b96a0
reword blurb
aixtools Apr 15, 2019
a179235
correct typo
aixtools Apr 17, 2019
df8db1e
merge with master before continuing
aixtools Jun 12, 2019
e0f2229
improve blurb and variable naming for GETTERS
aixtools Jun 12, 2019
2487d1b
add documentation to code block
aixtools Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
reformat to one-line where possible
  • Loading branch information
@aixtools
aixtools committed Apr 11, 2019
commit ccbb61b80e2b460a74f06342f627c256665d9709
7 changes: 3 additions & 4 deletions Lib/uuid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,17 +681,16 @@ def _random_getnode():


if _LINUX:
_GETTERS = [_ifconfig_getnode, _ip_getnode,
_arp_getnode, _lanscan_getnode]
_GETTERS = [_ifconfig_getnode, _ip_getnode, _arp_getnode, _lanscan_getnode]
elif _DARWIN:
_GETTERS = [_arp_getnode, _ifconfig_getnode, _netstat_getnode]
elif _WINDOWS:
_GETTERS = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
elif _AIX:
_GETTERS = [_netstat_getnode]
else:
_GETTERS = [_ifconfig_getnode, _ip_getnode,
_arp_getnode, _lanscan_getnode, _netstat_getnode]
_GETTERS = [_ifconfig_getnode, _arp_getnode, _netstat_getnode,
_lanscan_getnode, _ip_getnode]
if os.name == 'posix':
_NODE_GETTERS = [_unix_getnode] + _GETTERS
elif os.name == 'nt':
Expand Down