[Python-checkins] r80788 - in python/branches/release31-maint: Lib/test/test_uuid.py Lib/uuid.py Misc/NEWS

[ronald.oussoren]

Author: ronald.oussoren
Date: Wed May  5 17:33:55 2010
New Revision: 80788

Log:
Merged revisions 80786 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80786 | ronald.oussoren | 2010-05-05 17:32:33 +0200 (Wed, 05 May 2010) | 16 lines
  
  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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_uuid.py
   python/branches/release31-maint/Lib/uuid.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/test/test_uuid.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_uuid.py	(original)
+++ python/branches/release31-maint/Lib/test/test_uuid.py	Wed May  5 17:33:55 2010
@@ -451,6 +451,34 @@
             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)

Modified: python/branches/release31-maint/Lib/uuid.py
==============================================================================
--- python/branches/release31-maint/Lib/uuid.py	(original)
+++ python/branches/release31-maint/Lib/uuid.py	Wed May  5 17:33:55 2010
@@ -427,6 +427,19 @@
         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

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Wed May  5 17:33:55 2010
@@ -40,6 +40,9 @@
 Library
 -------
 
+- Issue #8621: uuid.uuid4() returned the same sequence of values in the
+  parent and any children created using ``os.fork`` on MacOS X 10.6.
+
 - Issue #8567: Fix precedence of signals in Decimal module: when a
   Decimal operation raises multiple signals and more than one of those
   signals is trapped, the specification determines the order in which