diff options
| author | Raymond Hettinger <python@rcn.com> | 2010-12-08 01:13:53 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2010-12-08 01:13:53 (GMT) |
| commit | 3fcf0029945d8c6f866fdbb98517136999d7be7e (patch) | |
| tree | 189af74502f0ce1090dcb6abf5339d4174c9a640 /Lib | |
| parent | 10e05e17a3e7657ecdc4c7986d35275d76c6d603 (diff) | |
| download | cpython-3fcf0029945d8c6f866fdbb98517136999d7be7e.zip cpython-3fcf0029945d8c6f866fdbb98517136999d7be7e.tar.gz cpython-3fcf0029945d8c6f866fdbb98517136999d7be7e.tar.bz2 | |
Update whatsnew. Salt the random number seed.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/random.py | 11 | ||||
| -rw-r--r-- | Lib/test/test_random.py | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Lib/random.py b/Lib/random.py index 83a070c..7f63388 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -43,6 +43,7 @@ from math import log as _log, exp as _exp, pi as _pi, e as _e, ceil as _ceil from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin from os import urandom as _urandom import collections as _collections +from hashlib import sha512 as _sha512 __all__ = ["Random","seed","random","uniform","randint","choice","sample", "randrange","shuffle","normalvariate","lognormvariate", @@ -110,10 +111,12 @@ class Random(_random.Random): import time a = int(time.time() * 256) # use fractional seconds - if version == 2 and isinstance(a, (str, bytes, bytearray)): - if isinstance(a, str): - a = a.encode("utf8") - a = int.from_bytes(a, 'big') + if version == 2: + if isinstance(a, (str, bytes, bytearray)): + if isinstance(a, str): + a = a.encode("utf8") + a += _sha512(a).digest() + a = int.from_bytes(a, 'big') super().seed(a) self.gauss_next = None diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index feb52a5..776d0c4 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -246,8 +246,8 @@ class MersenneTwister_TestBasicOps(TestBasicOps): '0x1.1ebb4352e4c4dp-1', '0x1.1a7422abf9c11p-1']) self.gen.seed("the quick brown fox", version=2) self.assertEqual([self.gen.random().hex() for i in range(4)], - ['0x1.1294009b9eda4p-2', '0x1.2ff96171b0010p-1', - '0x1.459e0989bd8e0p-5', '0x1.8b5f55892ddcbp-1']) + ['0x1.1239ddfb11b7cp-3', '0x1.b3cbb5c51b120p-4', + '0x1.8c4f55116b60fp-1', '0x1.63eb525174a27p-1']) def test_setstate_first_arg(self): self.assertRaises(ValueError, self.gen.setstate, (1, None, None)) |