Mercurial > cpython-lru_cache-weakref

diff Python/pythonrun.c @ 10534:a4a268b725b2 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Guido van Rossum <guido@python.org>
date Wed, 07 Apr 1999 18:32:51 +0000
parents caf2c65a6bcf
children be8ec828c072
line wrap: on
line diff
--- a/Python/pythonrun.c	Wed Apr 07 18:27:29 1999 +0000
+++ b/Python/pythonrun.c	Wed Apr 07 18:32:51 1999 +0000
@@ -101,7 +101,6 @@
 
 */
 
-extern void win_pre_init(), win_pre_exit();
 void
 Py_Initialize()
 {
@@ -113,9 +112,6 @@
 	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 @@
 #ifdef macintosh
 	PyMac_Exit(sts);
 #else
-#ifdef MS_WINDOWS
-	win_pre_exit(sts);
-#endif
 	exit(sts);
 #endif
 }
@@ -1169,43 +1162,3 @@
 	       (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