[Python-checkins] r82279 - in python/branches/release31-maint: Lib/uuid.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Jun 27 14:46:19 2010
New Revision: 82279

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

................
  r82278 | ronald.oussoren | 2010-06-27 14:45:47 +0200 (Sun, 27 Jun 2010) | 12 lines
  
  Merged revisions 82276 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r82276 | ronald.oussoren | 2010-06-27 14:43:47 +0200 (Sun, 27 Jun 2010) | 5 lines
    
    The uuid library on OSX 10.5 seems to contain the same bug as the one
    on OSX 10.6, therefore don't use it there either.
    
    This fixes issue8621.
  ........
................


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

Modified: python/branches/release31-maint/Lib/uuid.py
==============================================================================
--- python/branches/release31-maint/Lib/uuid.py	(original)
+++ python/branches/release31-maint/Lib/uuid.py	Sun Jun 27 14:46:19 2010
@@ -427,17 +427,17 @@
         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
+    # The uuid_generate_* functions are broken on MacOS X 10.5, 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,
+    # Assume that the uuid_generate functions are broken from 10.5 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:
+        if int(os.uname()[2].split('.')[0]) >= 9:
             _uuid_generate_random = _uuid_generate_time = None
 
     # On Windows prior to 2000, UuidCreate gives a UUID containing the