1992-08-04 09:41:02 -03:00
|
|
|
|
2017-05-24 03:00:52 -03:00
|
|
|
/* Top level execution of Python code (including in __main__) */
|
|
|
|
|
|
|
|
/* To help control the interfaces between the startup, execution and
|
2021-10-06 19:55:27 -03:00
|
|
|
* shutdown code, the phases are split across separate modules (bootstrap,
|
2017-05-24 03:00:52 -03:00
|
|
|
* pythonrun, shutdown)
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* TODO: Cull includes following phase split */
|
1992-08-04 09:41:02 -03:00
|
|
|
|
2021-11-05 06:39:18 -03:00
|
|
|
#include <stdbool.h>
|
|
|
|
|
1997-03-04 20:20:32 -04:00
|
|
|
#include "Python.h"
|
1992-08-04 09:41:02 -03:00
|
|
|
|
2021-03-23 16:47:40 -03:00
|
|
|
#include "pycore_ast.h" // PyAST_mod2obj
|
2021-03-23 20:51:50 -03:00
|
|
|
#include "pycore_compile.h" // _PyAST_Compile()
|
2020-04-14 12:52:15 -03:00
|
|
|
#include "pycore_interp.h" // PyInterpreterState.importlib
|
2020-04-14 23:01:58 -03:00
|
|
|
#include "pycore_object.h" // _PyDebug_PrintTotalRefs()
|
2021-03-23 21:29:09 -03:00
|
|
|
#include "pycore_parser.h" // _PyParser_ASTFromString()
|
2021-04-13 22:36:07 -03:00
|
|
|
#include "pycore_pyerrors.h" // _PyErr_Fetch, _Py_Offer_Suggestions
|
2020-04-14 23:01:58 -03:00
|
|
|
#include "pycore_pylifecycle.h" // _Py_UnhandledKeyboardInterrupt
|
2020-04-14 12:52:15 -03:00
|
|
|
#include "pycore_pystate.h" // _PyInterpreterState_GET()
|
2020-04-14 23:01:58 -03:00
|
|
|
#include "pycore_sysmodule.h" // _PySys_Audit()
|
2021-11-05 06:39:18 -03:00
|
|
|
#include "pycore_traceback.h" // _PyTraceBack_Print_Indented()
|
2020-04-14 23:01:58 -03:00
|
|
|
|
|
|
|
#include "token.h" // INDENT
|
|
|
|
#include "errcode.h" // E_EOF
|
|
|
|
#include "code.h" // PyCodeObject
|
|
|
|
#include "marshal.h" // PyMarshal_ReadLongFromFile()
|
1992-10-18 15:53:57 -03:00
|
|
|
|
2009-01-02 17:24:04 -04:00
|
|
|
#ifdef MS_WINDOWS
|
2020-04-14 23:01:58 -03:00
|
|
|
# include "malloc.h" // alloca()
|
2009-01-02 17:24:04 -04:00
|
|
|
#endif
|
2009-01-02 16:47:48 -04:00
|
|
|
|
2002-06-30 12:26:10 -03:00
|
|
|
#ifdef MS_WINDOWS
|
2020-04-14 23:01:58 -03:00
|
|
|
# undef BYTE
|
|
|
|
# include "windows.h"
|
1995-03-14 11:01:17 -04:00
|
|
|
#endif
|
|
|
|
|
2020-04-14 23:01:58 -03:00
|
|
|
|
2006-04-21 07:40:58 -03:00
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
2006-03-04 15:58:13 -04:00
|
|
|
#endif
|
|
|
|
|
1993-11-01 12:28:59 -04:00
|
|
|
/* Forward */
|
2008-04-10 18:03:09 -03:00
|
|
|
static void flush_io(void);
|
2013-11-06 13:41:07 -04:00
|
|
|
static PyObject *run_mod(mod_ty, PyObject *, PyObject *, PyObject *,
|
2010-05-09 12:52:27 -03:00
|
|
|
PyCompilerFlags *, PyArena *);
|
2020-12-08 09:38:08 -04:00
|
|
|
static PyObject *run_pyc_file(FILE *, PyObject *, PyObject *,
|
2010-05-09 12:52:27 -03:00
|
|
|
PyCompilerFlags *);
|
2017-11-12 11:50:48 -04:00
|
|
|
static int PyRun_InteractiveOneObjectEx(FILE *, PyObject *, PyCompilerFlags *);
|
2020-12-08 09:38:08 -04:00
|
|
|
static PyObject* pyrun_file(FILE *fp, PyObject *filename, int start,
|
|
|
|
PyObject *globals, PyObject *locals, int closeit,
|
|
|
|
PyCompilerFlags *flags);
|
|
|
|
|
2007-10-19 20:16:50 -03:00
|
|
|
|
1992-08-04 09:41:02 -03:00
|
|
|
int
|
2020-12-09 17:37:27 -04:00
|
|
|
_PyRun_AnyFileObject(FILE *fp, PyObject *filename, int closeit,
|
2010-05-09 12:52:27 -03:00
|
|
|
PyCompilerFlags *flags)
|
1992-08-04 09:41:02 -03:00
|
|
|
{
|
2020-12-09 17:37:27 -04:00
|
|
|
int decref_filename = 0;
|
|
|
|
if (filename == NULL) {
|
|
|
|
filename = PyUnicode_FromString("???");
|
|
|
|
if (filename == NULL) {
|
|
|
|
PyErr_Print();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
decref_filename = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int res;
|
|
|
|
if (_Py_FdIsInteractive(fp, filename)) {
|
|
|
|
res = _PyRun_InteractiveLoopObject(fp, filename, flags);
|
|
|
|
if (closeit) {
|
2010-05-09 12:52:27 -03:00
|
|
|
fclose(fp);
|
2020-12-09 17:37:27 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
res = _PyRun_SimpleFileObject(fp, filename, closeit, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (decref_filename) {
|
|
|
|
Py_DECREF(filename);
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2020-12-09 17:37:27 -04:00
|
|
|
return res;
|
1992-08-04 09:41:02 -03:00
|
|
|
}
|
|
|
|
|
2020-12-09 17:37:27 -04:00
|
|
|
|
|
|
|
/* Parse input from a file and execute it */
|
2001-03-21 22:47:58 -04:00
|
|
|
int
|
2020-12-09 17:37:27 -04:00
|
|
|
PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit,
|
|
|
|
PyCompilerFlags *flags)
|
1992-08-04 09:41:02 -03:00
|
|
|
{
|
2020-12-09 17:37:27 -04:00
|
|
|
PyObject *filename_obj;
|
|
|
|
if (filename != NULL) {
|
|
|
|
filename_obj = PyUnicode_DecodeFSDefault(filename);
|
|
|
|
if (filename_obj == NULL) {
|
|
|
|
PyErr_Print();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
filename_obj = NULL;
|
2013-11-06 13:41:07 -04:00
|
|
|
}
|
2020-12-09 17:37:27 -04:00
|
|
|
int res = _PyRun_AnyFileObject(fp, filename_obj, closeit, flags);
|
|
|
|
Py_XDECREF(filename_obj);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2013-11-06 13:41:07 -04:00
|
|
|
|
2020-12-09 17:37:27 -04:00
|
|
|
int
|
|
|
|
_PyRun_InteractiveLoopObject(FILE *fp, PyObject *filename, PyCompilerFlags *flags)
|
|
|
|
{
|
|
|
|
PyCompilerFlags local_flags = _PyCompilerFlags_INIT;
|
2010-05-09 12:52:27 -03:00
|
|
|
if (flags == NULL) {
|
|
|
|
flags = &local_flags;
|
|
|
|
}
|
2020-12-09 17:37:27 -04:00
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
PyObject *v = _PySys_GetAttr(tstate, &_Py_ID(ps1));
|
2010-05-09 12:52:27 -03:00
|
|
|
if (v == NULL) {
|
2022-02-08 16:39:07 -04:00
|
|
|
_PySys_SetAttr(&_Py_ID(ps1), v = PyUnicode_FromString(">>> "));
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_XDECREF(v);
|
|
|
|
}
|
2022-02-08 16:39:07 -04:00
|
|
|
v = _PySys_GetAttr(tstate, &_Py_ID(ps2));
|
2010-05-09 12:52:27 -03:00
|
|
|
if (v == NULL) {
|
2022-02-08 16:39:07 -04:00
|
|
|
_PySys_SetAttr(&_Py_ID(ps2), v = PyUnicode_FromString("... "));
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_XDECREF(v);
|
|
|
|
}
|
2020-12-09 17:37:27 -04:00
|
|
|
|
|
|
|
#ifdef Py_REF_DEBUG
|
|
|
|
int show_ref_count = _Py_GetConfig()->show_ref_count;
|
|
|
|
#endif
|
|
|
|
int err = 0;
|
|
|
|
int ret;
|
|
|
|
int nomem_count = 0;
|
2017-11-12 11:50:48 -04:00
|
|
|
do {
|
|
|
|
ret = PyRun_InteractiveOneObjectEx(fp, filename, flags);
|
|
|
|
if (ret == -1 && PyErr_Occurred()) {
|
|
|
|
/* Prevent an endless loop after multiple consecutive MemoryErrors
|
|
|
|
* while still allowing an interactive command to fail with a
|
|
|
|
* MemoryError. */
|
|
|
|
if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
|
|
|
|
if (++nomem_count > 16) {
|
|
|
|
PyErr_Clear();
|
|
|
|
err = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
nomem_count = 0;
|
|
|
|
}
|
|
|
|
PyErr_Print();
|
|
|
|
flush_io();
|
|
|
|
} else {
|
|
|
|
nomem_count = 0;
|
|
|
|
}
|
2017-09-14 04:35:58 -03:00
|
|
|
#ifdef Py_REF_DEBUG
|
2017-11-20 22:12:22 -04:00
|
|
|
if (show_ref_count) {
|
2017-09-14 04:35:58 -03:00
|
|
|
_PyDebug_PrintTotalRefs();
|
2017-11-20 22:12:22 -04:00
|
|
|
}
|
2017-09-14 04:35:58 -03:00
|
|
|
#endif
|
2017-11-12 11:50:48 -04:00
|
|
|
} while (ret != E_EOF);
|
2013-11-06 13:41:07 -04:00
|
|
|
return err;
|
1992-08-04 09:41:02 -03:00
|
|
|
}
|
|
|
|
|
2020-12-09 17:37:27 -04:00
|
|
|
|
|
|
|
int
|
|
|
|
PyRun_InteractiveLoopFlags(FILE *fp, const char *filename, PyCompilerFlags *flags)
|
|
|
|
{
|
|
|
|
PyObject *filename_obj = PyUnicode_DecodeFSDefault(filename);
|
|
|
|
if (filename_obj == NULL) {
|
|
|
|
PyErr_Print();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int err = _PyRun_InteractiveLoopObject(fp, filename_obj, flags);
|
|
|
|
Py_DECREF(filename_obj);
|
|
|
|
return err;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-11-12 11:50:48 -04:00
|
|
|
/* A PyRun_InteractiveOneObject() auxiliary function that does not print the
|
|
|
|
* error on failure. */
|
|
|
|
static int
|
|
|
|
PyRun_InteractiveOneObjectEx(FILE *fp, PyObject *filename,
|
|
|
|
PyCompilerFlags *flags)
|
1992-08-04 09:41:02 -03:00
|
|
|
{
|
2022-02-08 16:39:07 -04:00
|
|
|
PyObject *m, *d, *v, *w, *oenc = NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
mod_ty mod;
|
|
|
|
PyArena *arena;
|
2016-11-20 04:16:47 -04:00
|
|
|
const char *ps1 = "", *ps2 = "", *enc = NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
int errcode = 0;
|
2022-02-08 16:39:07 -04:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
if (fp == stdin) {
|
2013-04-29 11:23:08 -03:00
|
|
|
/* Fetch encoding from sys.stdin if possible. */
|
2022-02-08 16:39:07 -04:00
|
|
|
v = _PySys_GetAttr(tstate, &_Py_ID(stdin));
|
2013-04-29 11:23:08 -03:00
|
|
|
if (v && v != Py_None) {
|
2022-02-08 16:39:07 -04:00
|
|
|
oenc = PyObject_GetAttr(v, &_Py_ID(encoding));
|
2013-04-29 11:23:08 -03:00
|
|
|
if (oenc)
|
2016-11-20 03:13:07 -04:00
|
|
|
enc = PyUnicode_AsUTF8(oenc);
|
2013-04-29 11:23:08 -03:00
|
|
|
if (!enc)
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2022-02-08 16:39:07 -04:00
|
|
|
v = _PySys_GetAttr(tstate, &_Py_ID(ps1));
|
2010-05-09 12:52:27 -03:00
|
|
|
if (v != NULL) {
|
|
|
|
v = PyObject_Str(v);
|
|
|
|
if (v == NULL)
|
|
|
|
PyErr_Clear();
|
2010-05-18 21:34:15 -03:00
|
|
|
else if (PyUnicode_Check(v)) {
|
2016-11-20 03:13:07 -04:00
|
|
|
ps1 = PyUnicode_AsUTF8(v);
|
2010-05-18 21:34:15 -03:00
|
|
|
if (ps1 == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
ps1 = "";
|
|
|
|
}
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2022-02-08 16:39:07 -04:00
|
|
|
w = _PySys_GetAttr(tstate, &_Py_ID(ps2));
|
2010-05-09 12:52:27 -03:00
|
|
|
if (w != NULL) {
|
|
|
|
w = PyObject_Str(w);
|
|
|
|
if (w == NULL)
|
|
|
|
PyErr_Clear();
|
2010-05-18 21:34:15 -03:00
|
|
|
else if (PyUnicode_Check(w)) {
|
2016-11-20 03:13:07 -04:00
|
|
|
ps2 = PyUnicode_AsUTF8(w);
|
2010-05-18 21:34:15 -03:00
|
|
|
if (ps2 == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
ps2 = "";
|
|
|
|
}
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2021-03-23 22:23:01 -03:00
|
|
|
arena = _PyArena_New();
|
2010-05-09 12:52:27 -03:00
|
|
|
if (arena == NULL) {
|
|
|
|
Py_XDECREF(v);
|
|
|
|
Py_XDECREF(w);
|
|
|
|
Py_XDECREF(oenc);
|
|
|
|
return -1;
|
|
|
|
}
|
2020-04-22 19:29:27 -03:00
|
|
|
|
2021-03-23 21:29:09 -03:00
|
|
|
mod = _PyParser_ASTFromFile(fp, filename, enc, Py_single_input,
|
|
|
|
ps1, ps2, flags, &errcode, arena);
|
2020-04-22 19:29:27 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_XDECREF(v);
|
|
|
|
Py_XDECREF(w);
|
|
|
|
Py_XDECREF(oenc);
|
|
|
|
if (mod == NULL) {
|
2021-03-23 22:23:01 -03:00
|
|
|
_PyArena_Free(arena);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (errcode == E_EOF) {
|
|
|
|
PyErr_Clear();
|
|
|
|
return E_EOF;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
2022-02-08 16:39:07 -04:00
|
|
|
m = PyImport_AddModuleObject(&_Py_ID(__main__));
|
2010-05-09 12:52:27 -03:00
|
|
|
if (m == NULL) {
|
2021-03-23 22:23:01 -03:00
|
|
|
_PyArena_Free(arena);
|
2010-05-09 12:52:27 -03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
d = PyModule_GetDict(m);
|
|
|
|
v = run_mod(mod, filename, d, d, flags, arena);
|
2021-03-23 22:23:01 -03:00
|
|
|
_PyArena_Free(arena);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (v == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
Py_DECREF(v);
|
2014-05-11 08:42:17 -03:00
|
|
|
flush_io();
|
2010-05-09 12:52:27 -03:00
|
|
|
return 0;
|
1992-08-04 09:41:02 -03:00
|
|
|
}
|
|
|
|
|
2017-11-12 11:50:48 -04:00
|
|
|
int
|
|
|
|
PyRun_InteractiveOneObject(FILE *fp, PyObject *filename, PyCompilerFlags *flags)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
|
|
|
|
res = PyRun_InteractiveOneObjectEx(fp, filename, flags);
|
|
|
|
if (res == -1) {
|
|
|
|
PyErr_Print();
|
|
|
|
flush_io();
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2013-11-06 13:41:07 -04:00
|
|
|
int
|
|
|
|
PyRun_InteractiveOneFlags(FILE *fp, const char *filename_str, PyCompilerFlags *flags)
|
|
|
|
{
|
|
|
|
PyObject *filename;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
filename = PyUnicode_DecodeFSDefault(filename_str);
|
|
|
|
if (filename == NULL) {
|
|
|
|
PyErr_Print();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
res = PyRun_InteractiveOneObject(fp, filename, flags);
|
|
|
|
Py_DECREF(filename);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-01-04 16:30:56 -04:00
|
|
|
/* Check whether a file maybe a pyc file: Look at the extension,
|
|
|
|
the file type, and, if we may close it, at the first few bytes. */
|
|
|
|
|
|
|
|
static int
|
2020-12-08 09:38:08 -04:00
|
|
|
maybe_pyc_file(FILE *fp, PyObject *filename, int closeit)
|
2001-01-04 16:30:56 -04:00
|
|
|
{
|
2020-12-08 09:38:08 -04:00
|
|
|
PyObject *ext = PyUnicode_FromString(".pyc");
|
|
|
|
if (ext == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
Py_ssize_t endswith = PyUnicode_Tailmatch(filename, ext, 0, PY_SSIZE_T_MAX, +1);
|
|
|
|
Py_DECREF(ext);
|
|
|
|
if (endswith) {
|
2010-05-09 12:52:27 -03:00
|
|
|
return 1;
|
2020-12-08 09:38:08 -04:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
/* Only look into the file if we are allowed to close it, since
|
|
|
|
it then should also be seekable. */
|
2020-12-08 09:38:08 -04:00
|
|
|
if (!closeit) {
|
|
|
|
return 0;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2020-12-08 09:38:08 -04:00
|
|
|
|
|
|
|
/* Read only two bytes of the magic. If the file was opened in
|
|
|
|
text mode, the bytes 3 and 4 of the magic (\r\n) might not
|
|
|
|
be read as they are on disk. */
|
|
|
|
unsigned int halfmagic = PyImport_GetMagicNumber() & 0xFFFF;
|
|
|
|
unsigned char buf[2];
|
|
|
|
/* Mess: In case of -x, the stream is NOT at its start now,
|
|
|
|
and ungetc() was used to push back the first newline,
|
|
|
|
which makes the current stream position formally undefined,
|
|
|
|
and a x-platform nightmare.
|
|
|
|
Unfortunately, we have no direct way to know whether -x
|
|
|
|
was specified. So we use a terrible hack: if the current
|
|
|
|
stream position is not 0, we assume -x was specified, and
|
|
|
|
give up. Bug 132850 on SourceForge spells out the
|
|
|
|
hopelessness of trying anything else (fseek and ftell
|
|
|
|
don't work predictably x-platform for text-mode files).
|
|
|
|
*/
|
|
|
|
int ispyc = 0;
|
|
|
|
if (ftell(fp) == 0) {
|
|
|
|
if (fread(buf, 1, 2, fp) == 2 &&
|
|
|
|
((unsigned int)buf[1]<<8 | buf[0]) == halfmagic)
|
|
|
|
ispyc = 1;
|
|
|
|
rewind(fp);
|
|
|
|
}
|
|
|
|
return ispyc;
|
2003-04-17 12:24:21 -03:00
|
|
|
}
|
2001-01-04 16:30:56 -04:00
|
|
|
|
2020-12-08 09:38:08 -04:00
|
|
|
|
2013-07-30 16:01:23 -03:00
|
|
|
static int
|
2020-12-08 09:38:08 -04:00
|
|
|
set_main_loader(PyObject *d, PyObject *filename, const char *loader_name)
|
2012-07-15 05:09:52 -03:00
|
|
|
{
|
2020-04-14 10:14:01 -03:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2020-12-08 09:38:08 -04:00
|
|
|
PyObject *bootstrap = PyObject_GetAttrString(interp->importlib,
|
|
|
|
"_bootstrap_external");
|
|
|
|
if (bootstrap == NULL) {
|
|
|
|
return -1;
|
2015-05-02 22:15:18 -03:00
|
|
|
}
|
2020-12-08 09:38:08 -04:00
|
|
|
|
|
|
|
PyObject *loader_type = PyObject_GetAttrString(bootstrap, loader_name);
|
|
|
|
Py_DECREF(bootstrap);
|
2012-07-15 06:10:39 -03:00
|
|
|
if (loader_type == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
2020-12-08 09:38:08 -04:00
|
|
|
|
|
|
|
PyObject *loader = PyObject_CallFunction(loader_type,
|
|
|
|
"sO", "__main__", filename);
|
2012-07-15 10:21:08 -03:00
|
|
|
Py_DECREF(loader_type);
|
|
|
|
if (loader == NULL) {
|
2012-07-15 05:09:52 -03:00
|
|
|
return -1;
|
|
|
|
}
|
2020-12-08 09:38:08 -04:00
|
|
|
|
2012-07-15 10:21:08 -03:00
|
|
|
if (PyDict_SetItemString(d, "__loader__", loader) < 0) {
|
2020-12-08 09:38:08 -04:00
|
|
|
Py_DECREF(loader);
|
|
|
|
return -1;
|
2012-07-15 10:21:08 -03:00
|
|
|
}
|
2012-07-15 05:09:52 -03:00
|
|
|
Py_DECREF(loader);
|
2020-12-08 09:38:08 -04:00
|
|
|
return 0;
|
2012-07-15 05:09:52 -03:00
|
|
|
}
|
|
|
|
|
2020-12-08 09:38:08 -04:00
|
|
|
|
2020-12-08 19:32:54 -04:00
|
|
|
int
|
|
|
|
_PyRun_SimpleFileObject(FILE *fp, PyObject *filename, int closeit,
|
|
|
|
PyCompilerFlags *flags)
|
2010-05-09 12:52:27 -03:00
|
|
|
{
|
|
|
|
PyObject *m, *d, *v;
|
2012-11-07 04:02:24 -04:00
|
|
|
int set_file_name = 0, ret = -1;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
m = PyImport_AddModule("__main__");
|
|
|
|
if (m == NULL)
|
|
|
|
return -1;
|
2012-11-07 04:02:24 -04:00
|
|
|
Py_INCREF(m);
|
2010-05-09 12:52:27 -03:00
|
|
|
d = PyModule_GetDict(m);
|
2020-10-26 03:43:39 -03:00
|
|
|
if (_PyDict_GetItemStringWithError(d, "__file__") == NULL) {
|
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
goto done;
|
|
|
|
}
|
2020-12-08 09:38:08 -04:00
|
|
|
if (PyDict_SetItemString(d, "__file__", filename) < 0) {
|
2012-11-07 04:02:24 -04:00
|
|
|
goto done;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2011-09-20 15:45:44 -03:00
|
|
|
if (PyDict_SetItemString(d, "__cached__", Py_None) < 0) {
|
2012-11-07 04:02:24 -04:00
|
|
|
goto done;
|
2011-09-20 15:45:44 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
set_file_name = 1;
|
|
|
|
}
|
2020-12-08 09:38:08 -04:00
|
|
|
|
|
|
|
int pyc = maybe_pyc_file(fp, filename, closeit);
|
|
|
|
if (pyc < 0) {
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pyc) {
|
2012-09-11 10:47:28 -03:00
|
|
|
FILE *pyc_fp;
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Try to run a pyc file. First, re-open in binary */
|
2020-12-08 09:38:08 -04:00
|
|
|
if (closeit) {
|
2010-05-09 12:52:27 -03:00
|
|
|
fclose(fp);
|
2020-12-08 09:38:08 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
pyc_fp = _Py_fopen_obj(filename, "rb");
|
|
|
|
if (pyc_fp == NULL) {
|
2010-05-09 12:52:27 -03:00
|
|
|
fprintf(stderr, "python: Can't reopen .pyc file\n");
|
|
|
|
goto done;
|
|
|
|
}
|
2012-07-15 05:09:52 -03:00
|
|
|
|
|
|
|
if (set_main_loader(d, filename, "SourcelessFileLoader") < 0) {
|
|
|
|
fprintf(stderr, "python: failed to set __main__.__loader__\n");
|
|
|
|
ret = -1;
|
2012-09-11 10:47:28 -03:00
|
|
|
fclose(pyc_fp);
|
2012-07-15 05:09:52 -03:00
|
|
|
goto done;
|
|
|
|
}
|
2020-12-08 09:38:08 -04:00
|
|
|
v = run_pyc_file(pyc_fp, d, d, flags);
|
2010-05-09 12:52:27 -03:00
|
|
|
} else {
|
2012-07-15 05:09:52 -03:00
|
|
|
/* When running from stdin, leave __main__.__loader__ alone */
|
2020-12-08 09:38:08 -04:00
|
|
|
if (PyUnicode_CompareWithASCIIString(filename, "<stdin>") != 0 &&
|
2012-07-15 05:09:52 -03:00
|
|
|
set_main_loader(d, filename, "SourceFileLoader") < 0) {
|
|
|
|
fprintf(stderr, "python: failed to set __main__.__loader__\n");
|
|
|
|
ret = -1;
|
|
|
|
goto done;
|
|
|
|
}
|
2020-12-08 09:38:08 -04:00
|
|
|
v = pyrun_file(fp, filename, Py_file_input, d, d,
|
|
|
|
closeit, flags);
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
flush_io();
|
|
|
|
if (v == NULL) {
|
2018-07-03 16:47:22 -03:00
|
|
|
Py_CLEAR(m);
|
2010-05-09 12:52:27 -03:00
|
|
|
PyErr_Print();
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
Py_DECREF(v);
|
|
|
|
ret = 0;
|
Merged revisions 53952-54987 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines
Do not copy free variables to locals in class namespaces.
Fixes bug 1569356, but at the cost of a minor incompatibility in
locals(). Add test that verifies that the class namespace is not
polluted. Also clarify the behavior in the library docs.
Along the way, cleaned up the dict_to_map and map_to_dict
implementations and added some comments that explain what they do.
........
r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines
Fix assertion.
........
r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines
When printing an unraisable error, don't print exceptions. before the name.
This duplicates the behavior whening normally printing exceptions.
........
r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line
Markup fix
........
r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines
SF #1669182, 2.5 was already fixed. Just assert in 2.6 since string exceptions
are gone.
........
r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line
Add some items
........
r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines
Fix long-standing bug in name mangling for package imports
Reported by Mike Verdone.
........
r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines
tabify
........
r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines
tabify
Note that ast.c still has a mix of tabs and spaces, because it
attempts to use four-space indents for more of the new code.
........
r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines
whitespace normalization
........
r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines
Add checking for a number of metaclass error conditions.
We add some new rules that are required for preserving internal
invariants of types.
1. If type (or a subclass of type) appears in bases, it must appear
before any non-type bases. If a non-type base (like a regular
new-style class) occurred first, it could trick type into
allocating the new class an __dict__ which must be impossible.
2. There are several checks that are made of bases when creating a
type. Those checks are now repeated when assigning to __bases__.
We also add the restriction that assignment to __bases__ may not
change the metaclass of the type.
Add new tests for these cases and for a few other oddball errors that
were no previously tested. Remove a crasher test that was fixed.
Also some internal refactoring: Extract the code to find the most
derived metaclass of a type and its bases. It is now needed in two
places. Rewrite the TypeError checks in test_descr to use doctest.
The tests now clearly show what exception they expect to see.
........
r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines
Add news about changes to metaclasses and __bases__ error checking.
........
r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines
Modify the segfaulting example to show why r53997 is not a solution to
it.
........
r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines
Add a test for instantiating SyntaxError with no arguments.
........
r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line
Docstring nit.
........
r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line
Prepare collections module for pure python code entries.
........
r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line
Add collections.NamedTuple
........
r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line
Add Pat and Eric for work on PEP 3101 in the sandbox
........
r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line
Add NamedTuple
........
r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines
Bug #1628895: some better tries to find HTML documentation in pydoc.
........
r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line
Fix embarrassing typo and fix constantification of None
........
r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines
Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize.
........
r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines
Fix a bug in test_dict and test_userdict, found at the PyPy sprint.
........
r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines
Teach setup.py how to find Berkeley DB on Macs using MacPorts.
........
r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line
note MacPorts/BerkDB change in setup.py
........
r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line
Added Pete for 3101 too
........
r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line
Minor corrections to docs, and an explanation comentary
........
r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines
Patch #1674228: when assigning a slice (old-style), check for the
sq_ass_slice instead of the sq_slice slot.
........
r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines
Nit: a struct field is set to GenericAlloc, not GenericAlloc().
........
r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1671450: add a section about subclassing builtin types to the
"extending and embedding" tutorial.
........
r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1121142: Implement ZipFile.open.
........
r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines
A test case for the fix in #1674228.
........
r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1672481: fix bug in idlelib.MultiCall.
........
r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line
Bug #1674503: close the file opened by execfile() in an error condition.
........
r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines
Fix another reincarnation of bug #1576657 in defaultdict.
........
r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines
A test case for the defaultdict KeyError bug.
........
r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1663234: you can now run doctest on test files and modules
using "python -m doctest [-v] filename ...".
........
r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #912410: Replace HTML entity references for attribute values
in HTMLParser.
........
r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line
patch 1673619 - identify extension modules which cannot be built
........
r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines
Patch #1646728: datetime.fromtimestamp fails with negative
fractional times. With unittest.
Somebody please backport to 2.5.
........
r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines
Fix cmp vs. key argument for list.sort.
........
r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines
Small nit, found by Neal.
........
r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1602128: clarify that richcmp methods can return NotImplemented
and should return True or False otherwise.
........
r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1638879: don't accept strings with embedded NUL bytes in long().
........
r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1673121: update README wrt. OSX default shell.
........
r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1654417: make operator.{get,set,del}slice use the full range
of Py_ssize_t.
........
r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines
Patch for bug #1633621: if curses.resizeterm() or
curses.resize_term() is called, update _curses.LINES,
_curses.COLS, curses.LINES and curses.COLS.
........
r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Document change to curses.
........
r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines
Variant of patch #697613: don't exit the interpreter on a SystemExit
exception if the -i command line option or PYTHONINSPECT environment
variable is given, but break into the interactive interpreter just like
on other exceptions or normal program exit.
(backport)
........
r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines
Patch #703779: unset __file__ in __main__ after running a file. This
makes the filenames the warning module prints much more sensible when
a PYTHONSTARTUP file is used.
........
r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines
add versionadded info
........
r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler.
........
r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines
Patch #1001604: glob.glob() now returns unicode filenames if it was
given a unicode argument and os.listdir() returns unicode filenames.
........
r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines
Patches #1550273, #1550272: fix a few bugs in unittest and add a
comprehensive test suite for the module.
........
r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines
Patch #787789: allow to pass custom TestRunner instances to unittest's
main() function.
........
r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines
Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position.
........
r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines
Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', '').
........
r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines
Patch #1675471: convert test_pty to unittest.
........
r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines
Add some sanity checks to unittest.TestSuite's addTest(s) methods.
Fixes #878275.
........
r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines
Windows doesn't support negative timestamps. Skip the tests involving them
if os.name == "nt".
........
r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines
Add missing ) in parenthical remark.
........
r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines
Fix #1676656: \em is different from \emph...
........
r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines
Add a NEWS entry for rev. 54207,8.
........
r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line
SF 1676321: empty() returned wrong result
........
r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line
Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order.
........
r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line
SF #1637850: make_table in difflib did not work with unicode
........
r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line
Patch #1668482: don't use '-' in mkstemp
........
r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines
Introduce test.test_support.TransientResource. It's a context manager to
surround calls to resources that may or may not be available. Specifying the
expected exception and attributes to be raised if the resource is not available
prevents overly broad catching of exceptions.
This is meant to help suppress spurious failures by raising
test.test_support.ResourceDenied if the exception matches. It would probably
be good to go through the various network tests and surround the calls to catch
connection timeouts (as done with test_socket_ssl in this commit).
........
r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line
Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py
........
r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line
Add NEWS item for patch #1481079 (r54234).
........
r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line
Fix SF #1676971, Complex OverflowError has a typo
........
r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines
Typo.
........
r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines
Patch #957003: Implement smtplib.LMTP.
........
r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines
Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822.
........
r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines
Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0)
returned string up to the first NUL character.
........
r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines
Add Ziga Seilnacht.
........
r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines
Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError.
........
r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines
Bug #1651235: When a tuple was passed to a ctypes function call,
Python would crash instead of raising an error.
The crash was caused by a section of code that should have been
removed long ago, at that time ctypes had other ways to pass
parameters to function calls.
........
r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line
Hashing simplification pointed out by Thomas Wouters.
........
r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines
* Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink.
* Drop safe_remove() in favor of test_support.unlink().
* Fix the indentation of test_samefile so that it runs.
........
r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines
Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket.
Will backport.
........
r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines
Simplify a little by handling the TCP case first.
Update to use predominant style of spaces around = in args list
and print to stderr if debugging.
........
r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line
Add proper attribution for a bug fix.
........
r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines
Typos.
........
r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line
Convert an assert to a raise so it works even in the presence of -O.
........
r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines
Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer.
........
r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines
Add missing "return" statements in exception handler.
........
r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines
Patch #1675981: remove unreachable code from type.__new__() method.
__dict__ and __weakref__ are removed from the slots tuple earlier
in the code, in the loop that mangles slot names. Will backport.
........
r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines
Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number.
Will backport.
........
r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line
Fix resource leak reported in SF #1516995.
........
r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines
Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more
stable FTP.
Will backport.
........
r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines
Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the
display name of an email address, e.g.
Foo
\tBar <foo@example.com>
Test case added by Barry.
........
r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines
Sane humans would call these invalid tests, but Andrew McNamara pointed out
that given the inputs in these tests Excel does indeed produce the output
these tests expect. Document that for future confused folks.
........
r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines
Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86.
........
r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines
Patch #1677862: Require a space or tab after import in .pth files.
........
r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines
Backport from Py3k branch:
Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir.
Had to change a few bits of the patch because classobjs and __methods__ are still
in Py2.6.
........
r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines
Bug #1678647: write a newline after printing an exception in any
case, even when converting the value to a string failed.
........
r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line
Patch #1678088: convert test_operations to use unittest, fold the result into test_dict.
........
r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines
Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167.
Will backport.
........
r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines
Typo fix.
........
r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line
Patch #1670993: Refactor test_threadedtempfile.py to use unittest.
........
r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines
Whitespace normalization.
........
r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines
Set missing svn:eol-style property on text files.
........
r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines
Add test.test_support.transient_internet . Returns a context manager that
nests test.test_support.TransientResource context managers that capture
exceptions raised when the Internet connection is flaky.
Initially using in test_socket_ssl but should probably be expanded to cover any
test that should not raise the captured exceptions if the Internet connection
works.
........
r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines
Fix a typo where the variable name was not updated.
........
r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line
Add Jerry Seutter for a bunch of his recent patches refactoring tests
........
r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines
Add some other acks for recent checkins:
Brian Leair - 922167
Tomer Filiba - 1591665
Jeremy Jones - 1192590
........
r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines
Fix some style nits:
* lines too long
* wrong indentation
* space after a function name
* wrong function name in error string
* simplifying some logic
Also add an error check to PyDict_SetItemString.
........
r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines
Typo and grammar fixes.
........
r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1679379: add documentation for fnmatch.translate().
........
r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1642844: comments to clarify the complexobject constructor.
........
r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1668100: urllib2 now correctly raises URLError instead of
OSError if accessing a local file via the file:// protocol fails.
........
r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1635454: the csv.DictWriter class now includes the offending
field names in its exception message if you try to write a record with
a dictionary containing fields not in the CSV field names list.
........
r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1555098: use str.join() instead of repeated string
concatenation in robotparser.
........
r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to
pydoc's help keywords.
........
r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1569798: fix a bug in distutils when building Python from a
directory within sys.exec_prefix.
........
r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1449244: Support Unicode strings in
email.message.Message.{set_charset,get_content_charset}.
Will backport.
........
r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines
This is the implementation of POSIX.1-2001 (pax) format read/write
support.
The TarInfo class now contains all necessary logic to process and
create tar header data which has been moved there from the TarFile
class. The fromtarfile() method was added. The new path and linkpath
properties are aliases for the name and linkname attributes in
correspondence to the pax naming scheme.
The TarFile constructor and classmethods now accept a number of
keyword arguments which could only be set as attributes before (e.g.
dereference, ignore_zeros). The encoding and pax_headers arguments
were added for pax support. There is a new tarinfo keyword argument
that allows using subclassed TarInfo objects in TarFile.
The boolean TarFile.posix attribute is deprecated, because now three
tar formats are supported. Instead, the desired format for writing is
specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT
as the format keyword argument. This change affects TarInfo.tobuf()
as well.
The test suite has been heavily reorganized and partially rewritten.
A new testtar.tar was added that contains sample data in many formats
from 4 different tar programs.
Some bugs and quirks that also have been fixed:
Directory names do no longer have a trailing slash in TarInfo.name or
TarFile.getnames().
Adding the same file twice does not create a hardlink file member.
The TarFile constructor does no longer need a name argument.
The TarFile._mode attribute was renamed to mode and contains either
'r', 'w' or 'a'.
........
r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines
Bug #1622896: fix a rare corner case where the bz2 module raised an
error in spite of a succesful compression.
........
r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines
Quick fix for tests that fail on systems with an encoding other
than 'iso8859-1'.
........
r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1603688: ConfigParser.SafeConfigParser now checks values that
are set for invalid interpolation sequences that would lead to errors
on reading back those values.
........
r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1581073: add a flag to textwrap that prevents the dropping of
whitespace while wrapping.
........
r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1605192: list allowed states in error messages for imaplib.
........
r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter
which can be set to False to prevent the default delete-on-close
behavior.
........
r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines
Add acks for recent patch checkins:
Arvin Schnell - 1668482
S?\195?\169bastien Martini - 1481079
Heiko Wundram - 1491866
Damon Kohler - 1545011
Peter Parente - 1599845
Bjorn Lindqvist - 1678662
........
r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines
Acks for recent patches.
........
r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines
Fix a tab.
........
r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1533909: the timeit module now accepts callables in addition to
strings for the code to time and the setup code. Also added two
convenience functions for instantiating a Timer and calling its methods.
........
r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1530482: add pydoc.render_doc() which returns the documentation
for a thing instead of paging it to stdout, which pydoc.doc() does.
........
r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line
Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl.
........
r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1444529: the builtin compile() now accepts keyword arguments.
(backport)
........
r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line
Add versionadded marker for ctypes.c_bool.
........
r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1393667: pdb now has a "run" command which restarts the debugged
Python program, optionally with different arguments.
........
r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines
Deprecate commands.getstatus().
........
r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines
NEWS entry for getstatus() deprecation.
........
r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1429539: pdb now correctly initializes the __main__ module for
the debugged script, which means that imports from __main__ work
correctly now.
........
r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #957650: "%var%" environment variable references are now properly
expanded in ntpath.expandvars(), also "~user" home directory references
are recognized and handled on Windows.
........
r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1194449: correctly detect unbound methods in pydoc.
........
r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines
Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters
with ASCII value less than 32. Also, it correctly quotes dots only if
they occur on a single line, as opposed to the previous behavior of
quoting dots if they are the second character of any line.
........
r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line
Inline PyImport_GetModulesReloading().
........
r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines
SF bug #1582282; decode_header() incorrectly splits not-conformant RFC
2047-like headers where there is no whitespace between encoded words. This
fix changes the matching regexp to include a trailing lookahead assertion that
the closing ?= must be followed by whitespace, newline, or end-of-string.
This also changes the regexp to add the MULTILINE flag.
........
r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines
correct order and names of the less often used keyword parameters.
........
r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines
Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9"
now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform
items are all OS X special API specific since OS X is unixy enough for these modules
to be available out of the box.
........
r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines
Bug #767111: fix long-standing bug in urllib which caused an
AttributeError instead of an IOError when the server's response didn't
contain a valid HTTP status line.
........
r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
name. Remove a reference leak that happened if the name could not be
converted to string. Will backport.
........
r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines
Patch #1559413: Fix test_cmd_line if sys.executable contains a space.
Will backport.
........
r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines
Note how test_socket_ssl has various exceptions that deal with a flaky Net
connection are silenced.
........
r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines
Raise ResourceDenied in test_urllib2net when the Net connection goes bad.
........
r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line
Wrap a long line and fix a typo (is -> if)
........
r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1680978: consistently use "alive" instead of "active" in the
thread lib doc.
........
r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1681153: the wave module now closes a file object it opened if
initialization failed.
........
r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
the implementation for __reduce__ and __reduce_ex__ into two separate
functions. Fixes bug #931877. Will backport.
........
r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements.
Will backport.
........
r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines
Bug #1681228: the webbrowser module now correctly uses the default
GNOME or KDE browser, depending on whether there is a session of one
of those present. Also, it tries the Windows default browser before
trying Mozilla variants.
(backport)
........
r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines
Patch #1273829: os.walk() now has a "followlinks" parameter. If set to
True (which is not the default), it visits symlinks pointing to
directories.
........
r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines
Add \versionadded tag.
........
r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines
RFE #1670167: fix in isinstance() docs.
........
r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines
Patch #1623563: allow __class__ assignment for classes with __slots__.
The old and the new class are still required to have the same slot
names, but the order in which they are specified is not relevant.
........
r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines
Whitespace cleanup. Also remove the empty lines
from the previous check in.
........
r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines
Remove warning: funcion declaration isn't a prototype
........
r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines
Clean up formatting of this file.
The file should now follow PEP 7, except that it uses 4 space indents
(in the style of Py3k). This particular code would be really hard to
read with the regular tab idents.
Other changes:
- reflow long lines
- change multi-line conditionals to have test at end of line
........
r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line
Patch #1676994: Refactor test_popen2 to use unittest.
........
r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line
Remove test/output/test_popen2 (missed in r54417).
........
r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line
Patch 1339796: add a relpath() function to os.path.
........
r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines
Patch #1675423: PyComplex_AsCComplex() now tries to convert an object
to complex using its __complex__() method before falling back to the
__float__() method. Therefore, the functions in the cmath module now
can operate on objects that define a __complex__() method.
(backport)
........
r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines
move note to the correct section
........
r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines
Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf.
........
r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines
Patch #1678339: test case for bug in difflib.
........
r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line
Patch #1630118: add a SpooledTemporaryFile class to tempfile.
........
r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines
Patch #1683328: fixes and enhancements for "unparse" demo.
........
r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line
Add some doc that was left out from some change to platform.py
........
r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line
Add a comment about 3k migration
........
r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line
Get rid of deprecation warning when testing commands.getstatus()
........
r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines
Try backing out 54407 to see if it corrects the problems on the Windows
buildbots. This rev was backported, so we will need to keep both branches
in sync, pending the outcome of the test after this checkin.
........
r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line
Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-)
........
r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line
Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-)
........
r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines
Try to be a little more resilient to errors. This might help the test
pass, but my guess is that it won't. I'm guessing that some other
test is leaving this file open which means it can't be removed
under Windows AFAIK.
........
r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines
Try to get test_urllib to pass on Windows by closing the file.
I'm guessing that's the problem. h.getfile() must be called *after*
h.getreply() and the fp can be None.
I'm not entirely convinced this is the best fix (or even correct).
The buildbots will tell us if things improve or not. I don't
know if this needs to be backported (assuming it actually works).
........
r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line
Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability.
........
r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines
Fix for glob.py if filesystem encoding is None.
........
r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line
Remove unused file spotted by Paul Hankin
........
r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines
Patch #1682205: a TypeError while unpacking an iterable is no longer
masked by a generic one with the message "unpack non-sequence".
........
r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines
New test for rev. 54407 which only uses directories under TESTFN.
........
r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines
Patch #1684834: document some utility C API functions.
........
r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines
Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'.
........
r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line
Add comments on maintenance of this file
........
r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line
Fix sentence, and fix typo in example
........
r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line
Put code examples at left margin instead of indenting them
........
r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line
Minor clarification, saying that blocking means no timeout (from bug #882297)
........
r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines
Bug #1675967: re patterns pickled with older Python versions can
now be unpickled. Will backport.
........
r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line
Add test and fix for fromkeys() optional argument.
........
r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines
Bug #1685704: use -m switch in timeit docs.
........
r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines
Back out "Patch #1643874: memory leak in ctypes fixed."
The code in this patch leaves no way to give up the ownership of a
BSTR instance.
........
r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines
Explain the purpose of the b_needsfree flag (forward ported from release25-maint).
........
r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines
- Bug #1683368: The object.__init__() and object.__new__() methods are
now stricter in rejecting excess arguments. The only time when
either allows excess arguments is when it is not overridden and the
other one is. For backwards compatibility, when both are
overridden, it is a deprecation warning (for now; maybe a Py3k
warning later).
When merging this into 3.0, the warnings should become errors.
Note: without the change to string.py, lots of spurious warnings happen.
What's going on there?
........
r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line
Add Mark Dickinson for SF # 1675423.
........
r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines
Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}.
Will backport.
........
r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines
Bug #978833: Revert r50844, as it broke _socketobject.dup.
Will backport.
........
r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines
Add a type.__init__() method that enforces the same signature as
type.__new__(), and then calls object.__init__(cls), just to be anal.
This allows us to restore the code in string.py's _TemplateMetaclass
that called super(...).__init__(name, bases, dct), which I commented
out yesterday since it broke due to the stricter argument checking
added to object.__init__().
........
r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines
Added a 'create_connect()' function to socket.py, which creates a
connection with an optional timeout, and modified httplib.py to
use this function in HTTPConnection. Applies patch 1676823.
........
r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines
Add note about type.__init__().
........
r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines
Prevent creation (followed by a segfault) of array types when the size
overflows the valid Py_ssize_t range. Check return values of
PyMem_Malloc.
Will backport to release25-maint.
........
r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines
Surrounded with try/finally to socket's default timeout setting
changes in the tests, so failing one test won't produce strange
results in others. Also relaxed the timeout settings in the test
(where actually the value didn't mean anything).
........
r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line
Make test_relpath() pass on Windows.
........
r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines
Patch #1489771: update syntax rules in Python Reference Manual.
Python 2.5 added support for explicit relative import statements and
yield expressions, which were missing in the manual.
Also fix grammar productions that used the names from the Grammar file,
markup that broke the generated grammar.txt, and wrap some lines that
broke the pdf output. Will backport.
........
r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines
Remove typo accent.
........
r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines
Revert accidental change.
........
r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines
Change the docs to no longer claim that unittest is preferred over doctest for
regression tests.
........
r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines
Redone the tests, using the infrastructure already present
for threading and socket serving.
........
r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines
Closing the HTTP connection after each test, and listening more.
........
r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines
Markup fix.
........
r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines
Markup fix.
........
r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines
Added an optional timeout to FTP class. Also I started a test_ftplib.py
file to test the ftp lib (right now I included a basic test, the timeout
one, and nothing else).
........
r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines
Some nits.
........
r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines
Forgot to add the file before the previous commit, here go
the ftplib tests.
........
r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines
Added an optional timeout to poplib.POP3. Also created a
test_poplib.py file with a basic test and the timeout
ones. Docs are also updated.
........
r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines
The basic test cases of poplib.py.
........
r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines
Bug 1688393. Adds a control of negative values in
socket.recvfrom, which caused an ugly crash.
........
r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines
Added timeout to smtplib (to SMTP and SMTP_SSL). Also created
the test_smtplib.py file, with a basic test and the timeout
ones. Docs are updated too.
........
r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines
Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file.
Thanks to Jerry Seutter for all three patches.
........
r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line
Make test_zipfile clean up its temporary files properly.
........
r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines
These are actually methods.
........
r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines
In Windows' time.clock(), when QueryPerformanceFrequency() fails,
the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC
as for the POSIX implementation (thanks to #pypy).
........
r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines
Added timout parameter to telnetlib.Telnet. Also created
test_telnetlib.py with a basic test and timeout ones.
Docs are also updated.
........
r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines
Added the posibility to pass the timeout to FTP.connect, not only when
instantiating the class. Docs and tests are updated.
........
r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line
Bug #1688274: add documentation for C-level class objects.
........
r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines
Bump the patch level version of distutils since there were a few bug fixes since
the 2.5.0 release.
........
r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines
Label name fix.
........
r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines
Duplicate label fix.
........
r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line
Add item. (Oops, accidentally checked this in on my branch)
........
r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines
Duplicate label fix.
........
r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines
repair string literal.
........
r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines
Markup fix.
........
r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines
Duplicate label fix.
........
r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines
Typo fix.
........
r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line
Fix method names. Will backport.
........
r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines
Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS
returned by python-config if Python was built with --enable-shared
because that prevented the shared library from being used.
........
r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line
Shut up an occaisonal buildbot error due to test files being left around.
........
r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines
SF #1685563, MSVCCompiler creates redundant and long PATH strings
If MSVCCompiler.initialize() was called multiple times, the path
would get duplicated. On Windows, this is a problem because the
path is limited to 4k. There's no benefit in adding a path multiple
times, so prevent that from occuring. We also normalize the path
before checking for duplicates so things like /a and /a/ won't both
be stored.
Will backport.
........
r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines
time.strptime's caching of its locale object was being recreated when the
locale changed but not used during the function call it was recreated during.
The test in this checkin is untested (OS X does not have the proper locale
support for me to test), although the fix for the bug this deals with
was tested by the OP (#1290505). Once the buildbots verify the test at least
doesn't fail it becomes a backport candidate.
........
r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines
Fix the test for recreating the locale cache object by not worrying about if
one of the test locales cannot be set.
........
r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines
Fix a lot of markup and meta-information glitches.
........
r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines
Another fix.
........
r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines
Lots of explicit class names for method and member descs.
........
r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines
Explicit class names.
........
r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines
Some semantic fixes.
........
r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines
Remove bogus entry.
........
r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines
Fix the class name of strings.
........
r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line
SF #1693079: Cannot save empty array in shelve
........
r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines
Array module's buffer interface can now handle empty arrays.
........
r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines
Fix warnings about object.__init__() signature.
Two (test_array and test_descr) were bug IMO; the third (copy_reg)
is a work-around which recognizes that object.__init__() doesn't do
anything.
........
r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line
SF 1602378 Clarify docstrings for bisect
........
r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines
SF #1382213: Tutorial section 9.5.1 ignores MRO for new-style classes
........
r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines
- Fix an off-by-one bug in locale.strxfrm().
patch taken from http://bugs.debian.org/416934.
........
r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines
Fix the strange case of
\begin{methoddesc}[NNTP]{...}
where
\ifx#1\@undefined ended up comparing N and N, therefore executing
the true part of the conditional, blowing up at \@undefined.
........
r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines
Now using unittest for the tests infraestructure. Also split the
tests in those who need the network, and that who doesn't.
........
r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines
Move the functionality for catching warnings in test_warnings.py into a separate
class to that reusing the functionality in test_structmembers.py doesn't rerun
the tests from test_warnings.py.
........
r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines
Document that CatchWarningTests is reused by test_structmembers.py.
........
r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines
Add tests for the filename.
Test that the stacklevel is handled correctly.
........
r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines
Added a SSL server to test_socket_ssl.py to be able to test
locally. Now, it checks if have openssl available and run
those specific tests (it starts openssl at the beggining of
all the tests and then kills it at the end).
........
r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines
Implement a contextmanager test.test_support.catch_warning that can
be used to catch the last warning issued by the warning framework.
Change test_warnings.py and test_structmembers.py to use this
new contextmanager.
........
r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines
Changed the whole structure of startup and checking if the
server is available. Hope to not get more false alarms.
........
r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines
Fixed the way that the .pem files are looked for, and changed
how to kill the process in win32 to use the _handle attribute.
........
r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines
Fix a race condition in this test -- instead of assuming that it will take
the test server thread at most 0.5 seconds to get ready, use an event
variable.
........
r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line
Clean up imports.
........
r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line
Stop using test_support.verify().
........
r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines
Bug #1686475: Support stat'ing open files on Windows again.
Will backport to 2.5.
........
r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line
Make test_getopt use unittest.
........
r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line
Make test_softspace use unittest.
........
r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines
Fix WalkTests.test_traversal() on Windows. The cleanup in
MakedirTests.setUp() can now be removed.
........
r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines
Bug #1563759: struct.unpack doens't support buffer protocol objects
........
r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line
Convert test_long_future to use unittest.
........
r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line
Convert test_normalization to use unittest.
........
r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line
Some grammar fixes
........
r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_stringprep to use unittest.
........
r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line
Import cleanup in test_crypt.
........
r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_gc to use unittest.
........
r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_module to use unittest.
........
r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_fileinput to use unittest.
........
r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines
Doc that file.next() has undefined behaviour when called on a file opened with
'w'. Closes bug #1569057.
To be backported once 2.5 branch is unfrozen.
........
r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line
Added optional timeout to SocketHandler.makeSocket (SF #1695948)
........
r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines
Patch #1695862: remove old test directory that causes test_urllib failures
on Windows buildbots. The change is a one time fix and will be removed
after a successful buildbot run.
........
r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines
Minor fix to the tests pass ok even with -O.
........
r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line
Typo fix.
........
r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines
General clean-up. Lot of margin corrections, comments, some typos.
Exceptions now are raised in the new style. And a mockup class is
now also new style. Thanks Santiago Pereson.
........
r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines
Repair a duplicate label and some obsolete uses of \setindexsubitem.
........
r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line
Add window.chgat() method, submitted via e-mail by Fabian Kreutz
........
r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line
Point readers at the patch submission instructions
........
r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line
Describe undocumented third argument to touchline()
........
r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines
Add some missing NULL checks which trigger crashes on low-memory conditions.
Found by Victor Stinner. Will backport when 2.5 branch is unfrozen.
........
r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line
SF 1191699: Make slices picklable
........
r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines
Exceptions are no longer old-style instances. Fix accordingly.
........
r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines
Repair missing spaces after \UNIX.
........
r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line
SF 1193128: Let str.translate(None) be an identity transformation
........
r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines
Patch #1698951: clarify deprecation message in rexec and Bastion
........
r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines
Patch #1695862: remove the cleanup code, now that Windows buildbots are green
again.
........
r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines
Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the
first chunk fed to the decoder started with a BOM, but was longer than 3 bytes.
........
r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines
Port r54805 from python25-maint branch:
Add code to read from master_fd in the parent, breaking when we get an OSError
(EIO can occur on Linux) or there's no more data to read. Without this,
test_pty.py can hang on the waitpid() because the child is blocking on the
stdout write. This will definitely happen on Mac OS X and could potentially
happen on other platforms. See the comment for details.
........
r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line
Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127
........
r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line
Fix potential crash in path manipulation on windows
........
r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines
Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore'
is built before '_ctypes' is attempted.
Will backport to 2.5 once it is unfrozen for 2.5.1.
........
r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines
When __slots__ are set to a unicode string, make it work the same as
setting a plain string, ie don't expand to single letter identifiers.
........
r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line
SF #1701207, Fix bogus assertion (and test it!)
........
r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line
Check the availability of the urlfetch resource earlier than before.
........
r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines
Add Travis Oliphant.
........
r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines
Silence a compiler warning about incompatible pointer types.
........
r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines
SF #1703270, add missing declaration in readline.c to avoid compiler warning.
........
r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines
Revert r53997 as per
http://mail.python.org/pipermail/python-dev/2007-March/071796.html .
I've kept a couple of still-valid extra tests in test_descr, but didn't
bother to sort through the new comments and refactorings added in r53997
to see if some of them could be kept. If so, they could go in a
follow-up check-in.
........
r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines
Fix a usage of the dangerous pattern decref - modify field - incref.
........
r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines
Add an optional address to copy the failure mails to.
Detect a conflict in the only file that should have outstanding changes
when this script is run. This doesn't matter on the trunk, but does
when run on a branch. Trunk always has the date set to today in
boilerplate.tex. Each time a release is cut with a different date,
a conflict occurs. (We could copy a known good version, but then
we would lose changes to this file.)
........
r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines
Bug #1704790: bind name "sys" locally in __del__ method so that it is
not cleared before __del__ is run.
........
r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines
Added tests for other methods of SSL object. Now we cover
all the object methods. This is the final step to close
the #451607 bug.
........
r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines
As specified in RFC 2616, 2xx code indicates that the client's
request was successfully received, understood, and accepted.
Now in these cases no error is raised. Also fixed tests.
........
r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line
Convert PyUnit -> unittest.
........
r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line
Remove code that hasn't been called in years.
........
r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line
Fix SF #1703110, Incorrect example for add_password() (use uri, not host)
........
r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines
Some new year updates.
........
r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines
Added a comment about last change in urllib2.py (all 2xx responses
are ok now).
........
r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines
Bug #1705717: error in sys.argv docs.
........
r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines
Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file
(as opposed to the command line) will now write file names ending in
".cpp" too.
........
r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line
Fix markup
........
r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line
Merge change 54909 from release25-maint: Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition
........
r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line
Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h
........
r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line
Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now.
........
r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines
Patch #1698768: updated the "using Python on the Mac" intro.
........
r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines
Markup fix.
........
r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines
Whitespace normalization. Ugh, we really need to do this more often.
You might want to review this change as it's my first time. Be gentle. :-)
........
r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line
Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule().
........
r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line
Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing.
........
r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line
Change test_support.have_unicode to use True/False instead of 1/0.
........
r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines
Whitespace normalization.
........
r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines
Set missing svn:eol-style property on text files.
........
r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line
Import and raise statement cleanup.
........
r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line
Convert test_ossaudiodev to use unittest.
........
r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line
Fix an issue related to the unittest conversion.
........
r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line
fix some markup errors
........
r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line
Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode(). Use this function in posixmodule.c when implementing fdopen(). This fixes test_subprocess.py for a VisualStudio 2005 compile.
........
r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line
The locale "En" appears not to be valid on windows underi VisualStudio.2005. Added "English" to the test_locale.py to make the testsuite pass for that build
........
r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line
Minor wording change on slicing aide-memoire.
........
r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line
Accomodate 64 bit time_t in the _bsddb module.
........
2007-04-27 16:54:29 -03:00
|
|
|
done:
|
2018-11-29 07:01:27 -04:00
|
|
|
if (set_file_name) {
|
|
|
|
if (PyDict_DelItemString(d, "__file__")) {
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
if (PyDict_DelItemString(d, "__cached__")) {
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
}
|
2018-07-03 16:47:22 -03:00
|
|
|
Py_XDECREF(m);
|
2010-05-09 12:52:27 -03:00
|
|
|
return ret;
|
1992-08-04 09:41:02 -03:00
|
|
|
}
|
|
|
|
|
2020-12-08 09:38:08 -04:00
|
|
|
|
|
|
|
int
|
|
|
|
PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
|
|
|
|
PyCompilerFlags *flags)
|
|
|
|
{
|
|
|
|
PyObject *filename_obj = PyUnicode_DecodeFSDefault(filename);
|
|
|
|
if (filename_obj == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
2020-12-08 19:32:54 -04:00
|
|
|
int res = _PyRun_SimpleFileObject(fp, filename_obj, closeit, flags);
|
2020-12-08 09:38:08 -04:00
|
|
|
Py_DECREF(filename_obj);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Add warning mode for classic division, almost exactly as specified in
PEP 238. Changes:
- add a new flag variable Py_DivisionWarningFlag, declared in
pydebug.h, defined in object.c, set in main.c, and used in
{int,long,float,complex}object.c. When this flag is set, the
classic division operator issues a DeprecationWarning message.
- add a new API PyRun_SimpleStringFlags() to match
PyRun_SimpleString(). The main() function calls this so that
commands run with -c can also benefit from -Dnew.
- While I was at it, I changed the usage message in main() somewhat:
alphabetized the options, split it in *four* parts to fit in under
512 bytes (not that I still believe this is necessary -- doc strings
elsewhere are much longer), and perhaps most visibly, don't display
the full list of options on each command line error. Instead, the
full list is only displayed when -h is used, and otherwise a brief
reminder of -h is displayed. When -h is used, write to stdout so
that you can do `python -h | more'.
Notes:
- I don't want to use the -W option to control whether the classic
division warning is issued or not, because the machinery to decide
whether to display the warning or not is very expensive (it involves
calling into the warnings.py module). You can use -Werror to turn
the warnings into exceptions though.
- The -Dnew option doesn't select future division for all of the
program -- only for the __main__ module. I don't know if I'll ever
change this -- it would require changes to the .pyc file magic
number to do it right, and a more global notion of compiler flags.
- You can usefully combine -Dwarn and -Dnew: this gives the __main__
module new division, and warns about classic division everywhere
else.
2001-08-31 14:40:15 -03:00
|
|
|
int
|
2002-12-11 10:04:59 -04:00
|
|
|
PyRun_SimpleStringFlags(const char *command, PyCompilerFlags *flags)
|
1992-08-04 09:41:02 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *m, *d, *v;
|
|
|
|
m = PyImport_AddModule("__main__");
|
|
|
|
if (m == NULL)
|
|
|
|
return -1;
|
|
|
|
d = PyModule_GetDict(m);
|
|
|
|
v = PyRun_StringFlags(command, Py_file_input, d, d, flags);
|
|
|
|
if (v == NULL) {
|
|
|
|
PyErr_Print();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
Py_DECREF(v);
|
|
|
|
return 0;
|
1992-08-04 09:41:02 -03:00
|
|
|
}
|
|
|
|
|
1997-08-29 19:07:17 -03:00
|
|
|
static int
|
2013-11-07 07:37:56 -04:00
|
|
|
parse_syntax_error(PyObject *err, PyObject **message, PyObject **filename,
|
bpo-43914: Highlight invalid ranges in SyntaxErrors (#25525)
To improve the user experience understanding what part of the error messages associated with SyntaxErrors is wrong, we can highlight the whole error range and not only place the caret at the first character. In this way:
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^
SyntaxError: Generator expression must be parenthesized
becomes
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^^^^^^^^^^^^^^^^^^^^
SyntaxError: Generator expression must be parenthesized
2021-04-23 10:27:05 -03:00
|
|
|
Py_ssize_t *lineno, Py_ssize_t *offset,
|
|
|
|
Py_ssize_t* end_lineno, Py_ssize_t* end_offset,
|
|
|
|
PyObject **text)
|
2010-05-09 12:52:27 -03:00
|
|
|
{
|
2020-06-02 05:17:24 -03:00
|
|
|
Py_ssize_t hold;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *v;
|
|
|
|
|
2012-04-03 01:30:38 -03:00
|
|
|
*message = NULL;
|
2013-11-07 07:37:56 -04:00
|
|
|
*filename = NULL;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2012-04-03 01:30:38 -03:00
|
|
|
/* new style errors. `err' is an instance */
|
2022-02-08 16:39:07 -04:00
|
|
|
*message = PyObject_GetAttr(err, &_Py_ID(msg));
|
2012-04-03 01:30:38 -03:00
|
|
|
if (!*message)
|
2010-05-09 12:52:27 -03:00
|
|
|
goto finally;
|
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
v = PyObject_GetAttr(err, &_Py_ID(filename));
|
2012-04-03 01:30:38 -03:00
|
|
|
if (!v)
|
2010-05-09 12:52:27 -03:00
|
|
|
goto finally;
|
2012-04-03 01:30:38 -03:00
|
|
|
if (v == Py_None) {
|
|
|
|
Py_DECREF(v);
|
2022-02-14 20:36:51 -04:00
|
|
|
_Py_DECLARE_STR(anon_string, "<string>");
|
2022-02-08 16:39:07 -04:00
|
|
|
*filename = &_Py_STR(anon_string);
|
2013-11-07 07:37:56 -04:00
|
|
|
Py_INCREF(*filename);
|
2012-04-03 01:30:38 -03:00
|
|
|
}
|
|
|
|
else {
|
2013-11-07 07:37:56 -04:00
|
|
|
*filename = v;
|
2012-04-03 01:30:38 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
v = PyObject_GetAttr(err, &_Py_ID(lineno));
|
2012-04-03 01:30:38 -03:00
|
|
|
if (!v)
|
2010-05-09 12:52:27 -03:00
|
|
|
goto finally;
|
2020-06-02 05:17:24 -03:00
|
|
|
hold = PyLong_AsSsize_t(v);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(v);
|
|
|
|
if (hold < 0 && PyErr_Occurred())
|
|
|
|
goto finally;
|
2015-09-06 15:25:30 -03:00
|
|
|
*lineno = hold;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
v = PyObject_GetAttr(err, &_Py_ID(offset));
|
2012-04-03 01:30:38 -03:00
|
|
|
if (!v)
|
2010-05-09 12:52:27 -03:00
|
|
|
goto finally;
|
|
|
|
if (v == Py_None) {
|
|
|
|
*offset = -1;
|
|
|
|
Py_DECREF(v);
|
|
|
|
} else {
|
2020-06-02 05:17:24 -03:00
|
|
|
hold = PyLong_AsSsize_t(v);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(v);
|
|
|
|
if (hold < 0 && PyErr_Occurred())
|
|
|
|
goto finally;
|
2015-09-06 15:25:30 -03:00
|
|
|
*offset = hold;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
bpo-43914: Highlight invalid ranges in SyntaxErrors (#25525)
To improve the user experience understanding what part of the error messages associated with SyntaxErrors is wrong, we can highlight the whole error range and not only place the caret at the first character. In this way:
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^
SyntaxError: Generator expression must be parenthesized
becomes
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^^^^^^^^^^^^^^^^^^^^
SyntaxError: Generator expression must be parenthesized
2021-04-23 10:27:05 -03:00
|
|
|
if (Py_TYPE(err) == (PyTypeObject*)PyExc_SyntaxError) {
|
2022-02-08 16:39:07 -04:00
|
|
|
v = PyObject_GetAttr(err, &_Py_ID(end_lineno));
|
bpo-43914: Highlight invalid ranges in SyntaxErrors (#25525)
To improve the user experience understanding what part of the error messages associated with SyntaxErrors is wrong, we can highlight the whole error range and not only place the caret at the first character. In this way:
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^
SyntaxError: Generator expression must be parenthesized
becomes
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^^^^^^^^^^^^^^^^^^^^
SyntaxError: Generator expression must be parenthesized
2021-04-23 10:27:05 -03:00
|
|
|
if (!v) {
|
|
|
|
PyErr_Clear();
|
|
|
|
*end_lineno = *lineno;
|
|
|
|
}
|
|
|
|
else if (v == Py_None) {
|
|
|
|
*end_lineno = *lineno;
|
|
|
|
Py_DECREF(v);
|
|
|
|
} else {
|
|
|
|
hold = PyLong_AsSsize_t(v);
|
|
|
|
Py_DECREF(v);
|
|
|
|
if (hold < 0 && PyErr_Occurred())
|
|
|
|
goto finally;
|
|
|
|
*end_lineno = hold;
|
|
|
|
}
|
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
v = PyObject_GetAttr(err, &_Py_ID(end_offset));
|
bpo-43914: Highlight invalid ranges in SyntaxErrors (#25525)
To improve the user experience understanding what part of the error messages associated with SyntaxErrors is wrong, we can highlight the whole error range and not only place the caret at the first character. In this way:
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^
SyntaxError: Generator expression must be parenthesized
becomes
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^^^^^^^^^^^^^^^^^^^^
SyntaxError: Generator expression must be parenthesized
2021-04-23 10:27:05 -03:00
|
|
|
if (!v) {
|
|
|
|
PyErr_Clear();
|
|
|
|
*end_offset = -1;
|
|
|
|
}
|
|
|
|
else if (v == Py_None) {
|
|
|
|
*end_offset = -1;
|
|
|
|
Py_DECREF(v);
|
|
|
|
} else {
|
|
|
|
hold = PyLong_AsSsize_t(v);
|
|
|
|
Py_DECREF(v);
|
|
|
|
if (hold < 0 && PyErr_Occurred())
|
|
|
|
goto finally;
|
|
|
|
*end_offset = hold;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// SyntaxError subclasses
|
|
|
|
*end_lineno = *lineno;
|
|
|
|
*end_offset = -1;
|
|
|
|
}
|
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
v = PyObject_GetAttr(err, &_Py_ID(text));
|
2012-04-03 01:30:38 -03:00
|
|
|
if (!v)
|
2010-05-09 12:52:27 -03:00
|
|
|
goto finally;
|
2012-04-03 01:30:38 -03:00
|
|
|
if (v == Py_None) {
|
|
|
|
Py_DECREF(v);
|
2010-05-09 12:52:27 -03:00
|
|
|
*text = NULL;
|
2012-04-03 01:30:38 -03:00
|
|
|
}
|
|
|
|
else {
|
2013-11-07 07:37:56 -04:00
|
|
|
*text = v;
|
2012-04-03 01:30:38 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
return 1;
|
1997-08-29 19:07:17 -03:00
|
|
|
|
|
|
|
finally:
|
2012-04-03 01:30:38 -03:00
|
|
|
Py_XDECREF(*message);
|
2013-11-07 07:37:56 -04:00
|
|
|
Py_XDECREF(*filename);
|
2010-05-09 12:52:27 -03:00
|
|
|
return 0;
|
1997-08-29 19:07:17 -03:00
|
|
|
}
|
|
|
|
|
2021-12-16 19:00:13 -04:00
|
|
|
static int
|
|
|
|
print_error_text(PyObject *f, Py_ssize_t offset, Py_ssize_t end_offset,
|
|
|
|
PyObject *text_obj)
|
2001-02-28 03:07:43 -04:00
|
|
|
{
|
2021-12-16 19:00:13 -04:00
|
|
|
size_t caret_repetitions = (end_offset > 0 && end_offset > offset) ?
|
|
|
|
end_offset - offset : 1;
|
|
|
|
|
2020-05-14 23:22:48 -03:00
|
|
|
/* Convert text to a char pointer; return if error */
|
|
|
|
const char *text = PyUnicode_AsUTF8(text_obj);
|
2021-12-16 19:00:13 -04:00
|
|
|
if (text == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
2013-11-07 07:37:56 -04:00
|
|
|
|
2020-05-14 23:22:48 -03:00
|
|
|
/* Convert offset from 1-based to 0-based */
|
|
|
|
offset--;
|
|
|
|
|
|
|
|
/* Strip leading whitespace from text, adjusting offset as we go */
|
|
|
|
while (*text == ' ' || *text == '\t' || *text == '\f') {
|
|
|
|
text++;
|
|
|
|
offset--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Calculate text length excluding trailing newline */
|
|
|
|
Py_ssize_t len = strlen(text);
|
|
|
|
if (len > 0 && text[len-1] == '\n') {
|
|
|
|
len--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clip offset to at most len */
|
|
|
|
if (offset > len) {
|
|
|
|
offset = len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Skip past newlines embedded in text */
|
|
|
|
for (;;) {
|
|
|
|
const char *nl = strchr(text, '\n');
|
|
|
|
if (nl == NULL) {
|
|
|
|
break;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2020-05-14 23:22:48 -03:00
|
|
|
Py_ssize_t inl = nl - text;
|
2020-06-02 05:17:24 -03:00
|
|
|
if (inl >= offset) {
|
2020-05-14 23:22:48 -03:00
|
|
|
break;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2020-05-14 23:22:48 -03:00
|
|
|
inl += 1;
|
|
|
|
text += inl;
|
|
|
|
len -= inl;
|
|
|
|
offset -= (int)inl;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2020-05-14 23:22:48 -03:00
|
|
|
|
|
|
|
/* Print text */
|
2021-12-16 19:00:13 -04:00
|
|
|
if (PyFile_WriteString(" ", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (PyFile_WriteString(text, f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2020-05-14 23:22:48 -03:00
|
|
|
|
|
|
|
/* Make sure there's a newline at the end */
|
|
|
|
if (text[len] != '\n') {
|
2021-12-16 19:00:13 -04:00
|
|
|
if (PyFile_WriteString("\n", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2020-05-14 23:22:48 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Don't print caret if it points to the left of the text */
|
2021-12-16 19:00:13 -04:00
|
|
|
if (offset < 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
2020-05-14 23:22:48 -03:00
|
|
|
|
|
|
|
/* Write caret line */
|
2021-12-16 19:00:13 -04:00
|
|
|
if (PyFile_WriteString(" ", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2020-05-14 23:22:48 -03:00
|
|
|
while (--offset >= 0) {
|
2021-12-16 19:00:13 -04:00
|
|
|
if (PyFile_WriteString(" ", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2020-05-14 23:22:48 -03:00
|
|
|
}
|
bpo-43914: Highlight invalid ranges in SyntaxErrors (#25525)
To improve the user experience understanding what part of the error messages associated with SyntaxErrors is wrong, we can highlight the whole error range and not only place the caret at the first character. In this way:
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^
SyntaxError: Generator expression must be parenthesized
becomes
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^^^^^^^^^^^^^^^^^^^^
SyntaxError: Generator expression must be parenthesized
2021-04-23 10:27:05 -03:00
|
|
|
for (size_t caret_iter=0; caret_iter < caret_repetitions ; caret_iter++) {
|
2021-12-16 19:00:13 -04:00
|
|
|
if (PyFile_WriteString("^", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (PyFile_WriteString("\n", f) < 0) {
|
|
|
|
return -1;
|
bpo-43914: Highlight invalid ranges in SyntaxErrors (#25525)
To improve the user experience understanding what part of the error messages associated with SyntaxErrors is wrong, we can highlight the whole error range and not only place the caret at the first character. In this way:
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^
SyntaxError: Generator expression must be parenthesized
becomes
>>> foo(x, z for z in range(10), t, w)
File "<stdin>", line 1
foo(x, z for z in range(10), t, w)
^^^^^^^^^^^^^^^^^^^^
SyntaxError: Generator expression must be parenthesized
2021-04-23 10:27:05 -03:00
|
|
|
}
|
2021-12-16 19:00:13 -04:00
|
|
|
return 0;
|
2001-02-28 03:07:43 -04:00
|
|
|
}
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2019-05-17 18:05:29 -03:00
|
|
|
int
|
|
|
|
_Py_HandleSystemExit(int *exitcode_p)
|
|
|
|
{
|
2020-04-12 22:04:28 -03:00
|
|
|
int inspect = _Py_GetConfig()->inspect;
|
2019-05-14 12:34:56 -03:00
|
|
|
if (inspect) {
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Don't exit if -i flag was given. This flag is set to 0
|
|
|
|
* when entering interactive mode for inspecting. */
|
2019-05-17 18:05:29 -03:00
|
|
|
return 0;
|
2019-05-14 12:34:56 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2019-05-17 18:05:29 -03:00
|
|
|
if (!PyErr_ExceptionMatches(PyExc_SystemExit)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *exception, *value, *tb;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyErr_Fetch(&exception, &value, &tb);
|
2019-05-17 18:05:29 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
fflush(stdout);
|
2019-05-17 18:05:29 -03:00
|
|
|
|
|
|
|
int exitcode = 0;
|
|
|
|
if (value == NULL || value == Py_None) {
|
2010-05-09 12:52:27 -03:00
|
|
|
goto done;
|
2019-05-17 18:05:29 -03:00
|
|
|
}
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (PyExceptionInstance_Check(value)) {
|
|
|
|
/* The error code should be in the `code' attribute. */
|
2022-02-08 16:39:07 -04:00
|
|
|
PyObject *code = PyObject_GetAttr(value, &_Py_ID(code));
|
2010-05-09 12:52:27 -03:00
|
|
|
if (code) {
|
|
|
|
Py_DECREF(value);
|
|
|
|
value = code;
|
|
|
|
if (value == Py_None)
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
/* If we failed to dig out the 'code' attribute,
|
|
|
|
just let the else clause below print the error. */
|
|
|
|
}
|
2019-05-17 18:05:29 -03:00
|
|
|
|
|
|
|
if (PyLong_Check(value)) {
|
2010-05-09 12:52:27 -03:00
|
|
|
exitcode = (int)PyLong_AsLong(value);
|
2019-05-17 18:05:29 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
else {
|
2022-02-08 16:39:07 -04:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
PyObject *sys_stderr = _PySys_GetAttr(tstate, &_Py_ID(stderr));
|
2014-02-08 20:43:21 -04:00
|
|
|
/* We clear the exception here to avoid triggering the assertion
|
|
|
|
* in PyObject_Str that ensures it won't silently lose exception
|
|
|
|
* details.
|
|
|
|
*/
|
|
|
|
PyErr_Clear();
|
2010-05-21 20:45:42 -03:00
|
|
|
if (sys_stderr != NULL && sys_stderr != Py_None) {
|
|
|
|
PyFile_WriteObject(value, sys_stderr, Py_PRINT_RAW);
|
|
|
|
} else {
|
|
|
|
PyObject_Print(value, stderr, Py_PRINT_RAW);
|
|
|
|
fflush(stderr);
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
PySys_WriteStderr("\n");
|
|
|
|
exitcode = 1;
|
|
|
|
}
|
2019-05-17 18:05:29 -03:00
|
|
|
|
2003-04-19 15:47:02 -03:00
|
|
|
done:
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Restore and clear the exception info, in order to properly decref
|
|
|
|
* the exception, value, and traceback. If we just exit instead,
|
|
|
|
* these leak, which confuses PYTHONDUMPREFS output, and may prevent
|
|
|
|
* some finalizers from running.
|
|
|
|
*/
|
|
|
|
PyErr_Restore(exception, value, tb);
|
|
|
|
PyErr_Clear();
|
2019-05-17 18:05:29 -03:00
|
|
|
*exitcode_p = exitcode;
|
|
|
|
return 1;
|
2001-03-23 11:36:41 -04:00
|
|
|
}
|
|
|
|
|
2019-05-17 18:05:29 -03:00
|
|
|
|
|
|
|
static void
|
|
|
|
handle_system_exit(void)
|
|
|
|
{
|
|
|
|
int exitcode;
|
|
|
|
if (_Py_HandleSystemExit(&exitcode)) {
|
|
|
|
Py_Exit(exitcode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-24 12:01:38 -03:00
|
|
|
static void
|
|
|
|
_PyErr_PrintEx(PyThreadState *tstate, int set_sys_last_vars)
|
1992-08-04 09:41:02 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *exception, *v, *tb, *hook;
|
|
|
|
|
2019-05-17 18:05:29 -03:00
|
|
|
handle_system_exit();
|
|
|
|
|
2019-05-24 12:01:38 -03:00
|
|
|
_PyErr_Fetch(tstate, &exception, &v, &tb);
|
|
|
|
if (exception == NULL) {
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
_PyErr_NormalizeException(tstate, &exception, &v, &tb);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (tb == NULL) {
|
|
|
|
tb = Py_None;
|
|
|
|
Py_INCREF(tb);
|
|
|
|
}
|
|
|
|
PyException_SetTraceback(v, tb);
|
2019-05-24 12:01:38 -03:00
|
|
|
if (exception == NULL) {
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Now we know v != NULL too */
|
|
|
|
if (set_sys_last_vars) {
|
2022-02-08 16:39:07 -04:00
|
|
|
if (_PySys_SetAttr(&_Py_ID(last_type), exception) < 0) {
|
2019-05-24 12:01:38 -03:00
|
|
|
_PyErr_Clear(tstate);
|
2017-10-23 13:08:41 -03:00
|
|
|
}
|
2022-02-08 16:39:07 -04:00
|
|
|
if (_PySys_SetAttr(&_Py_ID(last_value), v) < 0) {
|
2019-05-24 12:01:38 -03:00
|
|
|
_PyErr_Clear(tstate);
|
2017-10-23 13:08:41 -03:00
|
|
|
}
|
2022-02-08 16:39:07 -04:00
|
|
|
if (_PySys_SetAttr(&_Py_ID(last_traceback), tb) < 0) {
|
2019-05-24 12:01:38 -03:00
|
|
|
_PyErr_Clear(tstate);
|
2017-10-23 13:08:41 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2022-02-08 16:39:07 -04:00
|
|
|
hook = _PySys_GetAttr(tstate, &_Py_ID(excepthook));
|
2020-03-27 11:11:45 -03:00
|
|
|
if (_PySys_Audit(tstate, "sys.excepthook", "OOOO", hook ? hook : Py_None,
|
|
|
|
exception, v, tb) < 0) {
|
2019-11-28 12:46:11 -04:00
|
|
|
if (PyErr_ExceptionMatches(PyExc_RuntimeError)) {
|
|
|
|
PyErr_Clear();
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
_PyErr_WriteUnraisableMsg("in audit hook", NULL);
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
if (hook) {
|
2016-08-19 19:57:43 -03:00
|
|
|
PyObject* stack[3];
|
|
|
|
PyObject *result;
|
|
|
|
|
|
|
|
stack[0] = exception;
|
|
|
|
stack[1] = v;
|
|
|
|
stack[2] = tb;
|
2016-08-22 17:48:54 -03:00
|
|
|
result = _PyObject_FastCall(hook, stack, 3);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (result == NULL) {
|
2019-05-17 18:05:29 -03:00
|
|
|
handle_system_exit();
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *exception2, *v2, *tb2;
|
2019-05-24 12:01:38 -03:00
|
|
|
_PyErr_Fetch(tstate, &exception2, &v2, &tb2);
|
|
|
|
_PyErr_NormalizeException(tstate, &exception2, &v2, &tb2);
|
2010-05-09 12:52:27 -03:00
|
|
|
/* It should not be possible for exception2 or v2
|
|
|
|
to be NULL. However PyErr_Display() can't
|
|
|
|
tolerate NULLs, so just be safe. */
|
|
|
|
if (exception2 == NULL) {
|
|
|
|
exception2 = Py_None;
|
|
|
|
Py_INCREF(exception2);
|
|
|
|
}
|
|
|
|
if (v2 == NULL) {
|
|
|
|
v2 = Py_None;
|
|
|
|
Py_INCREF(v2);
|
|
|
|
}
|
|
|
|
fflush(stdout);
|
|
|
|
PySys_WriteStderr("Error in sys.excepthook:\n");
|
|
|
|
PyErr_Display(exception2, v2, tb2);
|
|
|
|
PySys_WriteStderr("\nOriginal exception was:\n");
|
|
|
|
PyErr_Display(exception, v, tb);
|
|
|
|
Py_DECREF(exception2);
|
|
|
|
Py_DECREF(v2);
|
|
|
|
Py_XDECREF(tb2);
|
|
|
|
}
|
|
|
|
Py_XDECREF(result);
|
2019-05-24 12:01:38 -03:00
|
|
|
}
|
|
|
|
else {
|
2010-05-09 12:52:27 -03:00
|
|
|
PySys_WriteStderr("sys.excepthook is missing\n");
|
|
|
|
PyErr_Display(exception, v, tb);
|
|
|
|
}
|
2019-05-24 12:01:38 -03:00
|
|
|
|
|
|
|
done:
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_XDECREF(exception);
|
|
|
|
Py_XDECREF(v);
|
|
|
|
Py_XDECREF(tb);
|
2001-03-22 22:46:52 -04:00
|
|
|
}
|
|
|
|
|
2019-05-24 12:01:38 -03:00
|
|
|
void
|
|
|
|
_PyErr_Print(PyThreadState *tstate)
|
|
|
|
{
|
|
|
|
_PyErr_PrintEx(tstate, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
PyErr_PrintEx(int set_sys_last_vars)
|
|
|
|
{
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
_PyErr_PrintEx(tstate, set_sys_last_vars);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
PyErr_Print(void)
|
|
|
|
{
|
|
|
|
PyErr_PrintEx(1);
|
|
|
|
}
|
|
|
|
|
2021-11-05 06:39:18 -03:00
|
|
|
struct exception_print_context
|
|
|
|
{
|
|
|
|
PyObject *file;
|
|
|
|
PyObject *seen; // Prevent cycles in recursion
|
|
|
|
int exception_group_depth; // nesting level of current exception group
|
|
|
|
bool need_close; // Need a closing bottom frame
|
|
|
|
int max_group_width; // Maximum number of children of each EG
|
|
|
|
int max_group_depth; // Maximum nesting level of EGs
|
|
|
|
};
|
|
|
|
|
|
|
|
#define EXC_MARGIN(ctx) ((ctx)->exception_group_depth ? "| " : "")
|
|
|
|
#define EXC_INDENT(ctx) (2 * (ctx)->exception_group_depth)
|
|
|
|
|
|
|
|
static int
|
|
|
|
write_indented_margin(struct exception_print_context *ctx, PyObject *f)
|
|
|
|
{
|
|
|
|
return _Py_WriteIndentedMargin(EXC_INDENT(ctx), EXC_MARGIN(ctx), f);
|
|
|
|
}
|
|
|
|
|
2021-12-08 14:47:27 -04:00
|
|
|
static int
|
|
|
|
print_exception_invalid_type(struct exception_print_context *ctx,
|
|
|
|
PyObject *value)
|
2001-03-22 22:46:52 -04:00
|
|
|
{
|
2021-11-05 06:39:18 -03:00
|
|
|
PyObject *f = ctx->file;
|
2021-12-08 14:47:27 -04:00
|
|
|
if (_Py_WriteIndent(EXC_INDENT(ctx), f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
const char *const msg = "TypeError: print_exception(): Exception expected "
|
|
|
|
"for value, ";
|
|
|
|
if (PyFile_WriteString(msg, f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (PyFile_WriteString(Py_TYPE(value)->tp_name, f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (PyFile_WriteString(" found\n", f) < 0) {
|
|
|
|
return -1;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2021-12-08 14:47:27 -04:00
|
|
|
return 0;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2021-12-08 14:47:27 -04:00
|
|
|
static int
|
|
|
|
print_exception_traceback(struct exception_print_context *ctx, PyObject *value)
|
|
|
|
{
|
|
|
|
PyObject *f = ctx->file;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
PyObject *tb = PyException_GetTraceback(value);
|
2021-11-05 06:39:18 -03:00
|
|
|
if (tb && tb != Py_None) {
|
|
|
|
const char *header = EXCEPTION_TB_HEADER;
|
|
|
|
const char *header_margin = EXC_MARGIN(ctx);
|
|
|
|
if (_PyBaseExceptionGroup_Check(value)) {
|
|
|
|
header = EXCEPTION_GROUP_TB_HEADER;
|
|
|
|
if (ctx->exception_group_depth == 1) {
|
|
|
|
header_margin = "+ ";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
err = _PyTraceBack_Print_Indented(
|
|
|
|
tb, EXC_INDENT(ctx), EXC_MARGIN(ctx), header_margin, header, f);
|
|
|
|
}
|
2021-12-08 14:47:27 -04:00
|
|
|
Py_XDECREF(tb);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2021-12-16 19:00:13 -04:00
|
|
|
static int
|
|
|
|
print_exception_file_and_line(struct exception_print_context *ctx,
|
|
|
|
PyObject **value_p)
|
|
|
|
{
|
|
|
|
PyObject *f = ctx->file;
|
|
|
|
|
|
|
|
PyObject *tmp;
|
2022-02-08 16:39:07 -04:00
|
|
|
int res = _PyObject_LookupAttr(*value_p, &_Py_ID(print_file_and_line), &tmp);
|
2021-12-16 19:00:13 -04:00
|
|
|
if (res <= 0) {
|
|
|
|
if (res < 0) {
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
Py_DECREF(tmp);
|
|
|
|
|
|
|
|
PyObject *message, *filename, *text;
|
|
|
|
Py_ssize_t lineno, offset, end_lineno, end_offset;
|
|
|
|
if (!parse_syntax_error(*value_p, &message, &filename,
|
|
|
|
&lineno, &offset,
|
|
|
|
&end_lineno, &end_offset, &text)) {
|
|
|
|
PyErr_Clear();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_SETREF(*value_p, message);
|
|
|
|
|
|
|
|
PyObject *line = PyUnicode_FromFormat(" File \"%S\", line %zd\n",
|
|
|
|
filename, lineno);
|
|
|
|
Py_DECREF(filename);
|
|
|
|
if (line == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (write_indented_margin(ctx, f) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (PyFile_WriteObject(line, f, Py_PRINT_RAW) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_CLEAR(line);
|
|
|
|
|
|
|
|
if (text != NULL) {
|
|
|
|
Py_ssize_t line_size;
|
|
|
|
const char *error_line = PyUnicode_AsUTF8AndSize(text, &line_size);
|
|
|
|
// If the location of the error spawn multiple lines, we want
|
|
|
|
// to just print the first one and highlight everything until
|
|
|
|
// the end of that one since we don't support multi-line error
|
|
|
|
// messages.
|
|
|
|
if (end_lineno > lineno) {
|
|
|
|
end_offset = (error_line != NULL) ? line_size : -1;
|
|
|
|
}
|
|
|
|
// Limit the amount of '^' that we can display to
|
|
|
|
// the size of the text in the source line.
|
|
|
|
if (error_line != NULL && end_offset > line_size + 1) {
|
|
|
|
end_offset = line_size + 1;
|
|
|
|
}
|
|
|
|
if (print_error_text(f, offset, end_offset, text) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_DECREF(text);
|
|
|
|
}
|
|
|
|
assert(!PyErr_Occurred());
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
error:
|
|
|
|
Py_XDECREF(line);
|
|
|
|
Py_XDECREF(text);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2021-12-08 14:47:27 -04:00
|
|
|
/* Prints the message line: module.qualname[: str(exc)] */
|
|
|
|
static int
|
|
|
|
print_exception_message(struct exception_print_context *ctx, PyObject *type,
|
2021-12-10 19:02:10 -04:00
|
|
|
PyObject *value)
|
2021-12-08 14:47:27 -04:00
|
|
|
{
|
|
|
|
PyObject *f = ctx->file;
|
|
|
|
|
|
|
|
assert(PyExceptionClass_Check(type));
|
|
|
|
|
|
|
|
if (write_indented_margin(ctx, f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2022-02-08 16:39:07 -04:00
|
|
|
PyObject *modulename = PyObject_GetAttr(type, &_Py_ID(__module__));
|
2021-12-08 14:47:27 -04:00
|
|
|
if (modulename == NULL || !PyUnicode_Check(modulename)) {
|
|
|
|
Py_XDECREF(modulename);
|
|
|
|
PyErr_Clear();
|
|
|
|
if (PyFile_WriteString("<unknown>.", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2022-02-08 16:39:07 -04:00
|
|
|
if (!_PyUnicode_Equal(modulename, &_Py_ID(builtins)) &&
|
|
|
|
!_PyUnicode_Equal(modulename, &_Py_ID(__main__)))
|
2021-12-08 14:47:27 -04:00
|
|
|
{
|
|
|
|
int res = PyFile_WriteObject(modulename, f, Py_PRINT_RAW);
|
|
|
|
Py_DECREF(modulename);
|
|
|
|
if (res < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (PyFile_WriteString(".", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(modulename);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *qualname = PyType_GetQualName((PyTypeObject *)type);
|
|
|
|
if (qualname == NULL || !PyUnicode_Check(qualname)) {
|
|
|
|
Py_XDECREF(qualname);
|
|
|
|
PyErr_Clear();
|
|
|
|
if (PyFile_WriteString("<unknown>", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
int res = PyFile_WriteObject(qualname, f, Py_PRINT_RAW);
|
|
|
|
Py_DECREF(qualname);
|
|
|
|
if (res < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Py_IsNone(value)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *s = PyObject_Str(value);
|
|
|
|
if (s == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
if (PyFile_WriteString(": <exception str() failed>", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* only print colon if the str() of the
|
|
|
|
object is not the empty string
|
|
|
|
*/
|
|
|
|
if (!PyUnicode_Check(s) || PyUnicode_GetLength(s) != 0) {
|
|
|
|
if (PyFile_WriteString(": ", f) < 0) {
|
|
|
|
Py_DECREF(s);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
int res = PyFile_WriteObject(s, f, Py_PRINT_RAW);
|
|
|
|
Py_DECREF(s);
|
|
|
|
if (res < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2021-12-09 10:38:00 -04:00
|
|
|
static int
|
|
|
|
print_exception_suggestions(struct exception_print_context *ctx,
|
|
|
|
PyObject *value)
|
|
|
|
{
|
|
|
|
PyObject *f = ctx->file;
|
|
|
|
PyObject *suggestions = _Py_Offer_Suggestions(value);
|
|
|
|
if (suggestions) {
|
|
|
|
// Add a trailer ". Did you mean: (...)?"
|
|
|
|
if (PyFile_WriteString(". Did you mean: '", f) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (PyFile_WriteObject(suggestions, f, Py_PRINT_RAW) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (PyFile_WriteString("'?", f) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_DECREF(suggestions);
|
|
|
|
}
|
|
|
|
else if (PyErr_Occurred()) {
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
error:
|
|
|
|
Py_XDECREF(suggestions);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
print_exception_note(struct exception_print_context *ctx, PyObject *value)
|
|
|
|
{
|
|
|
|
PyObject *f = ctx->file;
|
2021-12-16 19:00:13 -04:00
|
|
|
|
|
|
|
if (!PyExceptionInstance_Check(value)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
PyObject *note = PyObject_GetAttr(value, &_Py_ID(__note__));
|
2021-12-09 10:38:00 -04:00
|
|
|
if (note == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!PyUnicode_Check(note)) {
|
|
|
|
Py_DECREF(note);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *lines = PyUnicode_Splitlines(note, 1);
|
|
|
|
Py_DECREF(note);
|
|
|
|
|
|
|
|
if (lines == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_ssize_t n = PyList_GET_SIZE(lines);
|
|
|
|
for (Py_ssize_t i = 0; i < n; i++) {
|
|
|
|
PyObject *line = PyList_GET_ITEM(lines, i);
|
|
|
|
assert(PyUnicode_Check(line));
|
|
|
|
if (write_indented_margin(ctx, f) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (PyFile_WriteObject(line, f, Py_PRINT_RAW) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (PyFile_WriteString("\n", f) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_DECREF(lines);
|
|
|
|
return 0;
|
|
|
|
error:
|
|
|
|
Py_DECREF(lines);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2021-12-16 19:00:13 -04:00
|
|
|
static int
|
2021-12-08 14:47:27 -04:00
|
|
|
print_exception(struct exception_print_context *ctx, PyObject *value)
|
|
|
|
{
|
|
|
|
PyObject *f = ctx->file;
|
|
|
|
|
|
|
|
if (!PyExceptionInstance_Check(value)) {
|
2021-12-16 19:00:13 -04:00
|
|
|
return print_exception_invalid_type(ctx, value);
|
2021-12-08 14:47:27 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
Py_INCREF(value);
|
|
|
|
fflush(stdout);
|
2013-11-07 07:37:56 -04:00
|
|
|
|
2021-12-16 19:00:13 -04:00
|
|
|
if (print_exception_traceback(ctx, value) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
2013-11-07 07:37:56 -04:00
|
|
|
|
2021-12-16 19:00:13 -04:00
|
|
|
/* grab the type now because value can change below */
|
|
|
|
PyObject *type = (PyObject *) Py_TYPE(value);
|
2013-11-07 07:37:56 -04:00
|
|
|
|
2021-12-16 19:00:13 -04:00
|
|
|
if (print_exception_file_and_line(ctx, &value) < 0) {
|
|
|
|
goto error;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2021-12-16 19:00:13 -04:00
|
|
|
if (print_exception_message(ctx, type, value) < 0) {
|
|
|
|
goto error;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2021-12-16 19:00:13 -04:00
|
|
|
if (print_exception_suggestions(ctx, value) < 0) {
|
|
|
|
goto error;
|
2016-02-27 23:16:11 -04:00
|
|
|
}
|
2021-12-16 19:00:13 -04:00
|
|
|
if (PyFile_WriteString("\n", f) < 0) {
|
|
|
|
goto error;
|
2021-04-13 22:36:07 -03:00
|
|
|
}
|
2021-12-16 19:00:13 -04:00
|
|
|
if (print_exception_note(ctx, value) < 0) {
|
|
|
|
goto error;
|
2021-12-03 18:01:15 -04:00
|
|
|
}
|
2021-12-09 10:38:00 -04:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(value);
|
2021-12-16 19:00:13 -04:00
|
|
|
assert(!PyErr_Occurred());
|
|
|
|
return 0;
|
|
|
|
error:
|
|
|
|
Py_DECREF(value);
|
|
|
|
return -1;
|
1992-08-04 09:41:02 -03:00
|
|
|
}
|
|
|
|
|
2015-12-25 13:53:18 -04:00
|
|
|
static const char cause_message[] =
|
2021-11-05 06:39:18 -03:00
|
|
|
"The above exception was the direct cause "
|
|
|
|
"of the following exception:\n";
|
2008-07-15 12:32:09 -03:00
|
|
|
|
2015-12-25 13:53:18 -04:00
|
|
|
static const char context_message[] =
|
2021-11-05 06:39:18 -03:00
|
|
|
"During handling of the above exception, "
|
|
|
|
"another exception occurred:\n";
|
2008-07-15 12:32:09 -03:00
|
|
|
|
2021-12-16 19:00:13 -04:00
|
|
|
static int
|
2021-11-05 06:39:18 -03:00
|
|
|
print_exception_recursive(struct exception_print_context*, PyObject*);
|
|
|
|
|
|
|
|
static int
|
|
|
|
print_chained(struct exception_print_context* ctx, PyObject *value,
|
|
|
|
const char * message, const char *tag)
|
|
|
|
{
|
|
|
|
PyObject *f = ctx->file;
|
|
|
|
|
2021-12-09 10:38:00 -04:00
|
|
|
if (Py_EnterRecursiveCall(" in print_chained") < 0) {
|
|
|
|
return -1;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
2021-12-09 10:38:00 -04:00
|
|
|
bool need_close = ctx->need_close;
|
2021-12-16 19:00:13 -04:00
|
|
|
int res = print_exception_recursive(ctx, value);
|
2021-11-05 06:39:18 -03:00
|
|
|
ctx->need_close = need_close;
|
2021-12-09 10:38:00 -04:00
|
|
|
Py_LeaveRecursiveCall();
|
2021-12-16 19:00:13 -04:00
|
|
|
if (res < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2021-12-09 10:38:00 -04:00
|
|
|
|
|
|
|
if (write_indented_margin(ctx, f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (PyFile_WriteString("\n", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (write_indented_margin(ctx, f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (PyFile_WriteString(message, f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (write_indented_margin(ctx, f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (PyFile_WriteString("\n", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
|
|
|
|
2021-12-10 19:02:10 -04:00
|
|
|
/* Return true if value is in seen or there was a lookup error.
|
|
|
|
* Return false if lookup succeeded and the item was not found.
|
|
|
|
* We suppress errors because this makes us err on the side of
|
|
|
|
* under-printing which is better than over-printing irregular
|
|
|
|
* exceptions (e.g., unhashable ones).
|
|
|
|
*/
|
|
|
|
static bool
|
|
|
|
print_exception_seen_lookup(struct exception_print_context *ctx,
|
|
|
|
PyObject *value)
|
2008-07-15 12:32:09 -03:00
|
|
|
{
|
2021-12-10 19:02:10 -04:00
|
|
|
PyObject *check_id = PyLong_FromVoidPtr(value);
|
|
|
|
if (check_id == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
return true;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2021-12-10 19:02:10 -04:00
|
|
|
int in_seen = PySet_Contains(ctx->seen, check_id);
|
|
|
|
Py_DECREF(check_id);
|
|
|
|
if (in_seen == -1) {
|
|
|
|
PyErr_Clear();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (in_seen == 1) {
|
|
|
|
/* value is in seen */
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
print_exception_cause_and_context(struct exception_print_context *ctx,
|
|
|
|
PyObject *value)
|
|
|
|
{
|
|
|
|
PyObject *value_id = PyLong_FromVoidPtr(value);
|
|
|
|
if (value_id == NULL || PySet_Add(ctx->seen, value_id) == -1) {
|
|
|
|
PyErr_Clear();
|
2017-10-17 18:29:39 -03:00
|
|
|
Py_XDECREF(value_id);
|
2021-12-10 19:02:10 -04:00
|
|
|
return 0;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2021-12-10 19:02:10 -04:00
|
|
|
Py_DECREF(value_id);
|
|
|
|
|
|
|
|
if (!PyExceptionInstance_Check(value)) {
|
|
|
|
return 0;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
2021-12-10 19:02:10 -04:00
|
|
|
|
|
|
|
PyObject *cause = PyException_GetCause(value);
|
|
|
|
if (cause) {
|
|
|
|
int err = 0;
|
|
|
|
if (!print_exception_seen_lookup(ctx, cause)) {
|
|
|
|
err = print_chained(ctx, cause, cause_message, "cause");
|
|
|
|
}
|
|
|
|
Py_DECREF(cause);
|
|
|
|
return err;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
2021-12-10 19:02:10 -04:00
|
|
|
if (((PyBaseExceptionObject *)value)->suppress_context) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
PyObject *context = PyException_GetContext(value);
|
|
|
|
if (context) {
|
|
|
|
int err = 0;
|
|
|
|
if (!print_exception_seen_lookup(ctx, context)) {
|
|
|
|
err = print_chained(ctx, context, context_message, "context");
|
|
|
|
}
|
|
|
|
Py_DECREF(context);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
print_exception_group(struct exception_print_context *ctx, PyObject *value)
|
|
|
|
{
|
|
|
|
PyObject *f = ctx->file;
|
2021-11-05 06:39:18 -03:00
|
|
|
|
2021-12-10 19:02:10 -04:00
|
|
|
if (ctx->exception_group_depth > ctx->max_group_depth) {
|
|
|
|
/* depth exceeds limit */
|
2021-11-05 06:39:18 -03:00
|
|
|
|
2021-12-10 19:02:10 -04:00
|
|
|
if (write_indented_margin(ctx, f) < 0) {
|
|
|
|
return -1;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
2021-12-10 19:02:10 -04:00
|
|
|
|
|
|
|
PyObject *line = PyUnicode_FromFormat("... (max_group_depth is %d)\n",
|
|
|
|
ctx->max_group_depth);
|
|
|
|
if (line == NULL) {
|
|
|
|
return -1;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
2021-12-10 19:02:10 -04:00
|
|
|
int err = PyFile_WriteObject(line, f, Py_PRINT_RAW);
|
|
|
|
Py_DECREF(line);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ctx->exception_group_depth == 0) {
|
|
|
|
ctx->exception_group_depth += 1;
|
|
|
|
}
|
|
|
|
print_exception(ctx, value);
|
|
|
|
|
|
|
|
PyObject *excs = ((PyBaseExceptionGroupObject *)value)->excs;
|
|
|
|
assert(excs && PyTuple_Check(excs));
|
|
|
|
Py_ssize_t num_excs = PyTuple_GET_SIZE(excs);
|
|
|
|
assert(num_excs > 0);
|
|
|
|
Py_ssize_t n;
|
|
|
|
if (num_excs <= ctx->max_group_width) {
|
|
|
|
n = num_excs;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
|
|
|
else {
|
2021-12-10 19:02:10 -04:00
|
|
|
n = ctx->max_group_width + 1;
|
|
|
|
}
|
2021-11-05 06:39:18 -03:00
|
|
|
|
2021-12-10 19:02:10 -04:00
|
|
|
ctx->need_close = false;
|
|
|
|
for (Py_ssize_t i = 0; i < n; i++) {
|
|
|
|
bool last_exc = (i == n - 1);
|
|
|
|
if (last_exc) {
|
|
|
|
// The closing frame may be added in a recursive call
|
|
|
|
ctx->need_close = true;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
|
|
|
|
2021-12-10 19:02:10 -04:00
|
|
|
if (_Py_WriteIndent(EXC_INDENT(ctx), f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
bool truncated = (i >= ctx->max_group_width);
|
|
|
|
PyObject *line;
|
|
|
|
if (!truncated) {
|
|
|
|
line = PyUnicode_FromFormat(
|
|
|
|
"%s+---------------- %zd ----------------\n",
|
|
|
|
(i == 0) ? "+-" : " ", i + 1);
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
|
|
|
else {
|
2021-12-10 19:02:10 -04:00
|
|
|
line = PyUnicode_FromFormat(
|
|
|
|
"%s+---------------- ... ----------------\n",
|
|
|
|
(i == 0) ? "+-" : " ");
|
|
|
|
}
|
|
|
|
if (line == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
int err = PyFile_WriteObject(line, f, Py_PRINT_RAW);
|
|
|
|
Py_DECREF(line);
|
|
|
|
if (err < 0) {
|
|
|
|
return -1;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
|
|
|
|
2021-12-10 19:02:10 -04:00
|
|
|
ctx->exception_group_depth += 1;
|
|
|
|
PyObject *exc = PyTuple_GET_ITEM(excs, i);
|
2021-11-05 06:39:18 -03:00
|
|
|
|
2021-12-10 19:02:10 -04:00
|
|
|
if (!truncated) {
|
2021-12-16 19:00:13 -04:00
|
|
|
if (Py_EnterRecursiveCall(" in print_exception_group") != 0) {
|
2021-12-10 19:02:10 -04:00
|
|
|
return -1;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
2021-12-16 19:00:13 -04:00
|
|
|
int res = print_exception_recursive(ctx, exc);
|
2021-12-10 19:02:10 -04:00
|
|
|
Py_LeaveRecursiveCall();
|
2021-12-16 19:00:13 -04:00
|
|
|
if (res < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2021-12-10 19:02:10 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_ssize_t excs_remaining = num_excs - ctx->max_group_width;
|
|
|
|
|
|
|
|
if (write_indented_margin(ctx, f) < 0) {
|
|
|
|
return -1;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
2021-12-10 19:02:10 -04:00
|
|
|
|
|
|
|
PyObject *line = PyUnicode_FromFormat(
|
|
|
|
"and %zd more exception%s\n",
|
|
|
|
excs_remaining, excs_remaining > 1 ? "s" : "");
|
|
|
|
|
|
|
|
if (line == NULL) {
|
|
|
|
return -1;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
|
|
|
|
2021-12-10 19:02:10 -04:00
|
|
|
int err = PyFile_WriteObject(line, f, Py_PRINT_RAW);
|
|
|
|
Py_DECREF(line);
|
|
|
|
if (err < 0) {
|
|
|
|
return -1;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
2021-12-10 19:02:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (last_exc && ctx->need_close) {
|
|
|
|
if (_Py_WriteIndent(EXC_INDENT(ctx), f) < 0) {
|
|
|
|
return -1;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
2021-12-10 19:02:10 -04:00
|
|
|
if (PyFile_WriteString(
|
|
|
|
"+------------------------------------\n", f) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
ctx->need_close = false;
|
|
|
|
}
|
|
|
|
ctx->exception_group_depth -= 1;
|
|
|
|
}
|
2021-11-05 06:39:18 -03:00
|
|
|
|
2021-12-10 19:02:10 -04:00
|
|
|
if (ctx->exception_group_depth == 1) {
|
|
|
|
ctx->exception_group_depth -= 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2021-11-05 06:39:18 -03:00
|
|
|
|
2021-12-16 19:00:13 -04:00
|
|
|
static int
|
2021-12-10 19:02:10 -04:00
|
|
|
print_exception_recursive(struct exception_print_context *ctx, PyObject *value)
|
|
|
|
{
|
|
|
|
if (ctx->seen != NULL) {
|
|
|
|
/* Exception chaining */
|
2021-12-16 19:00:13 -04:00
|
|
|
if (print_exception_cause_and_context(ctx, value) < 0) {
|
|
|
|
return -1;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
2021-12-16 19:00:13 -04:00
|
|
|
}
|
|
|
|
if (!_PyBaseExceptionGroup_Check(value)) {
|
|
|
|
if (print_exception(ctx, value) < 0) {
|
|
|
|
return -1;
|
2021-11-05 06:39:18 -03:00
|
|
|
}
|
|
|
|
}
|
2021-12-16 19:00:13 -04:00
|
|
|
else if (print_exception_group(ctx, value) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
assert(!PyErr_Occurred());
|
|
|
|
return 0;
|
2008-07-15 12:32:09 -03:00
|
|
|
}
|
|
|
|
|
2021-11-05 06:39:18 -03:00
|
|
|
#define PyErr_MAX_GROUP_WIDTH 15
|
|
|
|
#define PyErr_MAX_GROUP_DEPTH 10
|
|
|
|
|
2008-07-15 12:32:09 -03:00
|
|
|
void
|
2019-05-27 19:39:52 -03:00
|
|
|
_PyErr_Display(PyObject *file, PyObject *exception, PyObject *value, PyObject *tb)
|
2008-07-15 12:32:09 -03:00
|
|
|
{
|
2019-05-27 19:39:52 -03:00
|
|
|
assert(file != NULL && file != Py_None);
|
2013-10-13 16:53:13 -03:00
|
|
|
if (PyExceptionInstance_Check(value)
|
|
|
|
&& tb != NULL && PyTraceBack_Check(tb)) {
|
|
|
|
/* Put the traceback on the exception, otherwise it won't get
|
|
|
|
displayed. See issue #18776. */
|
|
|
|
PyObject *cur_tb = PyException_GetTraceback(value);
|
|
|
|
if (cur_tb == NULL)
|
|
|
|
PyException_SetTraceback(value, tb);
|
|
|
|
else
|
|
|
|
Py_DECREF(cur_tb);
|
|
|
|
}
|
2019-05-27 19:39:52 -03:00
|
|
|
|
2021-11-05 06:39:18 -03:00
|
|
|
struct exception_print_context ctx;
|
|
|
|
ctx.file = file;
|
|
|
|
ctx.exception_group_depth = 0;
|
|
|
|
ctx.max_group_width = PyErr_MAX_GROUP_WIDTH;
|
|
|
|
ctx.max_group_depth = PyErr_MAX_GROUP_DEPTH;
|
|
|
|
|
2019-05-27 19:39:52 -03:00
|
|
|
/* We choose to ignore seen being possibly NULL, and report
|
|
|
|
at least the main exception (it could be a MemoryError).
|
|
|
|
*/
|
2021-11-05 06:39:18 -03:00
|
|
|
ctx.seen = PySet_New(NULL);
|
|
|
|
if (ctx.seen == NULL) {
|
2019-05-27 19:39:52 -03:00
|
|
|
PyErr_Clear();
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2021-12-16 19:00:13 -04:00
|
|
|
if (print_exception_recursive(&ctx, value) < 0) {
|
|
|
|
PyErr_Clear();
|
2022-02-08 16:39:07 -04:00
|
|
|
_PyObject_Dump(value);
|
|
|
|
fprintf(stderr, "lost sys.stderr\n");
|
2021-12-16 19:00:13 -04:00
|
|
|
}
|
2021-11-05 06:39:18 -03:00
|
|
|
Py_XDECREF(ctx.seen);
|
2019-05-28 11:01:17 -03:00
|
|
|
|
|
|
|
/* Call file.flush() */
|
2022-02-08 16:39:07 -04:00
|
|
|
PyObject *res = _PyObject_CallMethodNoArgs(file, &_Py_ID(flush));
|
2019-05-28 11:01:17 -03:00
|
|
|
if (!res) {
|
|
|
|
/* Silently ignore file.flush() error */
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(res);
|
|
|
|
}
|
2019-05-27 19:39:52 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
|
|
|
|
{
|
2022-02-08 16:39:07 -04:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
PyObject *file = _PySys_GetAttr(tstate, &_Py_ID(stderr));
|
2019-05-27 19:39:52 -03:00
|
|
|
if (file == NULL) {
|
2010-05-09 12:52:27 -03:00
|
|
|
_PyObject_Dump(value);
|
|
|
|
fprintf(stderr, "lost sys.stderr\n");
|
2019-05-27 19:39:52 -03:00
|
|
|
return;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2019-05-27 19:39:52 -03:00
|
|
|
if (file == Py_None) {
|
|
|
|
return;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2021-03-29 19:38:51 -03:00
|
|
|
Py_INCREF(file);
|
2019-05-27 19:39:52 -03:00
|
|
|
_PyErr_Display(file, exception, value, tb);
|
2021-03-29 19:38:51 -03:00
|
|
|
Py_DECREF(file);
|
2008-07-15 12:32:09 -03:00
|
|
|
}
|
|
|
|
|
1997-03-04 20:20:32 -04:00
|
|
|
PyObject *
|
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2006-06-08 11:42:34 -03:00
|
|
|
PyRun_StringFlags(const char *str, int start, PyObject *globals,
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *locals, PyCompilerFlags *flags)
|
1992-08-04 09:41:02 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *ret = NULL;
|
|
|
|
mod_ty mod;
|
2013-11-06 13:41:07 -04:00
|
|
|
PyArena *arena;
|
|
|
|
|
2021-03-23 22:23:01 -03:00
|
|
|
arena = _PyArena_New();
|
2010-05-09 12:52:27 -03:00
|
|
|
if (arena == NULL)
|
|
|
|
return NULL;
|
2007-11-06 17:34:58 -04:00
|
|
|
|
2022-02-14 20:36:51 -04:00
|
|
|
_Py_DECLARE_STR(anon_string, "<string>");
|
2022-02-08 16:39:07 -04:00
|
|
|
mod = _PyParser_ASTFromString(
|
|
|
|
str, &_Py_STR(anon_string), start, flags, arena);
|
2020-04-22 19:29:27 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (mod != NULL)
|
2022-02-08 16:39:07 -04:00
|
|
|
ret = run_mod(mod, &_Py_STR(anon_string), globals, locals, flags, arena);
|
2021-03-23 22:23:01 -03:00
|
|
|
_PyArena_Free(arena);
|
2010-05-09 12:52:27 -03:00
|
|
|
return ret;
|
2001-03-21 22:47:58 -04:00
|
|
|
}
|
|
|
|
|
2013-11-06 13:41:07 -04:00
|
|
|
|
2020-12-08 09:38:08 -04:00
|
|
|
static PyObject *
|
|
|
|
pyrun_file(FILE *fp, PyObject *filename, int start, PyObject *globals,
|
|
|
|
PyObject *locals, int closeit, PyCompilerFlags *flags)
|
|
|
|
{
|
2021-03-23 22:23:01 -03:00
|
|
|
PyArena *arena = _PyArena_New();
|
2020-12-08 09:38:08 -04:00
|
|
|
if (arena == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2020-12-08 09:38:08 -04:00
|
|
|
mod_ty mod;
|
2021-03-23 21:29:09 -03:00
|
|
|
mod = _PyParser_ASTFromFile(fp, filename, NULL, start, NULL, NULL,
|
|
|
|
flags, NULL, arena);
|
2020-04-22 19:29:27 -03:00
|
|
|
|
2020-12-08 09:38:08 -04:00
|
|
|
if (closeit) {
|
2010-05-09 12:52:27 -03:00
|
|
|
fclose(fp);
|
|
|
|
}
|
2013-11-06 13:41:07 -04:00
|
|
|
|
2020-12-08 09:38:08 -04:00
|
|
|
PyObject *ret;
|
|
|
|
if (mod != NULL) {
|
|
|
|
ret = run_mod(mod, filename, globals, locals, flags, arena);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ret = NULL;
|
|
|
|
}
|
2021-03-23 22:23:01 -03:00
|
|
|
_PyArena_Free(arena);
|
2020-12-08 09:38:08 -04:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
return ret;
|
2001-03-21 22:47:58 -04:00
|
|
|
}
|
|
|
|
|
2020-12-08 09:38:08 -04:00
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyRun_FileExFlags(FILE *fp, const char *filename, int start, PyObject *globals,
|
|
|
|
PyObject *locals, int closeit, PyCompilerFlags *flags)
|
|
|
|
{
|
|
|
|
PyObject *filename_obj = PyUnicode_DecodeFSDefault(filename);
|
|
|
|
if (filename_obj == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *res = pyrun_file(fp, filename_obj, start, globals,
|
|
|
|
locals, closeit, flags);
|
|
|
|
Py_DECREF(filename_obj);
|
|
|
|
return res;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-12-05 01:14:58 -04:00
|
|
|
static void
|
|
|
|
flush_io(void)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *f, *r;
|
|
|
|
PyObject *type, *value, *traceback;
|
2008-04-04 20:25:27 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Save the current exception */
|
|
|
|
PyErr_Fetch(&type, &value, &traceback);
|
2008-04-04 20:25:27 -03:00
|
|
|
|
2022-02-08 16:39:07 -04:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
f = _PySys_GetAttr(tstate, &_Py_ID(stderr));
|
2010-05-09 12:52:27 -03:00
|
|
|
if (f != NULL) {
|
2022-02-08 16:39:07 -04:00
|
|
|
r = _PyObject_CallMethodNoArgs(f, &_Py_ID(flush));
|
2010-05-09 12:52:27 -03:00
|
|
|
if (r)
|
|
|
|
Py_DECREF(r);
|
|
|
|
else
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
2022-02-08 16:39:07 -04:00
|
|
|
f = _PySys_GetAttr(tstate, &_Py_ID(stdout));
|
2010-05-09 12:52:27 -03:00
|
|
|
if (f != NULL) {
|
2022-02-08 16:39:07 -04:00
|
|
|
r = _PyObject_CallMethodNoArgs(f, &_Py_ID(flush));
|
2010-05-09 12:52:27 -03:00
|
|
|
if (r)
|
|
|
|
Py_DECREF(r);
|
|
|
|
else
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
2008-04-04 20:25:27 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
PyErr_Restore(type, value, traceback);
|
2007-12-05 01:14:58 -04:00
|
|
|
}
|
|
|
|
|
2019-02-16 16:57:40 -04:00
|
|
|
static PyObject *
|
2020-03-27 11:11:45 -03:00
|
|
|
run_eval_code_obj(PyThreadState *tstate, PyCodeObject *co, PyObject *globals, PyObject *locals)
|
2019-02-16 16:57:40 -04:00
|
|
|
{
|
|
|
|
PyObject *v;
|
2019-02-20 21:35:54 -04:00
|
|
|
/*
|
|
|
|
* We explicitly re-initialize _Py_UnhandledKeyboardInterrupt every eval
|
|
|
|
* _just in case_ someone is calling into an embedded Python where they
|
|
|
|
* don't care about an uncaught KeyboardInterrupt exception (why didn't they
|
|
|
|
* leave config.install_signal_handlers set to 0?!?) but then later call
|
|
|
|
* Py_Main() itself (which _checks_ this flag and dies with a signal after
|
|
|
|
* its interpreter exits). We don't want a previous embedded interpreter's
|
|
|
|
* uncaught exception to trigger an unexplained signal exit from a future
|
|
|
|
* Py_Main() based one.
|
|
|
|
*/
|
|
|
|
_Py_UnhandledKeyboardInterrupt = 0;
|
2019-05-16 12:38:16 -03:00
|
|
|
|
|
|
|
/* Set globals['__builtins__'] if it doesn't exist */
|
2020-10-26 03:43:39 -03:00
|
|
|
if (globals != NULL && _PyDict_GetItemStringWithError(globals, "__builtins__") == NULL) {
|
|
|
|
if (PyErr_Occurred() ||
|
|
|
|
PyDict_SetItemString(globals, "__builtins__",
|
|
|
|
tstate->interp->builtins) < 0)
|
|
|
|
{
|
2019-05-16 12:38:16 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-16 16:57:40 -04:00
|
|
|
v = PyEval_EvalCode((PyObject*)co, globals, locals);
|
2020-03-27 11:11:45 -03:00
|
|
|
if (!v && _PyErr_Occurred(tstate) == PyExc_KeyboardInterrupt) {
|
2019-02-16 16:57:40 -04:00
|
|
|
_Py_UnhandledKeyboardInterrupt = 1;
|
|
|
|
}
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
1997-03-04 20:20:32 -04:00
|
|
|
static PyObject *
|
2013-11-06 13:41:07 -04:00
|
|
|
run_mod(mod_ty mod, PyObject *filename, PyObject *globals, PyObject *locals,
|
|
|
|
PyCompilerFlags *flags, PyArena *arena)
|
1992-08-04 09:41:02 -03:00
|
|
|
{
|
2020-03-27 11:11:45 -03:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2021-03-23 20:51:50 -03:00
|
|
|
PyCodeObject *co = _PyAST_Compile(mod, filename, flags, -1, arena);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (co == NULL)
|
|
|
|
return NULL;
|
2019-05-23 12:45:22 -03:00
|
|
|
|
2020-03-27 11:11:45 -03:00
|
|
|
if (_PySys_Audit(tstate, "exec", "O", co) < 0) {
|
2019-05-23 12:45:22 -03:00
|
|
|
Py_DECREF(co);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-03-27 11:11:45 -03:00
|
|
|
PyObject *v = run_eval_code_obj(tstate, co, globals, locals);
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(co);
|
|
|
|
return v;
|
1992-08-04 09:41:02 -03:00
|
|
|
}
|
|
|
|
|
1997-03-04 20:20:32 -04:00
|
|
|
static PyObject *
|
2020-12-08 09:38:08 -04:00
|
|
|
run_pyc_file(FILE *fp, PyObject *globals, PyObject *locals,
|
|
|
|
PyCompilerFlags *flags)
|
2010-05-09 12:52:27 -03:00
|
|
|
{
|
2020-03-27 11:11:45 -03:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2010-05-09 12:52:27 -03:00
|
|
|
PyCodeObject *co;
|
|
|
|
PyObject *v;
|
|
|
|
long magic;
|
|
|
|
long PyImport_GetMagicNumber(void);
|
|
|
|
|
|
|
|
magic = PyMarshal_ReadLongFromFile(fp);
|
|
|
|
if (magic != PyImport_GetMagicNumber()) {
|
2015-03-18 09:56:25 -03:00
|
|
|
if (!PyErr_Occurred())
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"Bad magic number in .pyc file");
|
2018-06-24 00:15:24 -03:00
|
|
|
goto error;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2017-12-09 14:26:52 -04:00
|
|
|
/* Skip the rest of the header. */
|
|
|
|
(void) PyMarshal_ReadLongFromFile(fp);
|
2012-01-13 13:52:16 -04:00
|
|
|
(void) PyMarshal_ReadLongFromFile(fp);
|
2010-05-09 12:52:27 -03:00
|
|
|
(void) PyMarshal_ReadLongFromFile(fp);
|
2018-06-24 00:15:24 -03:00
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
goto error;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
v = PyMarshal_ReadLastObjectFromFile(fp);
|
|
|
|
if (v == NULL || !PyCode_Check(v)) {
|
|
|
|
Py_XDECREF(v);
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"Bad code object in .pyc file");
|
2018-06-24 00:15:24 -03:00
|
|
|
goto error;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2018-06-24 00:15:24 -03:00
|
|
|
fclose(fp);
|
2010-05-09 12:52:27 -03:00
|
|
|
co = (PyCodeObject *)v;
|
2020-03-27 11:11:45 -03:00
|
|
|
v = run_eval_code_obj(tstate, co, globals, locals);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (v && flags)
|
|
|
|
flags->cf_flags |= (co->co_flags & PyCF_MASK);
|
|
|
|
Py_DECREF(co);
|
|
|
|
return v;
|
2018-06-24 00:15:24 -03:00
|
|
|
error:
|
|
|
|
fclose(fp);
|
|
|
|
return NULL;
|
1994-09-14 10:31:04 -03:00
|
|
|
}
|
|
|
|
|
2001-03-21 22:47:58 -04:00
|
|
|
PyObject *
|
2013-08-26 17:28:21 -03:00
|
|
|
Py_CompileStringObject(const char *str, PyObject *filename, int start,
|
|
|
|
PyCompilerFlags *flags, int optimize)
|
2010-05-09 12:52:27 -03:00
|
|
|
{
|
|
|
|
PyCodeObject *co;
|
|
|
|
mod_ty mod;
|
2021-03-23 22:23:01 -03:00
|
|
|
PyArena *arena = _PyArena_New();
|
2010-05-09 12:52:27 -03:00
|
|
|
if (arena == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2021-03-23 21:29:09 -03:00
|
|
|
mod = _PyParser_ASTFromString(str, filename, start, flags, arena);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (mod == NULL) {
|
2021-03-23 22:23:01 -03:00
|
|
|
_PyArena_Free(arena);
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (flags && (flags->cf_flags & PyCF_ONLY_AST)) {
|
|
|
|
PyObject *result = PyAST_mod2obj(mod);
|
2021-03-23 22:23:01 -03:00
|
|
|
_PyArena_Free(arena);
|
2010-05-09 12:52:27 -03:00
|
|
|
return result;
|
|
|
|
}
|
2021-03-23 20:51:50 -03:00
|
|
|
co = _PyAST_Compile(mod, filename, flags, optimize, arena);
|
2021-03-23 22:23:01 -03:00
|
|
|
_PyArena_Free(arena);
|
2010-05-09 12:52:27 -03:00
|
|
|
return (PyObject *)co;
|
1993-03-30 13:46:03 -04:00
|
|
|
}
|
|
|
|
|
2013-08-26 17:28:21 -03:00
|
|
|
PyObject *
|
|
|
|
Py_CompileStringExFlags(const char *str, const char *filename_str, int start,
|
|
|
|
PyCompilerFlags *flags, int optimize)
|
|
|
|
{
|
|
|
|
PyObject *filename, *co;
|
|
|
|
filename = PyUnicode_DecodeFSDefault(filename_str);
|
|
|
|
if (filename == NULL)
|
|
|
|
return NULL;
|
|
|
|
co = Py_CompileStringObject(str, filename, start, flags, optimize);
|
|
|
|
Py_DECREF(filename);
|
|
|
|
return co;
|
|
|
|
}
|
|
|
|
|
2019-05-28 20:21:17 -03:00
|
|
|
const char *
|
|
|
|
_Py_SourceAsString(PyObject *cmd, const char *funcname, const char *what, PyCompilerFlags *cf, PyObject **cmd_copy)
|
|
|
|
{
|
|
|
|
const char *str;
|
|
|
|
Py_ssize_t size;
|
|
|
|
Py_buffer view;
|
|
|
|
|
|
|
|
*cmd_copy = NULL;
|
|
|
|
if (PyUnicode_Check(cmd)) {
|
|
|
|
cf->cf_flags |= PyCF_IGNORE_COOKIE;
|
|
|
|
str = PyUnicode_AsUTF8AndSize(cmd, &size);
|
|
|
|
if (str == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
else if (PyBytes_Check(cmd)) {
|
|
|
|
str = PyBytes_AS_STRING(cmd);
|
|
|
|
size = PyBytes_GET_SIZE(cmd);
|
|
|
|
}
|
|
|
|
else if (PyByteArray_Check(cmd)) {
|
|
|
|
str = PyByteArray_AS_STRING(cmd);
|
|
|
|
size = PyByteArray_GET_SIZE(cmd);
|
|
|
|
}
|
|
|
|
else if (PyObject_GetBuffer(cmd, &view, PyBUF_SIMPLE) == 0) {
|
|
|
|
/* Copy to NUL-terminated buffer. */
|
|
|
|
*cmd_copy = PyBytes_FromStringAndSize(
|
|
|
|
(const char *)view.buf, view.len);
|
|
|
|
PyBuffer_Release(&view);
|
|
|
|
if (*cmd_copy == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
str = PyBytes_AS_STRING(*cmd_copy);
|
|
|
|
size = PyBytes_GET_SIZE(*cmd_copy);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"%s() arg 1 must be a %s object",
|
|
|
|
funcname, what);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strlen(str) != (size_t)size) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"source code string cannot contain null bytes");
|
|
|
|
Py_CLEAR(*cmd_copy);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2014-11-22 01:35:12 -04:00
|
|
|
#if defined(USE_STACKCHECK)
|
|
|
|
#if defined(WIN32) && defined(_MSC_VER)
|
|
|
|
|
|
|
|
/* Stack checking for Microsoft C */
|
|
|
|
|
|
|
|
#include <malloc.h>
|
|
|
|
#include <excpt.h>
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return non-zero when we run out of memory on the stack; zero otherwise.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
PyOS_CheckStack(void)
|
|
|
|
{
|
|
|
|
__try {
|
|
|
|
/* alloca throws a stack overflow exception if there's
|
|
|
|
not enough space left on the stack */
|
|
|
|
alloca(PYOS_STACK_MARGIN * sizeof(void*));
|
|
|
|
return 0;
|
|
|
|
} __except (GetExceptionCode() == STATUS_STACK_OVERFLOW ?
|
|
|
|
EXCEPTION_EXECUTE_HANDLER :
|
|
|
|
EXCEPTION_CONTINUE_SEARCH) {
|
|
|
|
int errcode = _resetstkoflw();
|
|
|
|
if (errcode == 0)
|
|
|
|
{
|
|
|
|
Py_FatalError("Could not reset the stack!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* WIN32 && _MSC_VER */
|
|
|
|
|
|
|
|
/* Alternate implementations can be added here... */
|
|
|
|
|
|
|
|
#endif /* USE_STACKCHECK */
|
|
|
|
|
2020-12-02 01:16:31 -04:00
|
|
|
/* Deprecated C API functions still provided for binary compatibility */
|
|
|
|
|
|
|
|
#undef PyRun_AnyFile
|
|
|
|
PyAPI_FUNC(int)
|
|
|
|
PyRun_AnyFile(FILE *fp, const char *name)
|
|
|
|
{
|
|
|
|
return PyRun_AnyFileExFlags(fp, name, 0, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef PyRun_AnyFileEx
|
|
|
|
PyAPI_FUNC(int)
|
|
|
|
PyRun_AnyFileEx(FILE *fp, const char *name, int closeit)
|
|
|
|
{
|
|
|
|
return PyRun_AnyFileExFlags(fp, name, closeit, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef PyRun_AnyFileFlags
|
|
|
|
PyAPI_FUNC(int)
|
|
|
|
PyRun_AnyFileFlags(FILE *fp, const char *name, PyCompilerFlags *flags)
|
|
|
|
{
|
|
|
|
return PyRun_AnyFileExFlags(fp, name, 0, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef PyRun_File
|
|
|
|
PyAPI_FUNC(PyObject *)
|
|
|
|
PyRun_File(FILE *fp, const char *p, int s, PyObject *g, PyObject *l)
|
|
|
|
{
|
|
|
|
return PyRun_FileExFlags(fp, p, s, g, l, 0, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef PyRun_FileEx
|
|
|
|
PyAPI_FUNC(PyObject *)
|
|
|
|
PyRun_FileEx(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, int c)
|
|
|
|
{
|
|
|
|
return PyRun_FileExFlags(fp, p, s, g, l, c, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef PyRun_FileFlags
|
|
|
|
PyAPI_FUNC(PyObject *)
|
|
|
|
PyRun_FileFlags(FILE *fp, const char *p, int s, PyObject *g, PyObject *l,
|
|
|
|
PyCompilerFlags *flags)
|
|
|
|
{
|
|
|
|
return PyRun_FileExFlags(fp, p, s, g, l, 0, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef PyRun_SimpleFile
|
|
|
|
PyAPI_FUNC(int)
|
|
|
|
PyRun_SimpleFile(FILE *f, const char *p)
|
|
|
|
{
|
|
|
|
return PyRun_SimpleFileExFlags(f, p, 0, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef PyRun_SimpleFileEx
|
|
|
|
PyAPI_FUNC(int)
|
|
|
|
PyRun_SimpleFileEx(FILE *f, const char *p, int c)
|
|
|
|
{
|
|
|
|
return PyRun_SimpleFileExFlags(f, p, c, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#undef PyRun_String
|
|
|
|
PyAPI_FUNC(PyObject *)
|
|
|
|
PyRun_String(const char *str, int s, PyObject *g, PyObject *l)
|
|
|
|
{
|
|
|
|
return PyRun_StringFlags(str, s, g, l, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef PyRun_SimpleString
|
|
|
|
PyAPI_FUNC(int)
|
|
|
|
PyRun_SimpleString(const char *s)
|
|
|
|
{
|
|
|
|
return PyRun_SimpleStringFlags(s, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef Py_CompileString
|
|
|
|
PyAPI_FUNC(PyObject *)
|
|
|
|
Py_CompileString(const char *str, const char *p, int s)
|
|
|
|
{
|
|
|
|
return Py_CompileStringExFlags(str, p, s, NULL, -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef Py_CompileStringFlags
|
|
|
|
PyAPI_FUNC(PyObject *)
|
|
|
|
Py_CompileStringFlags(const char *str, const char *p, int s,
|
|
|
|
PyCompilerFlags *flags)
|
|
|
|
{
|
|
|
|
return Py_CompileStringExFlags(str, p, s, flags, -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef PyRun_InteractiveOne
|
|
|
|
PyAPI_FUNC(int)
|
|
|
|
PyRun_InteractiveOne(FILE *f, const char *p)
|
|
|
|
{
|
|
|
|
return PyRun_InteractiveOneFlags(f, p, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef PyRun_InteractiveLoop
|
|
|
|
PyAPI_FUNC(int)
|
|
|
|
PyRun_InteractiveLoop(FILE *f, const char *p)
|
|
|
|
{
|
|
|
|
return PyRun_InteractiveLoopFlags(f, p, NULL);
|
|
|
|
}
|
|
|
|
|
2006-04-21 07:40:58 -03:00
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif
|