cpython-lru_cache-weakref: Python/frozenmain.c annotate

annotate Python/frozenmain.c @ 58664:993f703a61ba

Merged revisions 77484,77487,77561,77570,77593,77603,77608,77667,77702-77703,77739,77858,77887,77889 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77484 | skip.montanaro | 2010-01-13 19:12:34 -0600 (Wed, 13 Jan 2010) | 4 lines Update PyEval_EvalFrame to PyEval_EvalFrameEx. This looks to have been done partially before. Also add a comment describing how this might have to work with different versions of the interpreter. ........ r77487 | ezio.melotti | 2010-01-14 05:34:10 -0600 (Thu, 14 Jan 2010) | 1 line Fixed typo ........ r77561 | georg.brandl | 2010-01-17 02:42:30 -0600 (Sun, 17 Jan 2010) | 1 line #7699: improve datetime docs: straightforward linking to strftime/strptime section, mark classmethods as such. ........ r77570 | georg.brandl | 2010-01-17 06:14:42 -0600 (Sun, 17 Jan 2010) | 1 line Add note about usage of STRINGLIB_EMPTY. ........ r77593 | georg.brandl | 2010-01-17 17:33:53 -0600 (Sun, 17 Jan 2010) | 1 line Fix internal reference. ........ r77603 | benjamin.peterson | 2010-01-18 17:07:56 -0600 (Mon, 18 Jan 2010) | 8 lines data descriptors do not override the class dictionary if __get__ is not defined Adjust documentation and add a test to verify this behavior. See http://mail.python.org/pipermail/python-dev/2010-January/095637.html for discussion. ........ r77608 | gregory.p.smith | 2010-01-19 02:19:03 -0600 (Tue, 19 Jan 2010) | 6 lines Do not compile stubs for the sha2 series hashes in the openssl hashlib module when the openssl version is too old to support them. That leads both compiled code bloat and to unittests attempting to test implementations that don't exist for comparison purposes on such platforms. ........ r77667 | mark.dickinson | 2010-01-21 12:32:27 -0600 (Thu, 21 Jan 2010) | 1 line Add two more test_strtod test values. ........ r77702 | georg.brandl | 2010-01-23 02:43:31 -0600 (Sat, 23 Jan 2010) | 1 line #7762: fix refcount annotation of PyUnicode_Tailmatch(). ........ r77703 | georg.brandl | 2010-01-23 02:47:54 -0600 (Sat, 23 Jan 2010) | 1 line #7725: fix referencing issue. ........ r77739 | benjamin.peterson | 2010-01-24 21:52:52 -0600 (Sun, 24 Jan 2010) | 1 line mention from_float() in error message ........ r77858 | georg.brandl | 2010-01-30 11:57:48 -0600 (Sat, 30 Jan 2010) | 1 line #7802: fix invalid example (heh). ........ r77887 | georg.brandl | 2010-01-31 12:51:49 -0600 (Sun, 31 Jan 2010) | 5 lines Fix-up ftplib documentation: move exception descriptions to toplevel, not inside a class remove attribution in "versionadded" spell and grammar check docstring of FTP_TLS ........ r77889 | michael.foord | 2010-01-31 13:59:26 -0600 (Sun, 31 Jan 2010) | 1 line Minor modification to unittest documentation. ........

author	Benjamin Peterson <benjamin@python.org>
date	Wed, 03 Feb 2010 02:35:45 +0000
parents	1e5b2050ec6a
children	cab14be0ada1

rev	line source
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: diff changeset	1
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Python interpreter main program for frozen scripts */
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: diff changeset	3
2624 6341a4c0082b renaming phase 3 Guido van Rossum <guido@python.org> parents: 2062 diff changeset	4 #include "Python.h"
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	5 #include <locale.h>
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: diff changeset	6
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	7 #ifdef MS_WINDOWS
13663 29da35543833 ANSIfy as many declarations as possible. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	8 extern void PyWinFreeze_ExeInit(void);
29da35543833 ANSIfy as many declarations as possible. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	9 extern void PyWinFreeze_ExeTerm(void);
29da35543833 ANSIfy as many declarations as possible. Thomas Wouters <thomas@python.org> parents: 13658 diff changeset	10 extern int PyInitFrozenExtensions(void);
7846 6c6a48bc5817 Make calls into ../PC/frozen_dllmain.c on MS_WIN32. Guido van Rossum <guido@python.org> parents: 7210 diff changeset	11 #endif
6c6a48bc5817 Make calls into ../PC/frozen_dllmain.c on MS_WIN32. Guido van Rossum <guido@python.org> parents: 7210 diff changeset	12
2892 33b154b6c61b moved stuff around to resemble main.c Guido van Rossum <guido@python.org> parents: 2624 diff changeset	13 /* Main program */
33b154b6c61b moved stuff around to resemble main.c Guido van Rossum <guido@python.org> parents: 2624 diff changeset	14
33b154b6c61b moved stuff around to resemble main.c Guido van Rossum <guido@python.org> parents: 2624 diff changeset	15 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	16 Py_FrozenMain(int argc, char **argv)
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: diff changeset	17 {
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: diff changeset	18 char *p;
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	19 int i, n, sts;
1396 4a286b300b5e Must initialize 'inspect' flag Guido van Rossum <guido@python.org> parents: 1319 diff changeset	20 int inspect = 0;
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1396 diff changeset	21 int unbuffered = 0;
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	22 char *oldloc;
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	23 wchar_t *argv_copy = PyMem_Malloc(sizeof(wchar_t)*argc);
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	24 /* We need a second copies, as Python might modify the first one. */
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	25 wchar_t *argv_copy2 = PyMem_Malloc(sizeof(wchar_t)*argc);
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1396 diff changeset	26
7210 bccdeca81669 Set Py_FrozenFlag, to suppress error messages from getpath.c. Guido van Rossum <guido@python.org> parents: 7116 diff changeset	27 Py_FrozenFlag = 1; /* Suppress errors from getpath.c */
bccdeca81669 Set Py_FrozenFlag, to suppress error messages from getpath.c. Guido van Rossum <guido@python.org> parents: 7116 diff changeset	28
18808 a8b1acc7a21f Add -E command line switch (ignore environment variables like PYTHONHOME Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14375 diff changeset	29 if ((p = Py_GETENV("PYTHONINSPECT")) && *p != '\0')
1318 92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1270 diff changeset	30 inspect = 1;
18808 a8b1acc7a21f Add -E command line switch (ignore environment variables like PYTHONHOME Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14375 diff changeset	31 if ((p = Py_GETENV("PYTHONUNBUFFERED")) && *p != '\0')
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1396 diff changeset	32 unbuffered = 1;
1318 92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1270 diff changeset	33
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1396 diff changeset	34 if (unbuffered) {
6723 c3f85bcb045a Make stdin unbuffered too, when PYTHONUNBUFFERED is specified. Guido van Rossum <guido@python.org> parents: 6055 diff changeset	35 setbuf(stdin, (char *)NULL);
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1396 diff changeset	36 setbuf(stdout, (char *)NULL);
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1396 diff changeset	37 setbuf(stderr, (char *)NULL);
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1396 diff changeset	38 }
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1396 diff changeset	39
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	40 if (!argv_copy) {
49467 1e5b2050ec6a #4004: Missing newline in some startup error messages. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48987 diff changeset	41 fprintf(stderr, "out of memory\n");
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	42 return 1;
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	43 }
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	44
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	45 oldloc = setlocale(LC_ALL, NULL);
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	46 setlocale(LC_ALL, "");
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	47 for (i = 0; i < argc; i++) {
48987 f83dccf417f0 Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin. Antoine Pitrou <solipsis@pitrou.net> parents: 46318 diff changeset	48 #ifdef HAVE_BROKEN_MBSTOWCS
f83dccf417f0 Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin. Antoine Pitrou <solipsis@pitrou.net> parents: 46318 diff changeset	49 size_t argsize = strlen(argv[i]);
f83dccf417f0 Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin. Antoine Pitrou <solipsis@pitrou.net> parents: 46318 diff changeset	50 #else
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	51 size_t argsize = mbstowcs(NULL, argv[i], 0);
48987 f83dccf417f0 Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin. Antoine Pitrou <solipsis@pitrou.net> parents: 46318 diff changeset	52 #endif
f83dccf417f0 Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin. Antoine Pitrou <solipsis@pitrou.net> parents: 46318 diff changeset	53 size_t count;
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	54 if (argsize == (size_t)-1) {
49467 1e5b2050ec6a #4004: Missing newline in some startup error messages. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48987 diff changeset	55 fprintf(stderr, "Could not convert argument %d to string\n", i);
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	56 return 1;
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	57 }
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	58 argv_copy[i] = PyMem_Malloc((argsize+1)*sizeof(wchar_t));
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	59 argv_copy2[i] = argv_copy[i];
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	60 if (!argv_copy[i]) {
49467 1e5b2050ec6a #4004: Missing newline in some startup error messages. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48987 diff changeset	61 fprintf(stderr, "out of memory\n");
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	62 return 1;
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	63 }
48987 f83dccf417f0 Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin. Antoine Pitrou <solipsis@pitrou.net> parents: 46318 diff changeset	64 count = mbstowcs(argv_copy[i], argv[i], argsize+1);
f83dccf417f0 Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin. Antoine Pitrou <solipsis@pitrou.net> parents: 46318 diff changeset	65 if (count == (size_t)-1) {
49467 1e5b2050ec6a #4004: Missing newline in some startup error messages. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48987 diff changeset	66 fprintf(stderr, "Could not convert argument %d to string\n", i);
48987 f83dccf417f0 Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin. Antoine Pitrou <solipsis@pitrou.net> parents: 46318 diff changeset	67 return 1;
f83dccf417f0 Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin. Antoine Pitrou <solipsis@pitrou.net> parents: 46318 diff changeset	68 }
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	69 }
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	70 setlocale(LC_ALL, oldloc);
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	71
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	72 #ifdef MS_WINDOWS
9741 05fb4d966c73 Call PyInitFrozenExtensions() as requested by Mark Hammond (his patch). Guido van Rossum <guido@python.org> parents: 8822 diff changeset	73 PyInitFrozenExtensions();
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	74 #endif /* MS_WINDOWS */
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	75 Py_SetProgramName(argv_copy[0]);
5852 4a4778e61c14 Tracking changes to Py_Main(): Guido van Rossum <guido@python.org> parents: 4503 diff changeset	76 Py_Initialize();
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	77 #ifdef MS_WINDOWS
7846 6c6a48bc5817 Make calls into ../PC/frozen_dllmain.c on MS_WIN32. Guido van Rossum <guido@python.org> parents: 7210 diff changeset	78 PyWinFreeze_ExeInit();
6c6a48bc5817 Make calls into ../PC/frozen_dllmain.c on MS_WIN32. Guido van Rossum <guido@python.org> parents: 7210 diff changeset	79 #endif
5852 4a4778e61c14 Tracking changes to Py_Main(): Guido van Rossum <guido@python.org> parents: 4503 diff changeset	80
2624 6341a4c0082b renaming phase 3 Guido van Rossum <guido@python.org> parents: 2062 diff changeset	81 if (Py_VerboseFlag)
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1396 diff changeset	82 fprintf(stderr, "Python %s\n%s\n",
3621 f158edccc72c grand renaming; added copyright to some files Guido van Rossum <guido@python.org> parents: 2892 diff changeset	83 Py_GetVersion(), Py_GetCopyright());
5852 4a4778e61c14 Tracking changes to Py_Main(): Guido van Rossum <guido@python.org> parents: 4503 diff changeset	84
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	85 PySys_SetArgv(argc, argv_copy);
1318 92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1270 diff changeset	86
2624 6341a4c0082b renaming phase 3 Guido van Rossum <guido@python.org> parents: 2062 diff changeset	87 n = PyImport_ImportFrozenModule("__main__");
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: diff changeset	88 if (n == 0)
2624 6341a4c0082b renaming phase 3 Guido van Rossum <guido@python.org> parents: 2062 diff changeset	89 Py_FatalError("__main__ not frozen");
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: diff changeset	90 if (n < 0) {
2624 6341a4c0082b renaming phase 3 Guido van Rossum <guido@python.org> parents: 2062 diff changeset	91 PyErr_Print();
1318 92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1270 diff changeset	92 sts = 1;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: diff changeset	93 }
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: diff changeset	94 else
1318 92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1270 diff changeset	95 sts = 0;
92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1270 diff changeset	96
1319 cd397266dc1c * Makefile: added all: and default: targets. Guido van Rossum <guido@python.org> parents: 1318 diff changeset	97 if (inspect && isatty((int)fileno(stdin)))
2624 6341a4c0082b renaming phase 3 Guido van Rossum <guido@python.org> parents: 2062 diff changeset	98 sts = PyRun_AnyFile(stdin, "<stdin>") != 0;
1318 92e6a8cf14be * pythonmain.c: -k option, usage message, more environment flags. Guido van Rossum <guido@python.org> parents: 1270 diff changeset	99
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	100 #ifdef MS_WINDOWS
7846 6c6a48bc5817 Make calls into ../PC/frozen_dllmain.c on MS_WIN32. Guido van Rossum <guido@python.org> parents: 7210 diff changeset	101 PyWinFreeze_ExeTerm();
6c6a48bc5817 Make calls into ../PC/frozen_dllmain.c on MS_WIN32. Guido van Rossum <guido@python.org> parents: 7210 diff changeset	102 #endif
6055 72d004971b26 Keep gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5887 diff changeset	103 Py_Finalize();
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	104 for (i = 0; i < argc; i++) {
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	105 PyMem_Free(argv_copy2[i]);
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	106 }
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	107 PyMem_Free(argv_copy);
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 24071 diff changeset	108 PyMem_Free(argv_copy2);
6055 72d004971b26 Keep gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5887 diff changeset	109 return sts;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: diff changeset	110 }

Mercurial > cpython-lru_cache-weakref

annotate Python/frozenmain.c @ 58664:993f703a61ba