[Python-checkins] cpython (merge 3.3 -> default): Issue #18784: The uuid module no more attempts to load libc via ctypes.CDLL,

[serhiy.storchaka]

http://hg.python.org/cpython/rev/66ec8431032d
changeset:   85668:66ec8431032d
parent:      85666:1398dfb59fd9
parent:      85667:7aaba721ebc0
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Fri Sep 13 07:49:36 2013 +0300
summary:
  Issue #18784: The uuid module no more attempts to load libc via ctypes.CDLL,
if all necessary functions are already found in libuuid.
Patch by Evgeny Sologubov.

files:
  Lib/uuid.py |  2 ++
  Misc/ACKS   |  1 +
  Misc/NEWS   |  4 ++++
  3 files changed, 7 insertions(+), 0 deletions(-)


diff --git a/Lib/uuid.py b/Lib/uuid.py
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -429,6 +429,8 @@
             _uuid_generate_random = lib.uuid_generate_random
         if hasattr(lib, 'uuid_generate_time'):
             _uuid_generate_time = lib.uuid_generate_time
+            if _uuid_generate_random is not None:
+                break  # found everything we were looking for
 
     # The uuid_generate_* functions are broken on MacOS X 10.5, as noted
     # in issue #8621 the function generates the same sequence of values
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1199,6 +1199,7 @@
 Eric Snow
 Dirk Soede
 Paul Sokolovsky
+Evgeny Sologubov
 Cody Somerville
 Edoardo Spadolini
 Clay Spence
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@
 Library
 -------
 
+- Issue #18784: The uuid module no more attempts to load libc via ctypes.CDLL,
+  if all necessary functions are already found in libuuid.
+  Patch by Evgeny Sologubov.
+
 - The :envvar:`PYTHONFAULTHANDLER` environment variable now only enables the
   faulthandler module if the variable is non-empty. Same behaviour than other
   variables like :envvar:`PYTHONDONTWRITEBYTECODE`.

-- 
Repository URL: http://hg.python.org/cpython