summaryrefslogtreecommitdiff
path: root/Python/random.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-04-24 11:09:20 -0400
committerBenjamin Peterson <benjamin@python.org>2012-04-24 11:09:20 -0400
commit53d09b53993c6fd90307bbe842bccb40dcb03e43 (patch)
treeeab386f41260d464b00eadb79181216fa6261faa /Python/random.c
parentf73861a9f1b07296436badc29cb67c38f5e9c462 (diff)
parent4fd25873791e766eb60314d42bd6b292b4a6d221 (diff)
downloadcpython-53d09b53993c6fd90307bbe842bccb40dcb03e43.tar.gz
merge 3.2 (#14658)
Diffstat (limited to 'Python/random.c')
-rw-r--r--Python/random.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/Python/random.c b/Python/random.c
index a2ae002261..7019a3503e 100644
--- a/Python/random.c
+++ b/Python/random.c
@@ -257,17 +257,6 @@ _PyRandom_Init(void)
_Py_HashSecret_Initialized = 1;
/*
- By default, hash randomization is disabled, and only
- enabled if PYTHONHASHSEED is set to non-empty or if
- "-R" is provided at the command line:
- */
- if (!Py_HashRandomizationFlag) {
- /* Disable the randomized hash: */
- memset(secret, 0, secret_size);
- return;
- }
-
- /*
Hash randomization is enabled. Generate a per-process secret,
using PYTHONHASHSEED if provided.
*/