Issue #24634: Importing uuid should not try to load libc on Windows

diff --git a/Lib/uuid.py b/Lib/uuid.py
index 0f0d8c15de07cbbe8594754fa58ab1e17c16b401..151df35d3d05b3c3b8b893eb42b6fe36cba7822b 100644 (file)
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -441,10 +441,14 @@ def _netbios_getnode():
 _uuid_generate_random = _uuid_generate_time = _UuidCreate = None
 try:
     import ctypes, ctypes.util
+    import sys
 
     # The uuid_generate_* routines are provided by libuuid on at least
     # Linux and FreeBSD, and provided by libc on Mac OS X.
-    for libname in ['uuid', 'c']:
+    _libnames = ['uuid']
+    if not sys.platform.startswith('win'):
+        _libnames.append('c')
+    for libname in _libnames:
         try:
             lib = ctypes.CDLL(ctypes.util.find_library(libname))
         except:
@@ -455,6 +459,7 @@ try:
             _uuid_generate_time = lib.uuid_generate_time
             if _uuid_generate_random is not None:
                 break  # found everything we were looking for
+    del _libnames
 
     # The uuid_generate_* functions are broken on MacOS X 10.5, as noted
     # in issue #8621 the function generates the same sequence of values
@@ -463,7 +468,6 @@ try:
     #
     # Assume that the uuid_generate functions are broken from 10.5 onward,
     # the test can be adjusted when a later version is fixed.
-    import sys
     if sys.platform == 'darwin':
         import os
         if int(os.uname()[2].split('.')[0]) >= 9:

diff --git a/Misc/NEWS b/Misc/NEWS
index 76e02269777b6b66de77faecdcec599e6f4e283d..7c7c82a1826d24df1dcbcfbf7a6f1357d9c5013d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #24634: Importing uuid should not try to load libc on Windows
+
 - Issue #23652: Make it possible to compile the select module against the
   libc headers from the Linux Standard Base, which do not include some
   EPOLL macros.  Initial patch by Matt Frank.