diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-02-21 18:03:47 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-02-21 18:03:47 (GMT) |
| commit | 86838b02f04a01445778584afb7acd0b05081335 (patch) | |
| tree | e70c00698519271b4431d7aed8a339228b372f9f /Python | |
| parent | dbd3f6173a0dd15c97b60be56cc37ff1cf5487e5 (diff) | |
| download | cpython-86838b02f04a01445778584afb7acd0b05081335.zip cpython-86838b02f04a01445778584afb7acd0b05081335.tar.gz cpython-86838b02f04a01445778584afb7acd0b05081335.tar.bz2 | |
Fix test failure in test_cmd_line by initializing the hash secret at the earliest point.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/getopt.c | 11 | ||||
| -rw-r--r-- | Python/pythonrun.c | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Python/getopt.c b/Python/getopt.c index 064a187..cc42431 100644 --- a/Python/getopt.c +++ b/Python/getopt.c @@ -41,9 +41,18 @@ int _PyOS_opterr = 1; /* generate error messages */ int _PyOS_optind = 1; /* index into argv array */ wchar_t *_PyOS_optarg = NULL; /* optional argument */ +static wchar_t *opt_ptr = L""; + +void _PyOS_ResetGetOpt(void) +{ + _PyOS_opterr = 1; + _PyOS_optind = 1; + _PyOS_optarg = NULL; + opt_ptr = L""; +} + int _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring) { - static wchar_t *opt_ptr = L""; wchar_t *ptr; wchar_t option; diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 718362d..584a19b 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -70,7 +70,6 @@ extern void _PyUnicode_Init(void); extern void _PyUnicode_Fini(void); extern int _PyLong_Init(void); extern void PyLong_Fini(void); -extern void _PyRandom_Init(void); #ifdef WITH_THREAD extern void _PyGILState_Init(PyInterpreterState *, PyThreadState *); |