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.
........

diff --git a/Lib/uuid.py b/Lib/uuid.py
index fda9fe1914daafa7d569a1b07188d3edf26a2d42..6e687943d66f8624a8ab67c29f709ee01280a812 100644 (file)
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -427,17 +427,17 @@ 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
+    # 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