diff options
| author | Guido van Rossum <guido@python.org> | 1999-04-07 18:32:51 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1999-04-07 18:32:51 (GMT) |
| commit | b6987b13fecdfbbc3a45e84025754d06ad18fca9 (patch) | |
| tree | b1b79f487629f990dbb84aed132c920078d8b821 | |
| parent | a99c5db3aa9c57cb9c70cb67891688a339021770 (diff) | |
| download | cpython-b6987b13fecdfbbc3a45e84025754d06ad18fca9.zip cpython-b6987b13fecdfbbc3a45e84025754d06ad18fca9.tar.gz cpython-b6987b13fecdfbbc3a45e84025754d06ad18fca9.tar.bz2 | |
Alas, get rid of the Win specific hack to ask the user to press Return
before exiting when an error happened. This didn't work right when
Python is invoked from a daemon.
| -rw-r--r-- | Python/pythonrun.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 2d065cf..0b5d0d1 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -101,7 +101,6 @@ Py_IsInitialized() */ -extern void win_pre_init(), win_pre_exit(); void Py_Initialize() { @@ -113,9 +112,6 @@ Py_Initialize() if (initialized) return; initialized = 1; -#ifdef MS_WINDOWS - win_pre_init(); -#endif if ((p = getenv("PYTHONDEBUG")) && *p != '\0') Py_DebugFlag = 1; @@ -1102,9 +1098,6 @@ Py_Exit(sts) #ifdef macintosh PyMac_Exit(sts); #else -#ifdef MS_WINDOWS - win_pre_exit(sts); -#endif exit(sts); #endif } @@ -1169,43 +1162,3 @@ Py_FdIsInteractive(fp, filename) (strcmp(filename, "<stdin>") == 0) || (strcmp(filename, "???") == 0); } - -#ifdef MS_WINDOWS - -#include <windows.h> -#include <conio.h> - -static int its_my_console = -1; - -static void -win_pre_init() -{ - HANDLE console; - CONSOLE_SCREEN_BUFFER_INFO info; - if (its_my_console >= 0) - return; - its_my_console = 0; - console = GetStdHandle(STD_OUTPUT_HANDLE); - if (console == INVALID_HANDLE_VALUE) - return; - if (!GetConsoleScreenBufferInfo(console, &info)) { - return; - } - if (info.dwCursorPosition.Y == 0) - its_my_console = 1; -} - -static void -win_pre_exit(sts) - int sts; -{ - if (sts == 0) - return; - if (its_my_console <= 0) - return; - fprintf(stderr, "Hit any key to exit..."); - fflush(stderr); - _getch(); -} - -#endif |