Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
ac4aa7b6
Commit
ac4aa7b6
authored
Nov 30, 2014
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #22902: The "ip" command is now used on Linux to determine MAC address
in uuid.getnode(). Pach by Bruno Cauet.
parent
16e802f4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
2 deletions
+19
-2
Lib/test/test_uuid.py
Lib/test/test_uuid.py
+6
-0
Lib/uuid.py
Lib/uuid.py
+9
-2
Misc/ACKS
Misc/ACKS
+1
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/test/test_uuid.py
View file @
ac4aa7b6
...
...
@@ -320,6 +320,12 @@ class TestUUID(unittest.TestCase):
if
node
is
not
None
:
self
.
check_node
(
node
,
'ifconfig'
)
@
unittest
.
skipUnless
(
os
.
name
==
'posix'
,
'requires Posix'
)
def
test_ip_getnode
(
self
):
node
=
uuid
.
_ip_getnode
()
if
node
is
not
None
:
self
.
check_node
(
node
,
'ip'
)
@
unittest
.
skipUnless
(
os
.
name
==
'posix'
,
'requires Posix'
)
def
test_arp_getnode
(
self
):
node
=
uuid
.
_arp_getnode
()
...
...
Lib/uuid.py
View file @
ac4aa7b6
...
...
@@ -356,6 +356,13 @@ def _ifconfig_getnode():
if
mac
:
return
mac
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
)
if
mac
:
return
mac
def
_arp_getnode
():
"""Get the hardware address on Unix by running arp."""
import
os
,
socket
...
...
@@ -538,8 +545,8 @@ def getnode():
if
sys
.
platform
==
'win32'
:
getters
=
[
_windll_getnode
,
_netbios_getnode
,
_ipconfig_getnode
]
else
:
getters
=
[
_unixdll_getnode
,
_ifconfig_getnode
,
_
ar
p_getnode
,
_lanscan_getnode
,
_netstat_getnode
]
getters
=
[
_unixdll_getnode
,
_ifconfig_getnode
,
_
i
p_getnode
,
_
arp_getnode
,
_
lanscan_getnode
,
_netstat_getnode
]
for
getter
in
getters
+
[
_random_getnode
]:
try
:
...
...
Misc/ACKS
View file @
ac4aa7b6
...
...
@@ -217,6 +217,7 @@ Pierre Carrier
Terry Carroll
Edward Catmur
Lorenzo M. Catucci
Bruno Cauet
Donn Cave
Charles Cazabon
Jesús Cea Avión
...
...
Misc/NEWS
View file @
ac4aa7b6
...
...
@@ -191,6 +191,9 @@ Core and Builtins
Library
-------
-
Issue
#
22902
:
The
"ip"
command
is
now
used
on
Linux
to
determine
MAC
address
in
uuid
.
getnode
().
Pach
by
Bruno
Cauet
.
-
Issue
#
22960
:
Add
a
context
argument
to
xmlrpclib
.
ServerProxy
constructor
.
-
Issue
#
22389
:
Add
contextlib
.
redirect_stderr
().
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment