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
4535b111
Commit
4535b111
authored
Nov 07, 2014
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #17293: uuid.getnode() now determines MAC address on AIX using netstat.
Based on patch by Aivars Kalvāns.
parent
7a025823
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
18 deletions
+71
-18
Lib/test/test_uuid.py
Lib/test/test_uuid.py
+18
-0
Lib/uuid.py
Lib/uuid.py
+50
-18
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/test/test_uuid.py
View file @
4535b111
...
...
@@ -307,6 +307,24 @@ class TestUUID(unittest.TestCase):
if
node
is
not
None
:
self
.
check_node
(
node
,
'ifconfig'
)
@
unittest
.
skipUnless
(
os
.
name
==
'posix'
,
'requires Posix'
)
def
test_arp_getnode
(
self
):
node
=
uuid
.
_arp_getnode
()
if
node
is
not
None
:
self
.
check_node
(
node
,
'arp'
)
@
unittest
.
skipUnless
(
os
.
name
==
'posix'
,
'requires Posix'
)
def
test_lanscan_getnode
(
self
):
node
=
uuid
.
_lanscan_getnode
()
if
node
is
not
None
:
self
.
check_node
(
node
,
'lanscan'
)
@
unittest
.
skipUnless
(
os
.
name
==
'posix'
,
'requires Posix'
)
def
test_netstat_getnode
(
self
):
node
=
uuid
.
_netstat_getnode
()
if
node
is
not
None
:
self
.
check_node
(
node
,
'netstat'
)
@
unittest
.
skipUnless
(
os
.
name
==
'nt'
,
'requires Windows'
)
def
test_ipconfig_getnode
(
self
):
node
=
uuid
.
_ipconfig_getnode
()
...
...
Lib/uuid.py
View file @
4535b111
...
...
@@ -291,7 +291,7 @@ class UUID(object):
version
=
property
(
get_version
)
def
_
find_mac
(
command
,
args
,
hw_identifiers
,
get_index
):
def
_
popen
(
command
,
args
):
import
os
path
=
os
.
environ
.
get
(
"PATH"
,
os
.
defpath
).
split
(
os
.
pathsep
)
path
.
extend
((
'/sbin'
,
'/usr/sbin'
))
...
...
@@ -303,19 +303,27 @@ def _find_mac(command, args, hw_identifiers, get_index):
break
else
:
return
None
# LC_ALL to ensure English output, 2>/dev/null to prevent output on
# stderr (Note: we don't have an example where the words we search for
# are actually localized, but in theory some system could do so.)
cmd
=
'LC_ALL=C %s %s 2>/dev/null'
%
(
executable
,
args
)
return
os
.
popen
(
cmd
)
def
_find_mac
(
command
,
args
,
hw_identifiers
,
get_index
):
try
:
# LC_ALL to ensure English output, 2>/dev/null to
# prevent output on stderr
cmd
=
'LC_ALL=C %s %s 2>/dev/null'
%
(
executable
,
args
)
with
os
.
popen
(
cmd
)
as
pipe
:
pipe
=
_popen
(
command
,
args
)
if
not
pipe
:
return
with
pipe
:
for
line
in
pipe
:
words
=
line
.
lower
().
split
()
words
=
line
.
lower
().
rstrip
().
split
()
for
i
in
range
(
len
(
words
)):
if
words
[
i
]
in
hw_identifiers
:
try
:
return
int
(
words
[
get_index
(
i
)].
replace
(
':'
,
''
),
16
)
word
=
words
[
get_index
(
i
)]
mac
=
int
(
word
.
replace
(
':'
,
''
),
16
)
if
mac
:
return
mac
except
(
ValueError
,
IndexError
):
# Virtual interfaces, such as those provided by
# VPNs, do not have a colon-delimited MAC address
...
...
@@ -328,27 +336,50 @@ def _find_mac(command, args, hw_identifiers, get_index):
def
_ifconfig_getnode
():
"""Get the hardware address on Unix by running ifconfig."""
# This works on Linux ('' or '-a'), Tru64 ('-av'), but not all Unixes.
for
args
in
(
''
,
'-a'
,
'-av'
):
mac
=
_find_mac
(
'ifconfig'
,
args
,
[
'hwaddr'
,
'ether'
],
lambda
i
:
i
+
1
)
if
mac
:
return
mac
import
socket
def
_arp_getnode
():
"""Get the hardware address on Unix by running arp."""
import
os
,
socket
ip_addr
=
socket
.
gethostbyname
(
socket
.
gethostname
())
# Try getting the MAC addr from arp based on our IP address (Solaris).
mac
=
_find_mac
(
'arp'
,
'-an'
,
[
ip_addr
],
lambda
i
:
-
1
)
if
mac
:
return
mac
return
_find_mac
(
'arp'
,
'-an'
,
[
ip_addr
],
lambda
i
:
-
1
)
def
_lanscan_getnode
():
"""Get the hardware address on Unix by running lanscan."""
# This might work on HP-UX.
mac
=
_find_mac
(
'lanscan'
,
'-ai'
,
[
'lan0'
],
lambda
i
:
0
)
return
_find_mac
(
'lanscan'
,
'-ai'
,
[
'lan0'
],
lambda
i
:
0
)
def
_netstat_getnode
():
"""Get the hardware address on Unix by running netstat."""
# This might work on AIX, Tru64 UNIX and presumably on IRIX.
try
:
pipe
=
_popen
(
'netstat'
,
'-ia'
)
if
not
pipe
:
return
with
pipe
:
words
=
pipe
.
readline
().
rstrip
().
split
()
try
:
i
=
words
.
index
(
'Address'
)
except
ValueError
:
return
for
line
in
pipe
:
try
:
words
=
line
.
rstrip
().
split
()
word
=
words
[
i
]
if
len
(
word
)
==
17
and
word
.
count
(
':'
)
==
5
:
mac
=
int
(
word
.
replace
(
':'
,
''
),
16
)
if
mac
:
return
mac
return
None
except
(
ValueError
,
IndexError
):
pass
except
OSError
:
pass
def
_ipconfig_getnode
():
"""Get the hardware address on Windows by running ipconfig.exe."""
...
...
@@ -488,7 +519,8 @@ def getnode():
if
sys
.
platform
==
'win32'
:
getters
=
[
_windll_getnode
,
_netbios_getnode
,
_ipconfig_getnode
]
else
:
getters
=
[
_unixdll_getnode
,
_ifconfig_getnode
]
getters
=
[
_unixdll_getnode
,
_ifconfig_getnode
,
_arp_getnode
,
_lanscan_getnode
,
_netstat_getnode
]
for
getter
in
getters
+
[
_random_getnode
]:
try
:
...
...
Misc/NEWS
View file @
4535b111
...
...
@@ -37,6 +37,9 @@ Core and Builtins
Library
-------
-
Issue
#
17293
:
uuid
.
getnode
()
now
determines
MAC
address
on
AIX
using
netstat
.
Based
on
patch
by
Aivars
Kalv
ā
ns
.
-
Issue
#
22769
:
Fixed
ttk
.
Treeview
.
tag_has
()
when
called
without
arguments
.
-
Issue
#
22787
:
Allow
the
keyfile
argument
of
SSLContext
.
load_cert_chain
to
be
...
...
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