From ac764d3d5fc2cd608362cb90d6eebf1322f525fe Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Wed, 5 May 2010 15:32:33 +0000 Subject: Merged revisions 80784 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80784 | ronald.oussoren | 2010-05-05 16:48:37 +0200 (Wed, 05 May 2010) | 9 lines The C function used by uuid.uuid4 is broken on OSX 10.6 in that after os.fork() the parent and child generate the same sequence of UUIDs. This patch falls back to the the Python implementation on OSX 10.6 or later. Fixes issue #8621. ........ --- Lib/uuid.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Lib/uuid.py') diff --git a/Lib/uuid.py b/Lib/uuid.py index b4554e4942..fda9fe1914 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -427,6 +427,19 @@ try: if hasattr(lib, 'uuid_generate_time'): _uuid_generate_time = lib.uuid_generate_time + # The uuid_generate_* functions are broken on MacOS X 10.6, as noted + # in issue #8621 the function generates the same sequence of values + # in the parent process and all children created using fork (unless + # those children use exec as well). + # + # Assume that the uuid_generate functions are broken from 10.6 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]) >= 10: + _uuid_generate_random = _uuid_generate_time = None + # On Windows prior to 2000, UuidCreate gives a UUID containing the # hardware address. On Windows 2000 and later, UuidCreate makes a # random UUID and UuidCreateSequential gives a UUID containing the -- cgit v1.2.1