diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2017-12-07 12:48:14 (GMT) |
|---|---|---|
| committer | xdegaye <xdegaye@gmail.com> | 2017-12-07 12:48:14 (GMT) |
| commit | 03031fbc7d44106d652756462db34eae67de9568 (patch) | |
| tree | 7cf3412f215167134ffd038543ef3afd31ef0c94 | |
| parent | 8676ac5419b9518d18c57ed32ea4796b218135f4 (diff) | |
| download | cpython-03031fbc7d44106d652756462db34eae67de9568.zip cpython-03031fbc7d44106d652756462db34eae67de9568.tar.gz cpython-03031fbc7d44106d652756462db34eae67de9568.tar.bz2 | |
bpo-32199: The getnode() ip getter now uses 'ip link' instead of 'ip link list' (GH-4696) (#4747)
(cherry picked from commit 961dbe0548e26394b7716d41423c61b1e2e58ef7)
| -rw-r--r-- | Lib/uuid.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2017-12-04-12-23-26.bpo-32199.nGof4v.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/uuid.py b/Lib/uuid.py index 20b02da..36c956e 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -358,7 +358,7 @@ def _ifconfig_getnode(): def _ip_getnode(): """Get the hardware address on Unix by running ip.""" # This works on Linux with iproute2. - mac = _find_mac('ip', 'link list', [b'link/ether'], lambda i: i+1) + mac = _find_mac('ip', 'link', [b'link/ether'], lambda i: i+1) if mac: return mac diff --git a/Misc/NEWS.d/next/Library/2017-12-04-12-23-26.bpo-32199.nGof4v.rst b/Misc/NEWS.d/next/Library/2017-12-04-12-23-26.bpo-32199.nGof4v.rst new file mode 100644 index 0000000..d5f88ce --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-12-04-12-23-26.bpo-32199.nGof4v.rst @@ -0,0 +1 @@ +The getnode() ip getter now uses 'ip link' instead of 'ip link list'. |