summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-05-05 15:32:33 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-05-05 15:32:33 (GMT)
commitac764d3d5fc2cd608362cb90d6eebf1322f525fe (patch)
treebcb51f27b13ffea278674c6dff34e7df9784eee7 /Lib
parent177ab08f96c9288ae2da4dda18ff75b3c6152483 (diff)
downloadcpython-ac764d3d5fc2cd608362cb90d6eebf1322f525fe.zip
cpython-ac764d3d5fc2cd608362cb90d6eebf1322f525fe.tar.gz
cpython-ac764d3d5fc2cd608362cb90d6eebf1322f525fe.tar.bz2
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. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_uuid.py28
-rw-r--r--Lib/uuid.py13
2 files changed, 41 insertions, 0 deletions
diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py
index c22b6af..43fa656 100644
--- a/Lib/test/test_uuid.py
+++ b/Lib/test/test_uuid.py
@@ -457,6 +457,34 @@ class TestUUID(TestCase):
equal(u, uuid.UUID(v))
equal(str(u), v)
+ def testIssue8621(self):
+ import os
+ import sys
+ if os.name != 'posix':
+ return
+
+ # On at least some versions of OSX uuid.uuid4 generates
+ # the same sequence of UUIDs in the parent and any
+ # children started using fork.
+ fds = os.pipe()
+ pid = os.fork()
+ if pid == 0:
+ os.close(fds[0])
+ value = uuid.uuid4()
+ os.write(fds[1], value.hex.encode('latin1'))
+ os._exit(0)
+
+ else:
+ os.close(fds[1])
+ parent_value = uuid.uuid4().hex
+ os.waitpid(pid, 0)
+ child_value = os.read(fds[0], 100).decode('latin1')
+
+ self.assertNotEqual(parent_value, child_value)
+
+
+
+
def test_main():
support.run_unittest(TestUUID)
diff --git a/Lib/uuid.py b/Lib/uuid.py
index b4554e4..fda9fe1 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