From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 18 Dec 2013 02:14:41 +0000 (-0500)
Subject: Merge: #19855: uuid.get_node now looks on the PATH for executables on unix.
X-Git-Tag: v3.4.0b2~185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ce3e9d82bc88351979ba4e23655568c339b8acc;p=thirdparty%2FPython%2Fcpython.git

Merge: #19855: uuid.get_node now looks on the PATH for executables on unix.
---

0ce3e9d82bc88351979ba4e23655568c339b8acc
diff --cc Lib/uuid.py
index 385fb9b0876f,7705a8ad409d..694a8a9772dc
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@@ -312,34 -312,35 +312,35 @@@ class UUID(object)
              return int((self.int >> 76) & 0xf)
  
  def _find_mac(command, args, hw_identifiers, get_index):
-     import os
-     for dir in ['', '/sbin/', '/usr/sbin']:
-         executable = os.path.join(dir, command)
-         if not os.path.exists(executable):
-             continue
- 
-         try:
-             # LC_ALL to get 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:
-                 for line in pipe:
-                     words = line.lower().split()
-                     for i in range(len(words)):
-                         if words[i] in hw_identifiers:
-                             try:
-                                 return int(
-                                     words[get_index(i)].replace(':', ''), 16)
-                             except (ValueError, IndexError):
-                                 # Virtual interfaces, such as those provided by
-                                 # VPNs, do not have a colon-delimited MAC address
-                                 # as expected, but a 16-byte HWAddr separated by
-                                 # dashes. These should be ignored in favor of a
-                                 # real MAC address
-                                 pass
-         except OSError:
-             continue
-     return None
+     import os, shutil
+     executable = shutil.which(command)
+     if executable is None:
+         path = os.pathsep.join(('/sbin', '/usr/sbin'))
+         executable = shutil.which(command, path=path)
+         if executable is None:
+             return None
+ 
+     try:
+         # LC_MESSAGES to get English output, 2>/dev/null to
+         # prevent output on stderr
+         cmd = 'LC_MESSAGES=C %s %s 2>/dev/null' % (executable, args)
+         with os.popen(cmd) as pipe:
+             for line in pipe:
+                 words = line.lower().split()
+                 for i in range(len(words)):
+                     if words[i] in hw_identifiers:
+                         try:
+                             return int(
+                                 words[get_index(i)].replace(':', ''), 16)
+                         except (ValueError, IndexError):
+                             # Virtual interfaces, such as those provided by
+                             # VPNs, do not have a colon-delimited MAC address
+                             # as expected, but a 16-byte HWAddr separated by
+                             # dashes. These should be ignored in favor of a
+                             # real MAC address
+                             pass
 -    except IOError:
++    except OSError:
+         pass
  
  def _ifconfig_getnode():
      """Get the hardware address on Unix by running ifconfig."""