From 42491ce09c11dd4b7a8f100c92cb614d3fe6c371 Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Fri, 21 Nov 2008 22:08:14 +0000 Subject: [PATCH] Merged revisions 67318 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r67318 | amaury.forgeotdarc | 2008-11-21 23:05:48 +0100 (ven., 21 nov. 2008) | 4 lines #4363: Let uuid.uuid1() and uuid.uuid4() run even if the ctypes module is not present. Will backport to 2.6 ........ --- Lib/uuid.py | 4 ++-- Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/uuid.py b/Lib/uuid.py index e1b2f4b881..4840fa5d0f 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -479,8 +479,8 @@ def uuid1(node=None, clock_seq=None): # When the system provides a version-1 UUID generator, use it (but don't # use UuidCreate here because its UUIDs don't conform to RFC 4122). - _buffer = ctypes.create_string_buffer(16) if _uuid_generate_time and node is clock_seq is None: + _buffer = ctypes.create_string_buffer(16) _uuid_generate_time(_buffer) return UUID(bytes=_buffer.raw) @@ -516,8 +516,8 @@ def uuid4(): """Generate a random UUID.""" # When the system provides a version-4 UUID generator, use it. - _buffer = ctypes.create_string_buffer(16) if _uuid_generate_random: + _buffer = ctypes.create_string_buffer(16) _uuid_generate_random(_buffer) return UUID(bytes=_buffer.raw) diff --git a/Misc/NEWS b/Misc/NEWS index 8183431d98..e7fa503130 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -45,6 +45,9 @@ Core and Builtins Library ------- +- Issue #4363: The uuid.uuid1() and uuid.uuid4() functions now work even if + the ctypes module is not present. + - Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__. - Issue #3774: Fixed an error when create a Tkinter menu item without command -- 2.49.0