Mercurial > cpython-lru_cache-weakref
diff Python/pythonrun.c @ 75097:ed76dc34b39d
Merge 3.2: Issue #13703 plus some related test suite fixes.
| author | Georg Brandl <georg@python.org> |
|---|---|
| date | Tue, 21 Feb 2012 00:33:36 +0100 |
| parents | 2bd7f40108b4 4a31f6b11e7a |
| children | 88aede44ded1 |
line wrap: on
line diff
--- a/Python/pythonrun.c Mon Feb 20 22:06:59 2012 +0100 +++ b/Python/pythonrun.c Tue Feb 21 00:33:36 2012 +0100 @@ -73,6 +73,7 @@ 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_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_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)
