comparison Python/pythonrun.c @ 48494:aca5b2e6a66f

Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r64623 | benjamin.peterson | 2008-07-01 21:51:54 +0200 (Tue, 01 Jul 2008) | 1 line write a short little section for multiprocessing; it still needs help ........ r64640 | georg.brandl | 2008-07-01 22:56:03 +0200 (Tue, 01 Jul 2008) | 2 lines Add a comment about incref'ing w. ........ r64665 | jesse.noller | 2008-07-02 18:56:51 +0200 (Wed, 02 Jul 2008) | 1 line Add #!/usr/bin/env python for ben ........ r64687 | andrew.kuchling | 2008-07-03 14:50:03 +0200 (Thu, 03 Jul 2008) | 1 line Tweak wording ........ r64689 | benjamin.peterson | 2008-07-03 14:57:35 +0200 (Thu, 03 Jul 2008) | 1 line lowercase glossary term ........ r64690 | benjamin.peterson | 2008-07-03 15:01:17 +0200 (Thu, 03 Jul 2008) | 1 line let the term be linked ........ r64719 | raymond.hettinger | 2008-07-05 04:11:55 +0200 (Sat, 05 Jul 2008) | 1 line Update comment on prediction macros. ........ r64721 | georg.brandl | 2008-07-05 12:07:18 +0200 (Sat, 05 Jul 2008) | 2 lines Fix tabs. ........ r64735 | mark.dickinson | 2008-07-05 17:25:48 +0200 (Sat, 05 Jul 2008) | 3 lines Minor rewrite of cmath_log to work around a Sun compiler bug. See issue #3168. ........ r64742 | benjamin.peterson | 2008-07-05 18:29:38 +0200 (Sat, 05 Jul 2008) | 1 line make regrtest aware of the lib2to3 resource ........ r64744 | georg.brandl | 2008-07-05 18:43:45 +0200 (Sat, 05 Jul 2008) | 2 lines Keep below 80 chars. ........ r64745 | facundo.batista | 2008-07-05 21:19:50 +0200 (Sat, 05 Jul 2008) | 3 lines Issue 3289. Removed two lines that ended doing nothing. ........ r64746 | facundo.batista | 2008-07-05 22:39:59 +0200 (Sat, 05 Jul 2008) | 4 lines Issue #3239. Differentiate the ascii call from the curses one and the builtin one. ........ r64756 | gregory.p.smith | 2008-07-06 09:16:40 +0200 (Sun, 06 Jul 2008) | 3 lines - Issue #2113: Fix error in subprocess.Popen if the select system call is interrupted by a signal. ........ r64757 | benjamin.peterson | 2008-07-06 14:39:09 +0200 (Sun, 06 Jul 2008) | 1 line remove test_compact_freelists from test_sys ........ r64758 | gregory.p.smith | 2008-07-06 19:06:29 +0200 (Sun, 06 Jul 2008) | 2 lines fix issue3304 - remove an incorrect PyMem_Free in fileio_init ........ r64759 | georg.brandl | 2008-07-06 19:36:20 +0200 (Sun, 06 Jul 2008) | 2 lines Fix opensearch template. ........ r64760 | andrew.kuchling | 2008-07-06 19:43:16 +0200 (Sun, 06 Jul 2008) | 1 line Wording fix ........ r64761 | andrew.kuchling | 2008-07-06 19:44:17 +0200 (Sun, 06 Jul 2008) | 1 line Add two items; rewrap paragraph ........ r64767 | gregory.p.smith | 2008-07-07 06:31:58 +0200 (Mon, 07 Jul 2008) | 4 lines - Issue #3309: Fix bz2.BZFile itererator to release its internal lock properly when raising an exception due to the bz2file being closed. Prevents a deadlock. ........ r64768 | josiah.carlson | 2008-07-07 06:51:46 +0200 (Mon, 07 Jul 2008) | 2 lines Fixed bugs 760475, 953599, and 1519. ........ r64769 | gregory.p.smith | 2008-07-07 06:54:31 +0200 (Mon, 07 Jul 2008) | 2 lines Add commented out #_sha256 and #_sha512 lines per issue 3183. ........ r64771 | gregory.p.smith | 2008-07-07 07:09:12 +0200 (Mon, 07 Jul 2008) | 4 lines - Issue #3094: httplib.HTTPSConnection Host: headers no longer include the redundant ":443" port number designation when the connection is using the default https port (443). ........ r64772 | skip.montanaro | 2008-07-07 13:16:14 +0200 (Mon, 07 Jul 2008) | 2 lines Correct grammar. ........ r64774 | andrew.kuchling | 2008-07-07 18:51:09 +0200 (Mon, 07 Jul 2008) | 1 line Fix example to match text ........ r64775 | facundo.batista | 2008-07-07 19:02:59 +0200 (Mon, 07 Jul 2008) | 3 lines Issue 3306. Better control for a lenght in findmax() function. ........ r64788 | georg.brandl | 2008-07-08 09:05:23 +0200 (Tue, 08 Jul 2008) | 2 lines Add missing ABCs to list. ........ r64793 | nick.coghlan | 2008-07-08 16:21:42 +0200 (Tue, 08 Jul 2008) | 1 line Add missing NEWS and ACK entries for r64791 ........ r64835 | raymond.hettinger | 2008-07-10 11:31:08 +0200 (Thu, 10 Jul 2008) | 1 line Issue 3287: Raise correct exception for float inputs. ........ r64836 | raymond.hettinger | 2008-07-10 12:28:41 +0200 (Thu, 10 Jul 2008) | 1 line Use operator.index() instead of n.__index__(). ........
author Georg Brandl <georg@python.org>
date Wed, 16 Jul 2008 03:43:04 +0000
parents e26c724d5e23
children b51cd5d3795c
comparison
equal deleted inserted replaced
48493:9ebd3f385575 48494:aca5b2e6a66f
227 _PyImportHooks_Init(); 227 _PyImportHooks_Init();
228 228
229 if (install_sigs) 229 if (install_sigs)
230 initsigs(); /* Signal handling stuff, including initintr() */ 230 initsigs(); /* Signal handling stuff, including initintr() */
231 231
232 /* Initialize warnings. */ 232 /* Initialize warnings. */
233 _PyWarnings_Init(); 233 _PyWarnings_Init();
234 if (PySys_HasWarnOptions()) { 234 if (PySys_HasWarnOptions()) {
235 PyObject *warnings_module = PyImport_ImportModule("warnings"); 235 PyObject *warnings_module = PyImport_ImportModule("warnings");
236 if (!warnings_module) 236 if (!warnings_module)
237 PyErr_Clear(); 237 PyErr_Clear();
238 Py_XDECREF(warnings_module); 238 Py_XDECREF(warnings_module);
239 } 239 }
240 240
241 initmain(); /* Module __main__ */ 241 initmain(); /* Module __main__ */
242 if (!Py_NoSiteFlag) 242 if (!Py_NoSiteFlag)
243 initsite(); /* Module site */ 243 initsite(); /* Module site */
244 if (initstdio() < 0) 244 if (initstdio() < 0)
1244 PyErr_NormalizeException(&exception, &v, &tb); 1244 PyErr_NormalizeException(&exception, &v, &tb);
1245 tb = tb ? tb : Py_None; 1245 tb = tb ? tb : Py_None;
1246 PyException_SetTraceback(v, tb); 1246 PyException_SetTraceback(v, tb);
1247 if (exception == NULL) 1247 if (exception == NULL)
1248 return; 1248 return;
1249 /* Now we know v != NULL too */ 1249 /* Now we know v != NULL too */
1250 if (set_sys_last_vars) { 1250 if (set_sys_last_vars) {
1251 PySys_SetObject("last_type", exception); 1251 PySys_SetObject("last_type", exception);
1252 PySys_SetObject("last_value", v); 1252 PySys_SetObject("last_value", v);
1253 PySys_SetObject("last_traceback", tb); 1253 PySys_SetObject("last_traceback", tb);
1254 } 1254 }
2094 2094
2095 #undef PyRun_File 2095 #undef PyRun_File
2096 PyAPI_FUNC(PyObject *) 2096 PyAPI_FUNC(PyObject *)
2097 PyRun_File(FILE *fp, const char *p, int s, PyObject *g, PyObject *l) 2097 PyRun_File(FILE *fp, const char *p, int s, PyObject *g, PyObject *l)
2098 { 2098 {
2099 return PyRun_FileExFlags(fp, p, s, g, l, 0, NULL); 2099 return PyRun_FileExFlags(fp, p, s, g, l, 0, NULL);
2100 } 2100 }
2101 2101
2102 #undef PyRun_FileEx 2102 #undef PyRun_FileEx
2103 PyAPI_FUNC(PyObject *) 2103 PyAPI_FUNC(PyObject *)
2104 PyRun_FileEx(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, int c) 2104 PyRun_FileEx(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, int c)
2105 { 2105 {
2106 return PyRun_FileExFlags(fp, p, s, g, l, c, NULL); 2106 return PyRun_FileExFlags(fp, p, s, g, l, c, NULL);
2107 } 2107 }
2108 2108
2109 #undef PyRun_FileFlags 2109 #undef PyRun_FileFlags
2110 PyAPI_FUNC(PyObject *) 2110 PyAPI_FUNC(PyObject *)
2111 PyRun_FileFlags(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, 2111 PyRun_FileFlags(FILE *fp, const char *p, int s, PyObject *g, PyObject *l,
2112 PyCompilerFlags *flags) 2112 PyCompilerFlags *flags)
2113 { 2113 {
2114 return PyRun_FileExFlags(fp, p, s, g, l, 0, flags); 2114 return PyRun_FileExFlags(fp, p, s, g, l, 0, flags);
2115 } 2115 }
2116 2116
2117 #undef PyRun_SimpleFile 2117 #undef PyRun_SimpleFile
2118 PyAPI_FUNC(int) 2118 PyAPI_FUNC(int)
2119 PyRun_SimpleFile(FILE *f, const char *p) 2119 PyRun_SimpleFile(FILE *f, const char *p)