diff options
| author | Georg Brandl <georg@python.org> | 2012-02-21 00:33:36 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-02-21 00:33:36 +0100 |
| commit | 2fb477c0f0284439d40cb3f46eea45ef42446e53 (patch) | |
| tree | c8df3747d511256d56ca4af046db7915b5c06096 /Python/pythonrun.c | |
| parent | b5c793a0b349cb02003433c30a410595b224079f (diff) | |
| parent | 9edceb3e591063f382ae82e14313813ffc1af0bf (diff) | |
| download | cpython-git-2fb477c0f0284439d40cb3f46eea45ef42446e53.tar.gz | |
Merge 3.2: Issue #13703 plus some related test suite fixes.
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 44b817f546..54d39a5a91 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -73,6 +73,7 @@ extern int _PyLong_Init(void); extern void PyLong_Fini(void); extern int _PyFaulthandler_Init(void); extern void _PyFaulthandler_Fini(void); +extern void _PyRandom_Init(void); #ifdef WITH_THREAD extern void _PyGILState_Init(PyInterpreterState *, PyThreadState *); @@ -92,6 +93,7 @@ int Py_FrozenFlag; /* Needed by getpath.c */ int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */ int Py_NoUserSiteDirectory = 0; /* for -s and site.py */ int Py_UnbufferedStdioFlag = 0; /* Unbuffered binary std{in,out,err} */ +int Py_HashRandomizationFlag = 0; /* for -R and PYTHONHASHSEED */ PyThreadState *_Py_Finalizing = NULL; @@ -218,6 +220,12 @@ Py_InitializeEx(int install_sigs) Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p); if ((p = Py_GETENV("PYTHONDONTWRITEBYTECODE")) && *p != '\0') Py_DontWriteBytecodeFlag = add_flag(Py_DontWriteBytecodeFlag, p); + /* The variable is only tested for existence here; _PyRandom_Init will + check its value further. */ + if ((p = Py_GETENV("PYTHONHASHSEED")) && *p != '\0') + Py_HashRandomizationFlag = add_flag(Py_HashRandomizationFlag, p); + + _PyRandom_Init(); interp = PyInterpreterState_New(); if (interp == NULL) |