summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-09-13 04:49:36 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-09-13 04:49:36 (GMT)
commit5abf3d9926be2c84d80e4c2bc775f175521a8a38 (patch)
tree2d8796b29c65f7107f1ba66fec5503856ea40955
parentf5ce0122ce210210456bae496f792d018c17b2be (diff)
parent016af3f4d484d0e4f756bf0a505d0df3cbc444ed (diff)
downloadcpython-5abf3d9926be2c84d80e4c2bc775f175521a8a38.zip
cpython-5abf3d9926be2c84d80e4c2bc775f175521a8a38.tar.gz
cpython-5abf3d9926be2c84d80e4c2bc775f175521a8a38.tar.bz2
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.
-rw-r--r--Lib/uuid.py2
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS4
3 files changed, 7 insertions, 0 deletions
diff --git a/Lib/uuid.py b/Lib/uuid.py
index 484a231..93254ec 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -429,6 +429,8 @@ try:
_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
index 9d0dc46..be488d6 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1199,6 +1199,7 @@ Rafal Smotrzyk
Eric Snow
Dirk Soede
Paul Sokolovsky
+Evgeny Sologubov
Cody Somerville
Edoardo Spadolini
Clay Spence
diff --git a/Misc/NEWS b/Misc/NEWS
index 23035d2..556dca2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ Core and Builtins
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`.