[Python-checkins] r43421 - in python/trunk/Lib: random.py test/test_random.py

[raymond.hettinger]

Author: raymond.hettinger
Date: Wed Mar 29 11:13:13 2006
New Revision: 43421

Modified:
   python/trunk/Lib/random.py
   python/trunk/Lib/test/test_random.py
Log:
SF bug #1460340:  random.sample can raise KeyError

Fix the hit and miss style of testing for sets and dicts.



Modified: python/trunk/Lib/random.py
==============================================================================
--- python/trunk/Lib/random.py	(original)
+++ python/trunk/Lib/random.py	Wed Mar 29 11:13:13 2006
@@ -312,17 +312,18 @@
                 pool[j] = pool[n-i-1]   # move non-selected item into vacancy
         else:
             try:
-                n > 0 and (population[0], population[n//2], population[n-1])
-            except (TypeError, KeyError):   # handle non-sequence iterables
-                population = tuple(population)
-            selected = set()
-            selected_add = selected.add
-            for i in xrange(k):
-                j = _int(random() * n)
-                while j in selected:
+                selected = set()
+                selected_add = selected.add
+                for i in xrange(k):
                     j = _int(random() * n)
-                selected_add(j)
-                result[i] = population[j]
+                    while j in selected:
+                        j = _int(random() * n)
+                    selected_add(j)
+                    result[i] = population[j]
+            except (TypeError, KeyError):   # handle sets and dictionaries
+                if isinstance(population, list):
+                    raise
+                return self.sample(list(population), k)
         return result
 
 ## -------------------- real-valued distributions  -------------------

Modified: python/trunk/Lib/test/test_random.py
==============================================================================
--- python/trunk/Lib/test/test_random.py	(original)
+++ python/trunk/Lib/test/test_random.py	Wed Mar 29 11:13:13 2006
@@ -96,6 +96,9 @@
         self.gen.sample(dict.fromkeys('abcdefghijklmnopqrst'), 2)
         self.gen.sample(str('abcdefghijklmnopqrst'), 2)
         self.gen.sample(tuple('abcdefghijklmnopqrst'), 2)
+        # SF bug #1460340 -- random.sample can raise KeyError
+        a = dict.fromkeys(range(10)+range(10,100,2)+range(100,110))
+        self.gen.sample(a,3)
 
     def test_gauss(self):
         # Ensure that the seed() method initializes all the hidden state.  In