1990-12-20 15:06:42 +00:00
|
|
|
/* Execute compiled code */
|
1990-11-18 17:27:39 +00:00
|
|
|
|
2022-05-18 13:38:43 +00:00
|
|
|
#define _PY_INTERPRETER
|
|
|
|
|
1997-04-29 18:18:01 +00:00
|
|
|
#include "Python.h"
|
2020-04-14 16:30:41 +00:00
|
|
|
#include "pycore_abstract.h" // _PyIndex_Check()
|
2020-06-22 15:27:35 +00:00
|
|
|
#include "pycore_call.h" // _PyObject_FastCallDictTstate()
|
|
|
|
#include "pycore_ceval.h" // _PyEval_SignalAsyncExc()
|
2021-10-20 18:53:48 +00:00
|
|
|
#include "pycore_code.h"
|
2021-11-23 09:53:24 +00:00
|
|
|
#include "pycore_function.h"
|
2023-01-05 16:05:51 +00:00
|
|
|
#include "pycore_intrinsics.h"
|
2021-07-15 12:13:12 +00:00
|
|
|
#include "pycore_long.h" // _PyLong_GetZero()
|
2023-04-12 11:04:55 +00:00
|
|
|
#include "pycore_instruments.h"
|
2020-06-22 15:27:35 +00:00
|
|
|
#include "pycore_object.h" // _PyObject_GC_TRACK()
|
2021-10-12 06:38:19 +00:00
|
|
|
#include "pycore_moduleobject.h" // PyModuleObject
|
2022-04-25 22:14:30 +00:00
|
|
|
#include "pycore_opcode.h" // EXTRA_CASES
|
2023-03-13 15:56:24 +00:00
|
|
|
#include "pycore_pyerrors.h" // _PyErr_GetRaisedException()
|
2020-04-14 16:30:41 +00:00
|
|
|
#include "pycore_pymem.h" // _PyMem_IsPtrFreed()
|
|
|
|
#include "pycore_pystate.h" // _PyInterpreterState_GET()
|
2022-06-21 10:19:26 +00:00
|
|
|
#include "pycore_range.h" // _PyRangeIterObject
|
2022-06-27 11:24:23 +00:00
|
|
|
#include "pycore_sliceobject.h" // _PyBuildSlice_ConsumeRefs
|
2020-06-22 15:27:35 +00:00
|
|
|
#include "pycore_sysmodule.h" // _PySys_Audit()
|
|
|
|
#include "pycore_tuple.h" // _PyTuple_ITEMS()
|
2023-04-24 22:22:14 +00:00
|
|
|
#include "pycore_typeobject.h" // _PySuper_Lookup()
|
2022-04-03 20:58:52 +00:00
|
|
|
#include "pycore_emscripten_signal.h" // _Py_CHECK_EMSCRIPTEN_SIGNALS
|
1990-11-18 17:27:39 +00:00
|
|
|
|
2021-06-10 07:46:01 +00:00
|
|
|
#include "pycore_dict.h"
|
2015-05-06 00:16:41 +00:00
|
|
|
#include "dictobject.h"
|
2021-05-21 09:57:35 +00:00
|
|
|
#include "pycore_frame.h"
|
2023-05-05 16:53:07 +00:00
|
|
|
#include "frameobject.h" // _PyInterpreterFrame_GetLine
|
1990-11-18 17:27:39 +00:00
|
|
|
#include "opcode.h"
|
2016-09-10 00:37:37 +00:00
|
|
|
#include "pydtrace.h"
|
2015-05-06 00:16:41 +00:00
|
|
|
#include "setobject.h"
|
2021-01-30 02:02:29 +00:00
|
|
|
#include "structmember.h" // struct PyMemberDef, T_OFFSET_EX
|
1990-11-18 17:27:39 +00:00
|
|
|
|
1993-11-05 10:22:19 +00:00
|
|
|
#include <ctype.h>
|
2021-12-14 16:48:15 +00:00
|
|
|
#include <stdbool.h>
|
1993-11-05 10:22:19 +00:00
|
|
|
|
1996-12-30 16:17:54 +00:00
|
|
|
#ifdef Py_DEBUG
|
2022-02-07 15:06:27 +00:00
|
|
|
/* For debugging the interpreter: */
|
|
|
|
# define LLTRACE 1 /* Low-level trace feature */
|
1990-11-18 17:27:39 +00:00
|
|
|
#endif
|
|
|
|
|
2019-04-17 21:02:26 +00:00
|
|
|
#if !defined(Py_BUILD_CORE)
|
|
|
|
# error "ceval.c must be build with Py_BUILD_CORE define for best performance"
|
|
|
|
#endif
|
|
|
|
|
2022-09-06 18:02:41 +00:00
|
|
|
#if !defined(Py_DEBUG) && !defined(Py_TRACE_REFS)
|
2022-04-22 14:46:26 +00:00
|
|
|
// GH-89279: The MSVC compiler does not inline these static inline functions
|
|
|
|
// in PGO build in _PyEval_EvalFrameDefault(), because this function is over
|
|
|
|
// the limit of PGO, and that limit cannot be configured.
|
|
|
|
// Define them as macros to make sure that they are always inlined by the
|
|
|
|
// preprocessor.
|
|
|
|
|
|
|
|
#undef Py_DECREF
|
|
|
|
#define Py_DECREF(arg) \
|
|
|
|
do { \
|
|
|
|
PyObject *op = _PyObject_CAST(arg); \
|
2023-04-22 19:39:37 +00:00
|
|
|
if (_Py_IsImmortal(op)) { \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
_Py_DECREF_STAT_INC(); \
|
2022-04-22 14:46:26 +00:00
|
|
|
if (--op->ob_refcnt == 0) { \
|
|
|
|
destructor dealloc = Py_TYPE(op)->tp_dealloc; \
|
|
|
|
(*dealloc)(op); \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#undef Py_XDECREF
|
|
|
|
#define Py_XDECREF(arg) \
|
|
|
|
do { \
|
|
|
|
PyObject *xop = _PyObject_CAST(arg); \
|
|
|
|
if (xop != NULL) { \
|
|
|
|
Py_DECREF(xop); \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#undef Py_IS_TYPE
|
|
|
|
#define Py_IS_TYPE(ob, type) \
|
|
|
|
(_PyObject_CAST(ob)->ob_type == (type))
|
|
|
|
|
|
|
|
#undef _Py_DECREF_SPECIALIZED
|
|
|
|
#define _Py_DECREF_SPECIALIZED(arg, dealloc) \
|
|
|
|
do { \
|
|
|
|
PyObject *op = _PyObject_CAST(arg); \
|
2023-04-22 19:39:37 +00:00
|
|
|
if (_Py_IsImmortal(op)) { \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
_Py_DECREF_STAT_INC(); \
|
2022-04-22 14:46:26 +00:00
|
|
|
if (--op->ob_refcnt == 0) { \
|
|
|
|
destructor d = (destructor)(dealloc); \
|
|
|
|
d(op); \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// GH-89279: Similar to above, force inlining by using a macro.
|
|
|
|
#if defined(_MSC_VER) && SIZEOF_INT == 4
|
|
|
|
#define _Py_atomic_load_relaxed_int32(ATOMIC_VAL) (assert(sizeof((ATOMIC_VAL)->_value) == 4), *((volatile int*)&((ATOMIC_VAL)->_value)))
|
|
|
|
#else
|
|
|
|
#define _Py_atomic_load_relaxed_int32(ATOMIC_VAL) _Py_atomic_load_relaxed(ATOMIC_VAL)
|
|
|
|
#endif
|
|
|
|
|
2001-01-03 23:52:36 +00:00
|
|
|
|
1992-03-27 17:29:15 +00:00
|
|
|
#ifdef LLTRACE
|
2022-04-16 21:36:29 +00:00
|
|
|
static void
|
|
|
|
dump_stack(_PyInterpreterFrame *frame, PyObject **stack_pointer)
|
|
|
|
{
|
|
|
|
PyObject **stack_base = _PyFrame_Stackbase(frame);
|
2023-02-28 11:50:52 +00:00
|
|
|
PyObject *exc = PyErr_GetRaisedException();
|
2022-04-16 21:36:29 +00:00
|
|
|
printf(" stack=[");
|
|
|
|
for (PyObject **ptr = stack_base; ptr < stack_pointer; ptr++) {
|
|
|
|
if (ptr != stack_base) {
|
|
|
|
printf(", ");
|
|
|
|
}
|
|
|
|
if (PyObject_Print(*ptr, stdout, 0) != 0) {
|
|
|
|
PyErr_Clear();
|
|
|
|
printf("<%s object at %p>",
|
|
|
|
Py_TYPE(*ptr)->tp_name, (void *)(*ptr));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
printf("]\n");
|
|
|
|
fflush(stdout);
|
2023-02-28 11:50:52 +00:00
|
|
|
PyErr_SetRaisedException(exc);
|
2022-04-16 21:36:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
lltrace_instruction(_PyInterpreterFrame *frame,
|
|
|
|
PyObject **stack_pointer,
|
|
|
|
_Py_CODEUNIT *next_instr)
|
2021-08-11 13:02:11 +00:00
|
|
|
{
|
2023-01-24 22:58:18 +00:00
|
|
|
/* This dump_stack() operation is risky, since the repr() of some
|
|
|
|
objects enters the interpreter recursively. It is also slow.
|
|
|
|
So you might want to comment it out. */
|
2022-04-16 21:36:29 +00:00
|
|
|
dump_stack(frame, stack_pointer);
|
2023-02-20 14:56:48 +00:00
|
|
|
int oparg = next_instr->op.arg;
|
|
|
|
int opcode = next_instr->op.code;
|
2022-04-16 21:36:29 +00:00
|
|
|
const char *opname = _PyOpcode_OpName[opcode];
|
|
|
|
assert(opname != NULL);
|
|
|
|
int offset = (int)(next_instr - _PyCode_CODE(frame->f_code));
|
2022-11-04 23:54:32 +00:00
|
|
|
if (HAS_ARG((int)_PyOpcode_Deopt[opcode])) {
|
2022-04-16 21:36:29 +00:00
|
|
|
printf("%d: %s %d\n", offset * 2, opname, oparg);
|
2021-08-11 13:02:11 +00:00
|
|
|
}
|
|
|
|
else {
|
2022-04-16 21:36:29 +00:00
|
|
|
printf("%d: %s\n", offset * 2, opname);
|
2021-08-11 13:02:11 +00:00
|
|
|
}
|
2022-04-16 21:36:29 +00:00
|
|
|
fflush(stdout);
|
|
|
|
}
|
|
|
|
static void
|
|
|
|
lltrace_resume_frame(_PyInterpreterFrame *frame)
|
|
|
|
{
|
2022-08-25 09:16:55 +00:00
|
|
|
PyObject *fobj = frame->f_funcobj;
|
2022-11-10 12:34:57 +00:00
|
|
|
if (frame->owner == FRAME_OWNED_BY_CSTACK ||
|
|
|
|
fobj == NULL ||
|
|
|
|
!PyFunction_Check(fobj)
|
|
|
|
) {
|
2023-01-24 22:58:18 +00:00
|
|
|
printf("\nResuming frame.\n");
|
2022-04-16 21:36:29 +00:00
|
|
|
return;
|
|
|
|
}
|
2022-08-25 09:16:55 +00:00
|
|
|
PyFunctionObject *f = (PyFunctionObject *)fobj;
|
2023-02-28 11:50:52 +00:00
|
|
|
PyObject *exc = PyErr_GetRaisedException();
|
2022-04-16 21:36:29 +00:00
|
|
|
PyObject *name = f->func_qualname;
|
|
|
|
if (name == NULL) {
|
|
|
|
name = f->func_name;
|
|
|
|
}
|
|
|
|
printf("\nResuming frame");
|
|
|
|
if (name) {
|
|
|
|
printf(" for ");
|
|
|
|
if (PyObject_Print(name, stdout, 0) < 0) {
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (f->func_module) {
|
|
|
|
printf(" in module ");
|
|
|
|
if (PyObject_Print(f->func_module, stdout, 0) < 0) {
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
fflush(stdout);
|
2023-02-28 11:50:52 +00:00
|
|
|
PyErr_SetRaisedException(exc);
|
2021-08-11 13:02:11 +00:00
|
|
|
}
|
1992-03-27 17:29:15 +00:00
|
|
|
#endif
|
2023-04-12 11:04:55 +00:00
|
|
|
|
|
|
|
static void monitor_raise(PyThreadState *tstate,
|
|
|
|
_PyInterpreterFrame *frame,
|
|
|
|
_Py_CODEUNIT *instr);
|
|
|
|
static int monitor_stop_iteration(PyThreadState *tstate,
|
|
|
|
_PyInterpreterFrame *frame,
|
|
|
|
_Py_CODEUNIT *instr);
|
|
|
|
static void monitor_unwind(PyThreadState *tstate,
|
|
|
|
_PyInterpreterFrame *frame,
|
|
|
|
_Py_CODEUNIT *instr);
|
|
|
|
static void monitor_handled(PyThreadState *tstate,
|
|
|
|
_PyInterpreterFrame *frame,
|
|
|
|
_Py_CODEUNIT *instr, PyObject *exc);
|
|
|
|
static void monitor_throw(PyThreadState *tstate,
|
|
|
|
_PyInterpreterFrame *frame,
|
|
|
|
_Py_CODEUNIT *instr);
|
2002-08-15 14:59:02 +00:00
|
|
|
|
2022-02-25 15:22:00 +00:00
|
|
|
static PyObject * import_name(PyThreadState *, _PyInterpreterFrame *,
|
2019-05-24 15:01:38 +00:00
|
|
|
PyObject *, PyObject *, PyObject *);
|
|
|
|
static PyObject * import_from(PyThreadState *, PyObject *, PyObject *);
|
|
|
|
static void format_exc_check_arg(PyThreadState *, PyObject *, const char *, PyObject *);
|
|
|
|
static void format_exc_unbound(PyThreadState *tstate, PyCodeObject *co, int oparg);
|
|
|
|
static int check_args_iterable(PyThreadState *, PyObject *func, PyObject *vararg);
|
2021-11-22 16:56:23 +00:00
|
|
|
static int check_except_type_valid(PyThreadState *tstate, PyObject* right);
|
2021-12-14 16:48:15 +00:00
|
|
|
static int check_except_star_type_valid(PyThreadState *tstate, PyObject* right);
|
2019-05-24 15:01:38 +00:00
|
|
|
static void format_kwargs_error(PyThreadState *, PyObject *func, PyObject *kwargs);
|
2022-03-04 12:41:17 +00:00
|
|
|
static void format_awaitable_error(PyThreadState *, PyTypeObject *, int);
|
2021-05-12 13:04:38 +00:00
|
|
|
static int get_exception_handler(PyCodeObject *, int, int*, int*, int*);
|
2022-02-25 15:22:00 +00:00
|
|
|
static _PyInterpreterFrame *
|
2021-11-23 09:53:24 +00:00
|
|
|
_PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
|
2021-10-09 15:51:30 +00:00
|
|
|
PyObject *locals, PyObject* const* args,
|
2021-10-28 15:14:59 +00:00
|
|
|
size_t argcount, PyObject *kwnames);
|
2023-04-30 13:08:26 +00:00
|
|
|
static _PyInterpreterFrame *
|
|
|
|
_PyEvalFramePushAndInit_Ex(PyThreadState *tstate, PyFunctionObject *func,
|
|
|
|
PyObject *locals, Py_ssize_t nargs, PyObject *callargs, PyObject *kwargs);
|
2021-12-01 12:09:36 +00:00
|
|
|
static void
|
2022-02-25 15:22:00 +00:00
|
|
|
_PyEvalFrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame *frame);
|
1992-03-27 17:29:15 +00:00
|
|
|
|
2000-08-30 20:25:01 +00:00
|
|
|
#define UNBOUNDLOCAL_ERROR_MSG \
|
2021-06-02 13:09:04 +00:00
|
|
|
"cannot access local variable '%s' where it is not associated with a value"
|
2001-04-13 16:51:46 +00:00
|
|
|
#define UNBOUNDFREE_ERROR_MSG \
|
2021-06-02 13:09:04 +00:00
|
|
|
"cannot access free variable '%s' where it is not associated with a" \
|
|
|
|
" value in enclosing scope"
|
1990-11-18 17:27:39 +00:00
|
|
|
|
Merged revisions 46753-51188 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46755 | brett.cannon | 2006-06-08 18:23:04 +0200 (Thu, 08 Jun 2006) | 4 lines
Make binascii.hexlify() use s# for its arguments instead of t# to actually
match its documentation stating it accepts any read-only buffer.
........
r46757 | brett.cannon | 2006-06-08 19:00:45 +0200 (Thu, 08 Jun 2006) | 8 lines
Buffer objects would return the read or write buffer for a wrapped object when
the char buffer was requested. Now it actually returns the char buffer if
available or raises a TypeError if it isn't (as is raised for the other buffer
types if they are not present but requested).
Not a backport candidate since it does change semantics of the buffer object
(although it could be argued this is enough of a bug to bother backporting).
........
r46760 | andrew.kuchling | 2006-06-09 03:10:17 +0200 (Fri, 09 Jun 2006) | 1 line
Update functools section
........
r46762 | tim.peters | 2006-06-09 04:11:02 +0200 (Fri, 09 Jun 2006) | 6 lines
Whitespace normalization.
Since test_file is implicated in mysterious test failures
when followed by test_optparse, if I had any brains I'd
look at the checkin that last changed test_file ;-)
........
r46763 | tim.peters | 2006-06-09 05:09:42 +0200 (Fri, 09 Jun 2006) | 5 lines
To boost morale :-), force test_optparse to run immediately
after test_file until we can figure out how to fix it.
(See python-dev; at the moment we don't even know which checkin
caused the problem.)
........
r46764 | tim.peters | 2006-06-09 05:51:41 +0200 (Fri, 09 Jun 2006) | 6 lines
AutoFileTests.tearDown(): Removed mysterious undocumented
try/except. Remove TESTFN.
Throughout: used open() instead of file(), and wrapped
long lines.
........
r46765 | tim.peters | 2006-06-09 06:02:06 +0200 (Fri, 09 Jun 2006) | 8 lines
testUnicodeOpen(): I have no idea why, but making this
test clean up after itself appears to fix the test failures
when test_optparse follows test_file.
test_main(): Get rid of TESTFN no matter what. That's
also enough to fix the mystery failures. Doesn't hurt
to fix them twice :-)
........
r46766 | tim.peters | 2006-06-09 07:12:40 +0200 (Fri, 09 Jun 2006) | 6 lines
Remove the temporary hack to force test_optparse to
run immediately after test_file. At least 8 buildbot
boxes passed since the underlying problem got fixed,
and they all failed before the fix, so there's no point
to this anymore.
........
r46767 | neal.norwitz | 2006-06-09 07:54:18 +0200 (Fri, 09 Jun 2006) | 1 line
Fix grammar and reflow
........
r46769 | andrew.kuchling | 2006-06-09 12:22:35 +0200 (Fri, 09 Jun 2006) | 1 line
Markup fix
........
r46773 | andrew.kuchling | 2006-06-09 15:15:57 +0200 (Fri, 09 Jun 2006) | 1 line
[Bug #1472827] Make saxutils.XMLGenerator handle \r\n\t in attribute values by escaping them properly. 2.4 bugfix candidate.
........
r46778 | kristjan.jonsson | 2006-06-09 18:28:01 +0200 (Fri, 09 Jun 2006) | 2 lines
Turn off warning about deprecated CRT functions on for VisualStudio .NET 2005.
Make the definition #ARRAYSIZE conditional. VisualStudio .NET 2005 already has it defined using a better gimmick.
........
r46779 | phillip.eby | 2006-06-09 18:40:18 +0200 (Fri, 09 Jun 2006) | 2 lines
Import wsgiref into the stdlib, as of the external version 0.1-r2181.
........
r46783 | andrew.kuchling | 2006-06-09 18:44:40 +0200 (Fri, 09 Jun 2006) | 1 line
Add note about XMLGenerator bugfix
........
r46784 | andrew.kuchling | 2006-06-09 18:46:51 +0200 (Fri, 09 Jun 2006) | 1 line
Add note about wsgiref
........
r46785 | brett.cannon | 2006-06-09 19:05:48 +0200 (Fri, 09 Jun 2006) | 2 lines
Fix inconsistency in naming within an enum.
........
r46787 | tim.peters | 2006-06-09 19:47:00 +0200 (Fri, 09 Jun 2006) | 2 lines
Whitespace normalization.
........
r46792 | georg.brandl | 2006-06-09 20:29:52 +0200 (Fri, 09 Jun 2006) | 3 lines
Test file.__exit__.
........
r46794 | brett.cannon | 2006-06-09 20:40:46 +0200 (Fri, 09 Jun 2006) | 2 lines
svn:ignore .pyc and .pyo files.
........
r46795 | georg.brandl | 2006-06-09 20:45:48 +0200 (Fri, 09 Jun 2006) | 3 lines
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
........
r46798 | andrew.kuchling | 2006-06-09 21:03:16 +0200 (Fri, 09 Jun 2006) | 1 line
Describe startswith()/endswiith() change; add reminder about wsgiref
........
r46799 | tim.peters | 2006-06-09 21:24:44 +0200 (Fri, 09 Jun 2006) | 11 lines
Implementing a happy idea from Georg Brandl: make runtest() try to
clean up files and directories the tests often leave behind by
mistake. This is the first time in history I don't have a bogus
"db_home" directory after running the tests ;-)
Also worked on runtest's docstring, to say something about all the
arguments, and to document the non-obvious return values.
New functions runtest_inner() and cleanup_test_droppings() in
support of the above.
........
r46800 | andrew.kuchling | 2006-06-09 21:43:25 +0200 (Fri, 09 Jun 2006) | 1 line
Remove unused variable
........
r46801 | andrew.kuchling | 2006-06-09 21:56:05 +0200 (Fri, 09 Jun 2006) | 1 line
Add some wsgiref text
........
r46803 | thomas.heller | 2006-06-09 21:59:11 +0200 (Fri, 09 Jun 2006) | 1 line
set eol-style svn property
........
r46804 | thomas.heller | 2006-06-09 22:01:01 +0200 (Fri, 09 Jun 2006) | 1 line
set eol-style svn property
........
r46805 | georg.brandl | 2006-06-09 22:43:48 +0200 (Fri, 09 Jun 2006) | 3 lines
Make use of new str.startswith/endswith semantics.
Occurences in email and compiler were ignored due to backwards compat requirements.
........
r46806 | brett.cannon | 2006-06-10 00:31:23 +0200 (Sat, 10 Jun 2006) | 4 lines
An object with __call__ as an attribute, when called, will have that attribute checked for __call__ itself, and will continue to look until it finds an object without the attribute. This can lead to an infinite recursion.
Closes bug #532646, again. Will be backported.
........
r46808 | brett.cannon | 2006-06-10 00:45:54 +0200 (Sat, 10 Jun 2006) | 2 lines
Fix bug introduced in rev. 46806 by not having variable declaration at the top of a block.
........
r46812 | georg.brandl | 2006-06-10 08:40:50 +0200 (Sat, 10 Jun 2006) | 4 lines
Apply perky's fix for #1503157: "/".join([u"", u""]) raising OverflowError.
Also improve error message on overflow.
........
r46817 | martin.v.loewis | 2006-06-10 10:14:03 +0200 (Sat, 10 Jun 2006) | 2 lines
Port cygwin kill_python changes from 2.4 branch.
........
r46818 | armin.rigo | 2006-06-10 12:57:40 +0200 (Sat, 10 Jun 2006) | 4 lines
SF bug #1503294.
PyThreadState_GET() complains if the tstate is NULL, but only in debug mode.
........
r46819 | martin.v.loewis | 2006-06-10 14:23:46 +0200 (Sat, 10 Jun 2006) | 4 lines
Patch #1495999: Part two of Windows CE changes.
- update header checks, using autoconf
- provide dummies for getenv, environ, and GetVersion
- adjust MSC_VER check in socketmodule.c
........
r46820 | skip.montanaro | 2006-06-10 16:09:11 +0200 (Sat, 10 Jun 2006) | 1 line
document the class, not its initializer
........
r46821 | greg.ward | 2006-06-10 18:40:01 +0200 (Sat, 10 Jun 2006) | 4 lines
Sync with Optik docs (rev 518):
* restore "Extending optparse" section
* document ALWAYS_TYPED_ACTIONS (SF #1449311)
........
r46824 | thomas.heller | 2006-06-10 21:51:46 +0200 (Sat, 10 Jun 2006) | 8 lines
Upgrade to ctypes version 0.9.9.7.
Summary of changes:
- support for 'variable sized' data
- support for anonymous structure/union fields
- fix severe bug with certain arrays or structures containing more than 256 fields
........
r46825 | thomas.heller | 2006-06-10 21:55:36 +0200 (Sat, 10 Jun 2006) | 8 lines
Upgrade to ctypes version 0.9.9.7.
Summary of changes:
- support for 'variable sized' data
- support for anonymous structure/union fields
- fix severe bug with certain arrays or structures containing more than 256 fields
........
r46826 | fred.drake | 2006-06-10 22:01:34 +0200 (Sat, 10 Jun 2006) | 4 lines
SF patch #1303595: improve description of __builtins__, explaining how it
varies between __main__ and other modules, and strongly suggest not touching
it but using __builtin__ if absolutely necessary
........
r46827 | fred.drake | 2006-06-10 22:02:58 +0200 (Sat, 10 Jun 2006) | 1 line
credit for SF patch #1303595
........
r46831 | thomas.heller | 2006-06-10 22:29:34 +0200 (Sat, 10 Jun 2006) | 2 lines
New docs for ctypes.
........
r46834 | thomas.heller | 2006-06-10 23:07:19 +0200 (Sat, 10 Jun 2006) | 1 line
Fix a wrong printf format.
........
r46835 | thomas.heller | 2006-06-10 23:17:58 +0200 (Sat, 10 Jun 2006) | 1 line
Fix the second occurrence of the problematic printf format.
........
r46837 | thomas.heller | 2006-06-10 23:56:03 +0200 (Sat, 10 Jun 2006) | 1 line
Don't use C++ comment.
........
r46838 | thomas.heller | 2006-06-11 00:01:50 +0200 (Sun, 11 Jun 2006) | 1 line
Handle failure of PyMem_Realloc.
........
r46839 | skip.montanaro | 2006-06-11 00:38:13 +0200 (Sun, 11 Jun 2006) | 2 lines
Suppress warning on MacOSX about possible use before set of proc.
........
r46840 | tim.peters | 2006-06-11 00:51:45 +0200 (Sun, 11 Jun 2006) | 8 lines
shuffle() doscstring: Removed warning about sequence length
versus generator period. While this was a real weakness of the
older WH generator for lists with just a few dozen elements,
and so could potentially bite the naive ;-), the Twister should
show excellent behavior up to at least 600 elements.
Module docstring: reflowed some jarringly short lines.
........
r46844 | greg.ward | 2006-06-11 02:40:49 +0200 (Sun, 11 Jun 2006) | 4 lines
Bug #1361643: fix textwrap.dedent() so it handles tabs appropriately,
i.e. do *not* expand tabs, but treat them as whitespace that is not
equivalent to spaces. Add a couple of test cases. Clarify docs.
........
r46850 | neal.norwitz | 2006-06-11 07:44:18 +0200 (Sun, 11 Jun 2006) | 5 lines
Fix Coverity # 146. newDBSequenceObject would deref dbobj, so it can't be NULL.
We know it's not NULL from the ParseTuple and DbObject_Check will verify
it's not NULL.
........
r46851 | neal.norwitz | 2006-06-11 07:45:25 +0200 (Sun, 11 Jun 2006) | 4 lines
Wrap some long lines
Top/Bottom factor out some common expressions
Add a XXX comment about widing offset.
........
r46852 | neal.norwitz | 2006-06-11 07:45:47 +0200 (Sun, 11 Jun 2006) | 1 line
Add versionadded to doc
........
r46853 | neal.norwitz | 2006-06-11 07:47:14 +0200 (Sun, 11 Jun 2006) | 3 lines
Update doc to make it agree with code.
Bottom factor out some common code.
........
r46854 | neal.norwitz | 2006-06-11 07:48:14 +0200 (Sun, 11 Jun 2006) | 3 lines
f_code can't be NULL based on Frame_New and other code that derefs it.
So there doesn't seem to be much point to checking here.
........
r46855 | neal.norwitz | 2006-06-11 09:26:27 +0200 (Sun, 11 Jun 2006) | 1 line
Fix errors found by pychecker
........
r46856 | neal.norwitz | 2006-06-11 09:26:50 +0200 (Sun, 11 Jun 2006) | 1 line
warnings was imported at module scope, no need to import again
........
r46857 | neal.norwitz | 2006-06-11 09:27:56 +0200 (Sun, 11 Jun 2006) | 5 lines
Fix errors found by pychecker.
I think these changes are correct, but I'm not sure. Could someone
who knows how this module works test it? It can at least start on
the cmd line.
........
r46858 | neal.norwitz | 2006-06-11 10:35:14 +0200 (Sun, 11 Jun 2006) | 1 line
Fix errors found by pychecker
........
r46859 | ronald.oussoren | 2006-06-11 16:33:36 +0200 (Sun, 11 Jun 2006) | 4 lines
This patch improves the L&F of IDLE on OSX. The changes are conditionalized on
being in an IDLE.app bundle on darwin. This does a slight reorganisation of the
menus and adds support for file-open events.
........
r46860 | greg.ward | 2006-06-11 16:42:41 +0200 (Sun, 11 Jun 2006) | 1 line
SF #1366250: optparse docs: fix inconsistency in variable name; minor tweaks.
........
r46861 | greg.ward | 2006-06-11 18:24:11 +0200 (Sun, 11 Jun 2006) | 3 lines
Bug #1498146: fix optparse to handle Unicode strings in option help,
description, and epilog.
........
r46862 | thomas.heller | 2006-06-11 19:04:22 +0200 (Sun, 11 Jun 2006) | 2 lines
Release the GIL during COM method calls, to avoid deadlocks in
Python coded COM objects.
........
r46863 | tim.peters | 2006-06-11 21:42:51 +0200 (Sun, 11 Jun 2006) | 2 lines
Whitespace normalization.
........
r46864 | tim.peters | 2006-06-11 21:43:49 +0200 (Sun, 11 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46865 | ronald.oussoren | 2006-06-11 21:45:57 +0200 (Sun, 11 Jun 2006) | 2 lines
Remove message about using make frameworkinstall, that's no longer necesssary
........
r46866 | ronald.oussoren | 2006-06-11 22:23:29 +0200 (Sun, 11 Jun 2006) | 2 lines
Use configure to substitute the correct prefix instead of hardcoding
........
r46867 | ronald.oussoren | 2006-06-11 22:24:45 +0200 (Sun, 11 Jun 2006) | 4 lines
- Change fixapplepython23.py to ensure that it will run with /usr/bin/python
on intel macs.
- Fix some minor problems in the installer for OSX
........
r46868 | neal.norwitz | 2006-06-11 22:25:56 +0200 (Sun, 11 Jun 2006) | 5 lines
Try to fix several networking tests. The problem is that if hosts have
a search path setup, some of these hosts resolve to the wrong address.
By appending a period to the hostname, the hostname should only resolve
to what we want it to resolve to. Hopefully this doesn't break different bots.
........
r46869 | neal.norwitz | 2006-06-11 22:42:02 +0200 (Sun, 11 Jun 2006) | 7 lines
Try to fix another networking test. The problem is that if hosts have
a search path setup, some of these hosts resolve to the wrong address.
By appending a period to the hostname, the hostname should only resolve
to what we want it to resolve to. Hopefully this doesn't break different bots.
Also add more info to failure message to aid debugging test failure.
........
r46870 | neal.norwitz | 2006-06-11 22:46:46 +0200 (Sun, 11 Jun 2006) | 4 lines
Fix test on PPC64 buildbot. It raised an IOError (really an URLError which
derives from an IOError). That seems valid. Env Error includes both OSError
and IOError, so this seems like a reasonable fix.
........
r46871 | tim.peters | 2006-06-11 22:52:59 +0200 (Sun, 11 Jun 2006) | 10 lines
compare_generic_iter(): Fixed the failure of test_wsgiref's testFileWrapper
when running with -O.
test_simple_validation_error still fails under -O. That appears to be because
wsgiref's validate.py uses `assert` statements all over the place to check
arguments for sanity. That should all be changed (it's not a logical error
in the software if a user passes bogus arguments, so this isn't a reasonable
use for `assert` -- checking external preconditions should generally raise
ValueError or TypeError instead, as appropriate).
........
r46872 | neal.norwitz | 2006-06-11 23:38:38 +0200 (Sun, 11 Jun 2006) | 1 line
Get test to pass on S/390. Shout if you think this change is incorrect.
........
r46873 | neal.norwitz | 2006-06-12 04:05:55 +0200 (Mon, 12 Jun 2006) | 1 line
Cleanup Py_ssize_t a little (get rid of second #ifdef)
........
r46874 | neal.norwitz | 2006-06-12 04:06:17 +0200 (Mon, 12 Jun 2006) | 1 line
Fix some Py_ssize_t issues
........
r46875 | neal.norwitz | 2006-06-12 04:06:42 +0200 (Mon, 12 Jun 2006) | 1 line
Fix some Py_ssize_t issues
........
r46876 | neal.norwitz | 2006-06-12 04:07:24 +0200 (Mon, 12 Jun 2006) | 2 lines
Cleanup: Remove import of types to get StringTypes, we can just use basestring.
........
r46877 | neal.norwitz | 2006-06-12 04:07:57 +0200 (Mon, 12 Jun 2006) | 1 line
Don't truncate if size_t is bigger than uint
........
r46878 | neal.norwitz | 2006-06-12 04:08:41 +0200 (Mon, 12 Jun 2006) | 1 line
Don't leak the list object if there's an error allocating the item storage. Backport candidate
........
r46879 | neal.norwitz | 2006-06-12 04:09:03 +0200 (Mon, 12 Jun 2006) | 1 line
Fix typo. Backport if anyone cares. :-)
........
r46880 | neal.norwitz | 2006-06-12 04:09:34 +0200 (Mon, 12 Jun 2006) | 1 line
Fix indentation of case and a Py_ssize_t issue.
........
r46881 | neal.norwitz | 2006-06-12 04:11:18 +0200 (Mon, 12 Jun 2006) | 3 lines
Get rid of f_restricted too. Doc the other 4 ints that were already removed
at the NeedForSpeed sprint.
........
r46882 | neal.norwitz | 2006-06-12 04:13:21 +0200 (Mon, 12 Jun 2006) | 1 line
Fix the socket tests so they can be run concurrently. Backport candidate
........
r46883 | neal.norwitz | 2006-06-12 04:16:10 +0200 (Mon, 12 Jun 2006) | 1 line
i and j are initialized below when used. No need to do it twice
........
r46884 | neal.norwitz | 2006-06-12 05:05:03 +0200 (Mon, 12 Jun 2006) | 1 line
Remove unused import
........
r46885 | neal.norwitz | 2006-06-12 05:05:40 +0200 (Mon, 12 Jun 2006) | 1 line
Impl ssize_t
........
r46886 | neal.norwitz | 2006-06-12 05:33:09 +0200 (Mon, 12 Jun 2006) | 6 lines
Patch #1503046, Conditional compilation of zlib.(de)compressobj.copy
copy is only in newer versions of zlib. This should allow zlibmodule
to work with older versions like the Tru64 buildbot.
........
r46887 | phillip.eby | 2006-06-12 06:04:32 +0200 (Mon, 12 Jun 2006) | 2 lines
Sync w/external release 0.1.2. Please see PEP 360 before making changes to external packages.
........
r46888 | martin.v.loewis | 2006-06-12 06:26:31 +0200 (Mon, 12 Jun 2006) | 2 lines
Get rid of function pointer cast.
........
r46889 | thomas.heller | 2006-06-12 08:05:57 +0200 (Mon, 12 Jun 2006) | 3 lines
I don't know how that happend, but the entire file contents was
duplicated. Thanks to Simon Percivall for the heads up.
........
r46890 | nick.coghlan | 2006-06-12 10:19:37 +0200 (Mon, 12 Jun 2006) | 1 line
Fix site module docstring to match the code
........
r46891 | nick.coghlan | 2006-06-12 10:23:02 +0200 (Mon, 12 Jun 2006) | 1 line
Fix site module docstring to match the code for Mac OSX, too
........
r46892 | nick.coghlan | 2006-06-12 10:27:13 +0200 (Mon, 12 Jun 2006) | 1 line
The site module documentation also described the Windows behaviour incorrectly.
........
r46893 | nick.coghlan | 2006-06-12 12:17:11 +0200 (Mon, 12 Jun 2006) | 1 line
Make the -m switch conform to the documentation of sys.path by behaving like the -c switch
........
r46894 | kristjan.jonsson | 2006-06-12 17:45:12 +0200 (Mon, 12 Jun 2006) | 2 lines
Fix the CRT argument error handling for VisualStudio .NET 2005. Install a CRT error handler and disable the assertion for debug builds. This causes CRT to set errno to EINVAL.
This update fixes crash cases in the test suite where the default CRT error handler would cause process exit.
........
r46899 | thomas.heller | 2006-06-12 22:56:48 +0200 (Mon, 12 Jun 2006) | 1 line
Add pep-291 compatibility markers.
........
r46901 | ka-ping.yee | 2006-06-13 01:47:52 +0200 (Tue, 13 Jun 2006) | 5 lines
Add the uuid module.
This module has been tested so far on Windows XP (Python 2.4 and 2.5a2),
Mac OS X (Python 2.3, 2.4, and 2.5a2), and Linux (Python 2.4 and 2.5a2).
........
r46902 | tim.peters | 2006-06-13 02:30:01 +0200 (Tue, 13 Jun 2006) | 2 lines
Whitespace normalization.
........
r46903 | tim.peters | 2006-06-13 02:30:50 +0200 (Tue, 13 Jun 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46905 | tim.peters | 2006-06-13 05:30:07 +0200 (Tue, 13 Jun 2006) | 5 lines
get_matching_blocks(): rewrote code & comments so they match; added
more comments about why it's this way at all; and removed what looked
like needless expense (sorting (i, j, k) triples directly should give
exactly the same order as sorting (i, (i, j, k)) pairs).
........
r46906 | neal.norwitz | 2006-06-13 06:08:53 +0200 (Tue, 13 Jun 2006) | 1 line
Don't fail if another process is listening on our port.
........
r46908 | neal.norwitz | 2006-06-13 10:28:19 +0200 (Tue, 13 Jun 2006) | 2 lines
Initialize the type object so pychecker can't crash the interpreter.
........
r46909 | neal.norwitz | 2006-06-13 10:41:06 +0200 (Tue, 13 Jun 2006) | 1 line
Verify the crash due to EncodingMap not initialized does not return
........
r46910 | thomas.heller | 2006-06-13 10:56:14 +0200 (Tue, 13 Jun 2006) | 3 lines
Add some windows datatypes that were missing from this file, and add
the aliases defined in windows header files for the structures.
........
r46911 | thomas.heller | 2006-06-13 11:40:14 +0200 (Tue, 13 Jun 2006) | 3 lines
Add back WCHAR, UINT, DOUBLE, _LARGE_INTEGER, _ULARGE_INTEGER.
VARIANT_BOOL is a special _ctypes data type, not c_short.
........
r46912 | ronald.oussoren | 2006-06-13 13:19:56 +0200 (Tue, 13 Jun 2006) | 4 lines
Linecache contains support for PEP302 loaders, but fails to deal with loaders
that return None to indicate that the module is valid but no source is
available. This patch fixes that.
........
r46913 | andrew.kuchling | 2006-06-13 13:57:04 +0200 (Tue, 13 Jun 2006) | 1 line
Mention uuid module
........
r46915 | walter.doerwald | 2006-06-13 14:02:12 +0200 (Tue, 13 Jun 2006) | 2 lines
Fix passing errors to the encoder and decoder functions.
........
r46917 | walter.doerwald | 2006-06-13 14:04:43 +0200 (Tue, 13 Jun 2006) | 3 lines
errors is an attribute in the incremental decoder
not an argument.
........
r46919 | andrew.macintyre | 2006-06-13 17:04:24 +0200 (Tue, 13 Jun 2006) | 11 lines
Patch #1454481: Make thread stack size runtime tunable.
Heavily revised, comprising revisions:
46640 - original trunk revision (backed out in r46655)
46647 - markup fix (backed out in r46655)
46692:46918 merged from branch aimacintyre-sf1454481
branch tested on buildbots (Windows buildbots had problems
not related to these changes).
........
r46920 | brett.cannon | 2006-06-13 18:06:55 +0200 (Tue, 13 Jun 2006) | 2 lines
Remove unused variable.
........
r46921 | andrew.kuchling | 2006-06-13 18:41:41 +0200 (Tue, 13 Jun 2006) | 1 line
Add ability to set stack size
........
r46923 | marc-andre.lemburg | 2006-06-13 19:04:26 +0200 (Tue, 13 Jun 2006) | 2 lines
Update pybench to version 2.0.
........
r46924 | marc-andre.lemburg | 2006-06-13 19:07:14 +0200 (Tue, 13 Jun 2006) | 2 lines
Revert wrong svn copy.
........
r46925 | andrew.macintyre | 2006-06-13 19:14:36 +0200 (Tue, 13 Jun 2006) | 2 lines
fix exception usage
........
r46927 | tim.peters | 2006-06-13 20:37:07 +0200 (Tue, 13 Jun 2006) | 2 lines
Whitespace normalization.
........
r46928 | marc-andre.lemburg | 2006-06-13 20:56:56 +0200 (Tue, 13 Jun 2006) | 9 lines
Updated to pybench 2.0.
See svn.python.org/external/pybench-2.0 for the original import of that
version.
Note that platform.py was not copied over from pybench-2.0 since
it is already part of Python 2.5.
........
r46929 | andrew.macintyre | 2006-06-13 21:02:35 +0200 (Tue, 13 Jun 2006) | 5 lines
Increase the small thread stack size to get the test
to pass reliably on the one buildbot that insists on
more than 32kB of thread stack.
........
r46930 | marc-andre.lemburg | 2006-06-13 21:20:07 +0200 (Tue, 13 Jun 2006) | 2 lines
Whitespace normalization.
........
r46931 | thomas.heller | 2006-06-13 22:18:43 +0200 (Tue, 13 Jun 2006) | 2 lines
More docs for ctypes.
........
r46932 | brett.cannon | 2006-06-13 23:34:24 +0200 (Tue, 13 Jun 2006) | 2 lines
Ignore .pyc and .pyo files in Pybench.
........
r46933 | brett.cannon | 2006-06-13 23:46:41 +0200 (Tue, 13 Jun 2006) | 7 lines
If a classic class defined a __coerce__() method that just returned its two
arguments in reverse, the interpreter would infinitely recourse trying to get a
coercion that worked. So put in a recursion check after a coercion is made and
the next call to attempt to use the coerced values.
Fixes bug #992017 and closes crashers/coerce.py .
........
r46936 | gerhard.haering | 2006-06-14 00:24:47 +0200 (Wed, 14 Jun 2006) | 3 lines
Merged changes from external pysqlite 2.3.0 release. Documentation updates will
follow in a few hours at the latest. Then we should be ready for beta1.
........
r46937 | brett.cannon | 2006-06-14 00:26:13 +0200 (Wed, 14 Jun 2006) | 2 lines
Missed test for rev. 46933; infinite recursion from __coerce__() returning its arguments reversed.
........
r46938 | gerhard.haering | 2006-06-14 00:53:48 +0200 (Wed, 14 Jun 2006) | 2 lines
Updated documentation for pysqlite 2.3.0 API.
........
r46939 | tim.peters | 2006-06-14 06:09:25 +0200 (Wed, 14 Jun 2006) | 10 lines
SequenceMatcher.get_matching_blocks(): This now guarantees that
adjacent triples in the result list describe non-adjacent matching
blocks. That's _nice_ to have, and Guido said he wanted it.
Not a bugfix candidate: Guido or not ;-), this changes visible
endcase semantics (note that some tests had to change), and
nothing about this was documented before. Since it was working
as designed, and behavior was consistent with the docs, it wasn't
"a bug".
........
r46940 | tim.peters | 2006-06-14 06:13:00 +0200 (Wed, 14 Jun 2006) | 2 lines
Repaired typo in new comment.
........
r46941 | tim.peters | 2006-06-14 06:15:27 +0200 (Wed, 14 Jun 2006) | 2 lines
Whitespace normalization.
........
r46942 | fred.drake | 2006-06-14 06:25:02 +0200 (Wed, 14 Jun 2006) | 3 lines
- make some disabled tests run what they intend when enabled
- remove some over-zealous triple-quoting
........
r46943 | fred.drake | 2006-06-14 07:04:47 +0200 (Wed, 14 Jun 2006) | 3 lines
add tests for two cases that are handled correctly in the current code,
but that SF patch 1504676 as written mis-handles
........
r46944 | fred.drake | 2006-06-14 07:15:51 +0200 (Wed, 14 Jun 2006) | 1 line
explain an XXX in more detail
........
r46945 | martin.v.loewis | 2006-06-14 07:21:04 +0200 (Wed, 14 Jun 2006) | 1 line
Patch #1455898: Incremental mode for "mbcs" codec.
........
r46946 | georg.brandl | 2006-06-14 08:08:31 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1339007: Shelf objects now don't raise an exception in their
__del__ method when initialization failed.
........
r46948 | thomas.heller | 2006-06-14 08:18:15 +0200 (Wed, 14 Jun 2006) | 1 line
Fix docstring.
........
r46949 | georg.brandl | 2006-06-14 08:29:07 +0200 (Wed, 14 Jun 2006) | 2 lines
Bug #1501122: mention __gt__ &co in description of comparison order.
........
r46951 | thomas.heller | 2006-06-14 09:08:38 +0200 (Wed, 14 Jun 2006) | 1 line
Write more docs.
........
r46952 | georg.brandl | 2006-06-14 10:31:39 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1153163: describe __add__ vs __radd__ behavior when adding
objects of same type/of subclasses of the other.
........
r46954 | georg.brandl | 2006-06-14 10:42:11 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1202018: add some common mime.types locations.
........
r46955 | georg.brandl | 2006-06-14 10:50:03 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1117556: SimpleHTTPServer now tries to find and use the system's
mime.types file for determining MIME types.
........
r46957 | thomas.heller | 2006-06-14 11:09:08 +0200 (Wed, 14 Jun 2006) | 1 line
Document paramflags.
........
r46958 | thomas.heller | 2006-06-14 11:20:11 +0200 (Wed, 14 Jun 2006) | 1 line
Add an __all__ list, since this module does 'from ctypes import *'.
........
r46959 | andrew.kuchling | 2006-06-14 15:59:15 +0200 (Wed, 14 Jun 2006) | 1 line
Add item
........
r46961 | georg.brandl | 2006-06-14 18:46:43 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #805015: doc error in PyUnicode_FromEncodedObject.
........
r46962 | gerhard.haering | 2006-06-15 00:28:37 +0200 (Thu, 15 Jun 2006) | 10 lines
- Added version checks in C code to make sure we don't trigger bugs in older
SQLite versions.
- Added version checks in test suite so that we don't execute tests that we
know will fail with older (buggy) SQLite versions.
Now, all tests should run against all SQLite versions from 3.0.8 until 3.3.6
(latest one now). The sqlite3 module can be built against all these SQLite
versions and the sqlite3 module does its best to not trigger bugs in SQLite,
but using SQLite 3.3.3 or later is recommended.
........
r46963 | tim.peters | 2006-06-15 00:38:13 +0200 (Thu, 15 Jun 2006) | 2 lines
Whitespace normalization.
........
r46964 | neal.norwitz | 2006-06-15 06:54:29 +0200 (Thu, 15 Jun 2006) | 9 lines
Speculative checkin (requires approval of Gerhard Haering)
This backs out the test changes in 46962 which prevented crashes
by not running the tests via a version check. All the version checks
added in that rev were removed from the tests.
Code was added to the error handler in connection.c that seems
to work with older versions of sqlite including 3.1.3.
........
r46965 | neal.norwitz | 2006-06-15 07:55:49 +0200 (Thu, 15 Jun 2006) | 1 line
Try to narrow window of failure on slow/busy boxes (ppc64 buildbot)
........
r46966 | martin.v.loewis | 2006-06-15 08:45:05 +0200 (Thu, 15 Jun 2006) | 2 lines
Make import/lookup of mbcs fail on non-Windows systems.
........
r46967 | ronald.oussoren | 2006-06-15 10:14:18 +0200 (Thu, 15 Jun 2006) | 2 lines
Patch #1446489 (zipfile: support for ZIP64)
........
r46968 | neal.norwitz | 2006-06-15 10:16:44 +0200 (Thu, 15 Jun 2006) | 6 lines
Re-revert this change. Install the version check and don't run the test
until Gerhard has time to fully debug the issue. This affects versions
before 3.2.1 (possibly only versions earlier than 3.1.3).
Based on discussion on python-checkins.
........
r46969 | gregory.p.smith | 2006-06-15 10:52:32 +0200 (Thu, 15 Jun 2006) | 6 lines
- bsddb: multithreaded DB access using the simple bsddb module interface
now works reliably. It has been updated to use automatic BerkeleyDB
deadlock detection and the bsddb.dbutils.DeadlockWrap wrapper to retry
database calls that would previously deadlock. [SF python bug #775414]
........
r46970 | gregory.p.smith | 2006-06-15 11:23:52 +0200 (Thu, 15 Jun 2006) | 2 lines
minor documentation cleanup. mention the bsddb.db interface explicitly by name.
........
r46971 | neal.norwitz | 2006-06-15 11:57:03 +0200 (Thu, 15 Jun 2006) | 5 lines
Steal the trick from test_compiler to print out a slow msg.
This will hopefully get the buildbots to pass. Not sure this
test will be feasible or even work. But everything is red now,
so it can't get much worse.
........
r46972 | neal.norwitz | 2006-06-15 12:24:49 +0200 (Thu, 15 Jun 2006) | 1 line
Print some more info to get an idea of how much longer the test will last
........
r46981 | tim.peters | 2006-06-15 20:04:40 +0200 (Thu, 15 Jun 2006) | 6 lines
Try to reduce the extreme peak memory and disk-space use
of this test. It probably still requires more disk space
than most buildbots have, and in any case is still so
intrusive that if we don't find another way to test this I'm
taking my buildbot offline permanently ;-)
........
r46982 | tim.peters | 2006-06-15 20:06:29 +0200 (Thu, 15 Jun 2006) | 2 lines
Whitespace normalization.
........
r46983 | tim.peters | 2006-06-15 20:07:28 +0200 (Thu, 15 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46984 | tim.peters | 2006-06-15 20:38:19 +0200 (Thu, 15 Jun 2006) | 2 lines
Oops -- I introduced an off-by-6436159488 error.
........
r46990 | neal.norwitz | 2006-06-16 06:30:34 +0200 (Fri, 16 Jun 2006) | 1 line
Disable this test until we can determine what to do about it
........
r46991 | neal.norwitz | 2006-06-16 06:31:06 +0200 (Fri, 16 Jun 2006) | 1 line
Param name is dir, not directory. Update docstring. Backport candidate
........
r46992 | neal.norwitz | 2006-06-16 06:31:28 +0200 (Fri, 16 Jun 2006) | 1 line
Add missing period in comment.
........
r46993 | neal.norwitz | 2006-06-16 06:32:43 +0200 (Fri, 16 Jun 2006) | 1 line
Fix whitespace, there are memory leaks in this module.
........
r46995 | fred.drake | 2006-06-17 01:45:06 +0200 (Sat, 17 Jun 2006) | 3 lines
SF patch 1504676: Make sgmllib char and entity references pluggable
(implementation/tests contributed by Sam Ruby)
........
r46996 | fred.drake | 2006-06-17 03:07:54 +0200 (Sat, 17 Jun 2006) | 1 line
fix change that broke the htmllib tests
........
r46998 | martin.v.loewis | 2006-06-17 11:15:14 +0200 (Sat, 17 Jun 2006) | 3 lines
Patch #763580: Add name and value arguments to
Tkinter variable classes.
........
r46999 | martin.v.loewis | 2006-06-17 11:20:41 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #1096231: Add default argument to wm_iconbitmap.
........
r47000 | martin.v.loewis | 2006-06-17 11:25:15 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #1494750: Destroy master after deleting children.
........
r47003 | george.yoshida | 2006-06-17 18:31:52 +0200 (Sat, 17 Jun 2006) | 2 lines
markup fix
........
r47005 | george.yoshida | 2006-06-17 18:39:13 +0200 (Sat, 17 Jun 2006) | 4 lines
Update url.
Old url returned status code:301 Moved permanently.
........
r47007 | martin.v.loewis | 2006-06-17 20:44:27 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #812986: Update the canvas even if not tracing.
........
r47008 | martin.v.loewis | 2006-06-17 21:03:26 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #815924: Restore ability to pass type= and icon=
........
r47009 | neal.norwitz | 2006-06-18 00:37:45 +0200 (Sun, 18 Jun 2006) | 1 line
Fix typo in docstring
........
r47010 | neal.norwitz | 2006-06-18 00:38:15 +0200 (Sun, 18 Jun 2006) | 1 line
Fix memory leak reported by valgrind while running test_subprocess
........
r47011 | fred.drake | 2006-06-18 04:57:35 +0200 (Sun, 18 Jun 2006) | 1 line
remove unnecessary markup
........
r47013 | neal.norwitz | 2006-06-18 21:35:01 +0200 (Sun, 18 Jun 2006) | 7 lines
Prevent spurious leaks when running regrtest.py -R. There may be more
issues that crop up from time to time, but this change seems to have been
pretty stable (no spurious warnings) for about a week.
Other modules which use threads may require similar use of
threading_setup/threading_cleanup from test_support.
........
r47014 | neal.norwitz | 2006-06-18 21:37:40 +0200 (Sun, 18 Jun 2006) | 9 lines
The hppa ubuntu box sometimes hangs forever in these tests. My guess
is that the wait is failing for some reason. Use WNOHANG, so we won't
wait until the buildbot kills the test suite.
I haven't been able to reproduce the failure, so I'm not sure if
this will help or not. Hopefully, this change will cause the test
to fail, rather than hang. That will be better since we will get
the rest of the test results. It may also help us debug the real problem.
........
r47015 | neal.norwitz | 2006-06-18 22:10:24 +0200 (Sun, 18 Jun 2006) | 1 line
Revert 47014 until it is more robust
........
r47016 | thomas.heller | 2006-06-18 23:27:04 +0200 (Sun, 18 Jun 2006) | 6 lines
Fix typos.
Fix doctest example.
Mention in the tutorial that 'errcheck' is explained in the ref manual.
Use better wording in some places.
Remoce code examples that shouldn't be in the tutorial.
Remove some XXX notices.
........
r47017 | georg.brandl | 2006-06-19 00:17:29 +0200 (Mon, 19 Jun 2006) | 3 lines
Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c.
........
r47018 | neal.norwitz | 2006-06-19 07:40:44 +0200 (Mon, 19 Jun 2006) | 1 line
Use Py_ssize_t
........
r47019 | georg.brandl | 2006-06-19 08:35:54 +0200 (Mon, 19 Jun 2006) | 3 lines
Add news entry about error msg improvement.
........
r47020 | thomas.heller | 2006-06-19 09:07:49 +0200 (Mon, 19 Jun 2006) | 2 lines
Try to repair the failing test on the OpenBSD buildbot. Trial and error...
........
r47021 | tim.peters | 2006-06-19 09:45:16 +0200 (Mon, 19 Jun 2006) | 2 lines
Whitespace normalization.
........
r47022 | walter.doerwald | 2006-06-19 10:07:50 +0200 (Mon, 19 Jun 2006) | 4 lines
Patch #1506645: add Python wrappers for the curses functions
is_term_resized, resize_term and resizeterm. This uses three
separate configure checks (one for each function).
........
r47023 | walter.doerwald | 2006-06-19 10:14:09 +0200 (Mon, 19 Jun 2006) | 2 lines
Make check order match in configure and configure.in.
........
r47024 | tim.peters | 2006-06-19 10:14:28 +0200 (Mon, 19 Jun 2006) | 3 lines
Repair KeyError when running test_threaded_import under -R,
as reported by Neal on python-dev.
........
r47025 | thomas.heller | 2006-06-19 10:32:46 +0200 (Mon, 19 Jun 2006) | 3 lines
Next try to fix the OpenBSD buildbot tests:
Use ctypes.util.find_library to locate the C runtime library
on platforms where is returns useful results.
........
r47026 | tim.peters | 2006-06-19 11:09:44 +0200 (Mon, 19 Jun 2006) | 13 lines
TestHelp.make_parser(): This was making a permanent change to
os.environ (setting envar COLUMNS), which at least caused
test_float_default() to fail if the tests were run more than once.
This repairs the test_optparse -R failures Neal reported on
python-dev. It also explains some seemingly bizarre test_optparse
failures we saw a couple weeks ago on the buildbots, when
test_optparse failed due to test_file failing to clean up after
itself, and then test_optparse failed in an entirely different
way when regrtest's -w option ran test_optparse a second time.
It's now obvious that make_parser() permanently changing os.environ
was responsible for the second half of that.
........
r47027 | anthony.baxter | 2006-06-19 14:04:15 +0200 (Mon, 19 Jun 2006) | 2 lines
Preparing for 2.5b1.
........
r47029 | fred.drake | 2006-06-19 19:31:16 +0200 (Mon, 19 Jun 2006) | 1 line
remove non-working document formats from edist
........
r47030 | gerhard.haering | 2006-06-19 23:17:35 +0200 (Mon, 19 Jun 2006) | 5 lines
Fixed a memory leak that was introduced with incorrect usage of the Python weak
reference API in pysqlite 2.2.1.
Bumbed pysqlite version number to upcoming pysqlite 2.3.1 release.
........
r47032 | ka-ping.yee | 2006-06-20 00:49:36 +0200 (Tue, 20 Jun 2006) | 2 lines
Remove Python 2.3 compatibility comment.
........
r47033 | trent.mick | 2006-06-20 01:21:25 +0200 (Tue, 20 Jun 2006) | 2 lines
Upgrade pyexpat to expat 2.0.0 (http://python.org/sf/1462338).
........
r47034 | trent.mick | 2006-06-20 01:57:41 +0200 (Tue, 20 Jun 2006) | 3 lines
[ 1295808 ] expat symbols should be namespaced in pyexpat
(http://python.org/sf/1295808)
........
r47039 | andrew.kuchling | 2006-06-20 13:52:16 +0200 (Tue, 20 Jun 2006) | 1 line
Uncomment wsgiref section
........
r47040 | andrew.kuchling | 2006-06-20 14:15:09 +0200 (Tue, 20 Jun 2006) | 1 line
Add four library items
........
r47041 | andrew.kuchling | 2006-06-20 14:19:54 +0200 (Tue, 20 Jun 2006) | 1 line
Terminology and typography fixes
........
r47042 | andrew.kuchling | 2006-06-20 15:05:12 +0200 (Tue, 20 Jun 2006) | 1 line
Add introductory paragraphs summarizing the release; minor edits
........
r47043 | andrew.kuchling | 2006-06-20 15:11:29 +0200 (Tue, 20 Jun 2006) | 1 line
Minor edits and rearrangements; markup fix
........
r47044 | andrew.kuchling | 2006-06-20 15:20:30 +0200 (Tue, 20 Jun 2006) | 1 line
[Bug #1504456] Mention xml -> xmlcore change
........
r47047 | brett.cannon | 2006-06-20 19:30:26 +0200 (Tue, 20 Jun 2006) | 2 lines
Raise TestSkipped when the test socket connection is refused.
........
r47049 | brett.cannon | 2006-06-20 21:20:17 +0200 (Tue, 20 Jun 2006) | 2 lines
Fix typo of exception name.
........
r47053 | brett.cannon | 2006-06-21 18:57:57 +0200 (Wed, 21 Jun 2006) | 5 lines
At the C level, tuple arguments are passed in directly to the exception
constructor, meaning it is treated as *args, not as a single argument. This
means using the 'message' attribute won't work (until Py3K comes around),
and so one must grab from 'arg' to get the error number.
........
r47054 | andrew.kuchling | 2006-06-21 19:10:18 +0200 (Wed, 21 Jun 2006) | 1 line
Link to LibRef module documentation
........
r47055 | andrew.kuchling | 2006-06-21 19:17:10 +0200 (Wed, 21 Jun 2006) | 1 line
Note some of Barry's work
........
r47056 | andrew.kuchling | 2006-06-21 19:17:28 +0200 (Wed, 21 Jun 2006) | 1 line
Bump version
........
r47057 | georg.brandl | 2006-06-21 19:45:17 +0200 (Wed, 21 Jun 2006) | 3 lines
fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally
........
r47058 | georg.brandl | 2006-06-21 19:52:36 +0200 (Wed, 21 Jun 2006) | 3 lines
Make test_fcntl aware of netbsd3.
........
r47059 | georg.brandl | 2006-06-21 19:53:17 +0200 (Wed, 21 Jun 2006) | 3 lines
Patch #1509001: expected skips for netbsd3.
........
r47060 | gerhard.haering | 2006-06-21 22:55:04 +0200 (Wed, 21 Jun 2006) | 2 lines
Removed call to enable_callback_tracebacks that slipped in by accident.
........
r47061 | armin.rigo | 2006-06-21 23:58:50 +0200 (Wed, 21 Jun 2006) | 13 lines
Fix for an obscure bug introduced by revs 46806 and 46808, with a test.
The problem of checking too eagerly for recursive calls is the
following: if a RuntimeError is caused by recursion, and if code needs
to normalize it immediately (as in the 2nd test), then
PyErr_NormalizeException() needs a call to the RuntimeError class to
instantiate it, and this hits the recursion limit again... causing
PyErr_NormalizeException() to never finish.
Moved this particular recursion check to slot_tp_call(), which is not
involved in instantiating built-in exceptions.
Backport candidate.
........
r47064 | neal.norwitz | 2006-06-22 08:30:50 +0200 (Thu, 22 Jun 2006) | 3 lines
Copy the wsgiref package during make install.
........
r47065 | neal.norwitz | 2006-06-22 08:35:30 +0200 (Thu, 22 Jun 2006) | 1 line
Reset the doc date to today for the automatic doc builds
........
r47067 | andrew.kuchling | 2006-06-22 15:10:23 +0200 (Thu, 22 Jun 2006) | 1 line
Mention how to suppress warnings
........
r47069 | georg.brandl | 2006-06-22 16:46:17 +0200 (Thu, 22 Jun 2006) | 3 lines
Set lineno correctly on list, tuple and dict literals.
........
r47070 | georg.brandl | 2006-06-22 16:46:46 +0200 (Thu, 22 Jun 2006) | 4 lines
Test for correct compilation of try-except-finally stmt.
Test for correct lineno on list, tuple, dict literals.
........
r47071 | fred.drake | 2006-06-22 17:50:08 +0200 (Thu, 22 Jun 2006) | 1 line
fix markup nit
........
r47072 | brett.cannon | 2006-06-22 18:49:14 +0200 (Thu, 22 Jun 2006) | 6 lines
'warning's was improperly requiring that a command-line Warning category be
both a subclass of Warning and a subclass of types.ClassType. The latter is no
longer true thanks to new-style exceptions.
Closes bug #1510580. Thanks to AMK for the test.
........
r47073 | ronald.oussoren | 2006-06-22 20:33:54 +0200 (Thu, 22 Jun 2006) | 3 lines
MacOSX: Add a message to the first screen of the installer that tells
users how to avoid updates to their shell profile.
........
r47074 | georg.brandl | 2006-06-22 21:02:18 +0200 (Thu, 22 Jun 2006) | 3 lines
Fix my name ;)
........
r47075 | thomas.heller | 2006-06-22 21:07:36 +0200 (Thu, 22 Jun 2006) | 2 lines
Small fixes, mostly in the markup.
........
r47076 | peter.astrand | 2006-06-22 22:06:46 +0200 (Thu, 22 Jun 2006) | 1 line
Make it possible to run test_subprocess.py on Python 2.2, which lacks test_support.is_resource_enabled.
........
r47077 | peter.astrand | 2006-06-22 22:21:26 +0200 (Thu, 22 Jun 2006) | 1 line
Applied patch #1506758: Prevent MemoryErrors with large MAXFD.
........
r47079 | neal.norwitz | 2006-06-23 05:32:44 +0200 (Fri, 23 Jun 2006) | 1 line
Fix refleak
........
r47080 | fred.drake | 2006-06-23 08:03:45 +0200 (Fri, 23 Jun 2006) | 9 lines
- SF bug #853506: IP6 address parsing in sgmllib
('[' and ']' were not accepted in unquoted attribute values)
- cleaned up tests of character and entity reference decoding so the
tests cover the documented relationships among handle_charref,
handle_entityref, convert_charref, convert_codepoint, and
convert_entityref, without bringing up Unicode issues that sgmllib
cannot be involved in
........
r47085 | andrew.kuchling | 2006-06-23 21:23:40 +0200 (Fri, 23 Jun 2006) | 11 lines
Fit Makefile for the Python doc environment better; this is a step toward
including the howtos in the build process.
* Put LaTeX output in ../paper-<whatever>/.
* Put HTML output in ../html/
* Explain some of the Makefile variables
* Remove some cruft dating to my environment (e.g. the 'web' target)
This makefile isn't currently invoked by the documentation build process,
so these changes won't destabilize anything.
........
r47086 | hyeshik.chang | 2006-06-23 23:16:18 +0200 (Fri, 23 Jun 2006) | 5 lines
Bug #1511381: codec_getstreamcodec() in codec.c is corrected to
omit a default "error" argument for NULL pointer. This allows
the parser to take a codec from cjkcodecs again.
(Reported by Taewook Kang and reviewed by Walter Doerwald)
........
r47091 | ronald.oussoren | 2006-06-25 22:44:16 +0200 (Sun, 25 Jun 2006) | 6 lines
Workaround for bug #1512124
Without this patch IDLE will get unresponsive when you open the debugger
window on OSX. This is both using the system Tcl/Tk on Tiger as the latest
universal download from tk-components.sf.net.
........
r47092 | ronald.oussoren | 2006-06-25 23:14:19 +0200 (Sun, 25 Jun 2006) | 3 lines
Drop the calldll demo's for macos, calldll isn't present anymore, no need
to keep the demo's around.
........
r47093 | ronald.oussoren | 2006-06-25 23:15:58 +0200 (Sun, 25 Jun 2006) | 3 lines
Use a path without a double slash to compile the .py files after installation
(macosx, binary installer). This fixes bug #1508369 for python 2.5.
........
r47094 | ronald.oussoren | 2006-06-25 23:19:06 +0200 (Sun, 25 Jun 2006) | 3 lines
Also install the .egg-info files in Lib. This will cause wsgiref.egg-info to
be installed.
........
r47097 | andrew.kuchling | 2006-06-26 14:40:02 +0200 (Mon, 26 Jun 2006) | 1 line
[Bug #1511998] Various comments from Nick Coghlan; thanks!
........
r47098 | andrew.kuchling | 2006-06-26 14:43:43 +0200 (Mon, 26 Jun 2006) | 1 line
Describe workaround for PyRange_New()'s removal
........
r47099 | andrew.kuchling | 2006-06-26 15:08:24 +0200 (Mon, 26 Jun 2006) | 5 lines
[Bug #1512163] Fix typo.
This change will probably break tests on FreeBSD buildbots, but I'll check in
a fix for that next.
........
r47100 | andrew.kuchling | 2006-06-26 15:12:16 +0200 (Mon, 26 Jun 2006) | 9 lines
[Bug #1512163] Use one set of locking methods, lockf();
remove the flock() calls.
On FreeBSD, the two methods lockf() and flock() end up using the same
mechanism and the second one fails. A Linux man page claims that the
two methods are orthogonal (so locks acquired one way don't interact
with locks acquired the other way) but that clearly must be false.
........
r47101 | andrew.kuchling | 2006-06-26 15:23:10 +0200 (Mon, 26 Jun 2006) | 5 lines
Add a test for a conflicting lock.
On slow machines, maybe the time intervals (2 sec, 0.5 sec) will be too tight.
I'll see how the buildbots like it.
........
r47103 | andrew.kuchling | 2006-06-26 16:33:24 +0200 (Mon, 26 Jun 2006) | 1 line
Windows doesn't have os.fork(). I'll just disable this test for now
........
r47106 | andrew.kuchling | 2006-06-26 19:00:35 +0200 (Mon, 26 Jun 2006) | 9 lines
Attempt to fix build failure on OS X and Debian alpha; the symptom is
consistent with os.wait() returning immediately because some other
subprocess had previously exited; the test suite then immediately
tries to lock the mailbox and gets an error saying it's already
locked.
To fix this, do a waitpid() so the test suite only continues once
the intended child process has exited.
........
r47113 | neal.norwitz | 2006-06-27 06:06:46 +0200 (Tue, 27 Jun 2006) | 1 line
Ignore some more warnings in the dynamic linker on an older gentoo
........
r47114 | neal.norwitz | 2006-06-27 06:09:13 +0200 (Tue, 27 Jun 2006) | 6 lines
Instead of doing a make test, run the regression tests out of the installed
copy. This will hopefully catch problems where directories are added
under Lib/ but not to Makefile.pre.in. This breaks out the 2 runs
of the test suite with and without -O which is also nicer.
........
r47115 | neal.norwitz | 2006-06-27 06:12:58 +0200 (Tue, 27 Jun 2006) | 5 lines
Fix SF bug #1513032, 'make install' failure on FreeBSD 5.3.
No need to install lib-old, it's empty in 2.5.
........
r47116 | neal.norwitz | 2006-06-27 06:23:06 +0200 (Tue, 27 Jun 2006) | 1 line
Test unimportant change to verify buildbot does not try to build
........
r47117 | neal.norwitz | 2006-06-27 06:26:30 +0200 (Tue, 27 Jun 2006) | 1 line
Try again: test unimportant change to verify buildbot does not try to build
........
r47118 | neal.norwitz | 2006-06-27 06:28:56 +0200 (Tue, 27 Jun 2006) | 1 line
Verify buildbot picks up these changes (really needs testing after last change to Makefile.pre.in)
........
r47121 | vinay.sajip | 2006-06-27 09:34:37 +0200 (Tue, 27 Jun 2006) | 1 line
Removed buggy exception handling in doRollover of rotating file handlers. Exceptions now propagate to caller.
........
r47123 | ronald.oussoren | 2006-06-27 12:08:25 +0200 (Tue, 27 Jun 2006) | 3 lines
MacOSX: fix rather dumb buglet that made it impossible to create extensions on
OSX 10.3 when using a binary distribution build on 10.4.
........
r47125 | tim.peters | 2006-06-27 13:52:49 +0200 (Tue, 27 Jun 2006) | 2 lines
Whitespace normalization.
........
r47128 | ronald.oussoren | 2006-06-27 14:53:52 +0200 (Tue, 27 Jun 2006) | 8 lines
Use staticly build copies of zlib and bzip2 to build the OSX installer, that
way the resulting binaries have a better change of running on 10.3.
This patch also updates the search logic for sleepycat db3/4, without this
patch you cannot use a sleepycat build with a non-standard prefix; with this
you can (at least on OSX) if you add the prefix to CPPFLAGS/LDFLAGS at
configure-time. This change is needed to build the binary installer for OSX.
........
r47131 | ronald.oussoren | 2006-06-27 17:45:32 +0200 (Tue, 27 Jun 2006) | 5 lines
macosx: Install a libpython2.5.a inside the framework as a symlink to the actual
dylib at the root of the framework, that way tools that expect a unix-like
install (python-config, but more importantly external products like
mod_python) work correctly.
........
r47137 | neal.norwitz | 2006-06-28 07:03:22 +0200 (Wed, 28 Jun 2006) | 4 lines
According to the man pages on Gentoo Linux and Tru64, EACCES or EAGAIN
can be returned if fcntl (lockf) fails. This fixes the test failure
on Tru64 by checking for either error rather than just EAGAIN.
........
r47139 | neal.norwitz | 2006-06-28 08:28:31 +0200 (Wed, 28 Jun 2006) | 5 lines
Fix bug #1512695: cPickle.loads could crash if it was interrupted with
a KeyboardInterrupt since PyTuple_Pack was passed a NULL.
Will backport.
........
r47142 | nick.coghlan | 2006-06-28 12:41:47 +0200 (Wed, 28 Jun 2006) | 1 line
Make full module name available as __module_name__ even when __name__ is set to something else (like '__main__')
........
r47143 | armin.rigo | 2006-06-28 12:49:51 +0200 (Wed, 28 Jun 2006) | 2 lines
A couple of crashers of the "won't fix" kind.
........
r47147 | andrew.kuchling | 2006-06-28 16:25:20 +0200 (Wed, 28 Jun 2006) | 1 line
[Bug #1508766] Add docs for uuid module; docs written by George Yoshida, with minor rearrangements by me.
........
r47148 | andrew.kuchling | 2006-06-28 16:27:21 +0200 (Wed, 28 Jun 2006) | 1 line
[Bug #1508766] Add docs for uuid module; this puts the module in the 'Internet Protocols' section. Arguably this module could also have gone in the chapters on strings or encodings, maybe even the crypto chapter. Fred, please move if you see fit.
........
r47151 | georg.brandl | 2006-06-28 22:23:25 +0200 (Wed, 28 Jun 2006) | 3 lines
Fix end_fill().
........
r47153 | trent.mick | 2006-06-28 22:30:41 +0200 (Wed, 28 Jun 2006) | 2 lines
Mention the expat upgrade and pyexpat fix I put in 2.5b1.
........
r47154 | fred.drake | 2006-06-29 02:51:53 +0200 (Thu, 29 Jun 2006) | 6 lines
SF bug #1504333: sgmlib should allow angle brackets in quoted values
(modified patch by Sam Ruby; changed to use separate REs for start and end
tags to reduce matching cost for end tags; extended tests; updated to avoid
breaking previous changes to support IPv6 addresses in unquoted attribute
values)
........
r47156 | fred.drake | 2006-06-29 04:57:48 +0200 (Thu, 29 Jun 2006) | 1 line
document recent bugfixes in sgmllib
........
r47158 | neal.norwitz | 2006-06-29 06:10:08 +0200 (Thu, 29 Jun 2006) | 10 lines
Add new utility function, reap_children(), to test_support. This should
be called at the end of each test that spawns children (perhaps it
should be called from regrtest instead?). This will hopefully prevent
some of the unexplained failures in the buildbots (hppa and alpha)
during tests that spawn children. The problems were not reproducible.
There were many zombies that remained at the end of several tests.
In the worst case, this shouldn't cause any more problems,
though it may not help either. Time will tell.
........
r47159 | neal.norwitz | 2006-06-29 07:48:14 +0200 (Thu, 29 Jun 2006) | 5 lines
This should fix the buildbot failure on s/390 which can't connect to gmail.org.
It makes the error message consistent and always sends to stderr.
It would be much better for all the networking tests to hit only python.org.
........
r47161 | thomas.heller | 2006-06-29 20:34:15 +0200 (Thu, 29 Jun 2006) | 3 lines
Protect the thread api calls in the _ctypes extension module within
#ifdef WITH_THREADS/#endif blocks. Found by Sam Rushing.
........
r47162 | martin.v.loewis | 2006-06-29 20:58:44 +0200 (Thu, 29 Jun 2006) | 2 lines
Patch #1509163: MS Toolkit Compiler no longer available
........
r47163 | skip.montanaro | 2006-06-29 21:20:09 +0200 (Thu, 29 Jun 2006) | 1 line
add string methods to index
........
r47164 | vinay.sajip | 2006-06-30 02:13:08 +0200 (Fri, 30 Jun 2006) | 1 line
Fixed bug in fileConfig() which failed to clear logging._handlerList
........
r47166 | tim.peters | 2006-06-30 08:18:39 +0200 (Fri, 30 Jun 2006) | 2 lines
Whitespace normalization.
........
r47170 | neal.norwitz | 2006-06-30 09:32:16 +0200 (Fri, 30 Jun 2006) | 1 line
Silence compiler warning
........
r47171 | neal.norwitz | 2006-06-30 09:32:46 +0200 (Fri, 30 Jun 2006) | 1 line
Another problem reported by Coverity. Backport candidate.
........
r47175 | thomas.heller | 2006-06-30 19:44:54 +0200 (Fri, 30 Jun 2006) | 2 lines
Revert the use of PY_FORMAT_SIZE_T in PyErr_Format.
........
r47176 | tim.peters | 2006-06-30 20:34:51 +0200 (Fri, 30 Jun 2006) | 2 lines
Remove now-unused fidding with PY_FORMAT_SIZE_T.
........
r47177 | georg.brandl | 2006-06-30 20:47:56 +0200 (Fri, 30 Jun 2006) | 3 lines
Document decorator usage of property.
........
r47181 | fred.drake | 2006-06-30 21:29:25 +0200 (Fri, 30 Jun 2006) | 4 lines
- consistency nit: always include "()" in \function and \method
(*should* be done by the presentation, but that requires changes all over)
- avoid spreading the __name meme
........
r47188 | vinay.sajip | 2006-07-01 12:45:20 +0200 (Sat, 01 Jul 2006) | 1 line
Added entry for fileConfig() bugfix.
........
r47189 | vinay.sajip | 2006-07-01 12:47:20 +0200 (Sat, 01 Jul 2006) | 1 line
Added duplicate call to fileConfig() to ensure that it cleans up after itself correctly.
........
r47190 | martin.v.loewis | 2006-07-01 17:33:37 +0200 (Sat, 01 Jul 2006) | 2 lines
Release all forwarded functions in .close. Fixes #1513223.
........
r47191 | fred.drake | 2006-07-01 18:28:20 +0200 (Sat, 01 Jul 2006) | 7 lines
SF bug #1296433 (Expat bug #1515266): Unchecked calls to character data
handler would cause a segfault. This merges in Expat's lib/xmlparse.c
revisions 1.154 and 1.155, which fix this and a closely related problem
(the later does not affect Python).
Moved the crasher test to the tests for xml.parsers.expat.
........
r47197 | gerhard.haering | 2006-07-02 19:48:30 +0200 (Sun, 02 Jul 2006) | 4 lines
The sqlite3 module did cut off data from the SQLite database at the first null
character before sending it to a custom converter. This has been fixed now.
........
r47198 | martin.v.loewis | 2006-07-02 20:44:00 +0200 (Sun, 02 Jul 2006) | 1 line
Correct arithmetic in access on Win32. Fixes #1513646.
........
r47203 | thomas.heller | 2006-07-03 09:58:09 +0200 (Mon, 03 Jul 2006) | 1 line
Cleanup: Remove commented out code.
........
r47204 | thomas.heller | 2006-07-03 09:59:50 +0200 (Mon, 03 Jul 2006) | 1 line
Don't run the doctests with Python 2.3 because it doesn't have the ELLIPSIS flag.
........
r47205 | thomas.heller | 2006-07-03 10:04:05 +0200 (Mon, 03 Jul 2006) | 7 lines
Fixes so that _ctypes can be compiled with the MingW compiler.
It seems that the definition of '__attribute__(x)' was responsible for
the compiler ignoring the '__fastcall' attribute on the
ffi_closure_SYSV function in libffi_msvc/ffi.c, took me quite some
time to figure this out.
........
r47206 | thomas.heller | 2006-07-03 10:08:14 +0200 (Mon, 03 Jul 2006) | 11 lines
Add a new function uses_seh() to the _ctypes extension module. This
will return True if Windows Structured Exception handling (SEH) is
used when calling functions, False otherwise.
Currently, only MSVC supports SEH.
Fix the test so that it doesn't crash when run with MingW compiled
_ctypes. Note that two tests are still failing when mingw is used, I
suspect structure layout differences and function calling conventions
between MSVC and MingW.
........
r47207 | tim.peters | 2006-07-03 10:23:19 +0200 (Mon, 03 Jul 2006) | 2 lines
Whitespace normalization.
........
r47208 | martin.v.loewis | 2006-07-03 11:44:00 +0200 (Mon, 03 Jul 2006) | 3 lines
Only setup canvas when it is first created.
Fixes #1514703
........
r47209 | martin.v.loewis | 2006-07-03 12:05:30 +0200 (Mon, 03 Jul 2006) | 3 lines
Reimplement turtle.circle using a polyline, to allow correct
filling of arcs. Also fixes #1514693.
........
r47210 | martin.v.loewis | 2006-07-03 12:19:49 +0200 (Mon, 03 Jul 2006) | 3 lines
Bug #1514693: Update turtle's heading when switching between
degrees and radians.
........
r47211 | martin.v.loewis | 2006-07-03 13:12:06 +0200 (Mon, 03 Jul 2006) | 2 lines
Document functions added in 2.3 and 2.5.
........
r47212 | martin.v.loewis | 2006-07-03 14:19:50 +0200 (Mon, 03 Jul 2006) | 3 lines
Bug #1417699: Reject locale-specific decimal point in float()
and atof().
........
r47213 | martin.v.loewis | 2006-07-03 14:28:58 +0200 (Mon, 03 Jul 2006) | 3 lines
Bug #1267547: Put proper recursive setup.py call into the
spec file generated by bdist_rpm.
........
r47215 | martin.v.loewis | 2006-07-03 15:01:35 +0200 (Mon, 03 Jul 2006) | 3 lines
Patch #825417: Fix timeout processing in expect,
read_until. Will backport to 2.4.
........
r47218 | martin.v.loewis | 2006-07-03 15:47:40 +0200 (Mon, 03 Jul 2006) | 2 lines
Put method-wrappers into trashcan. Fixes #927248.
........
r47219 | andrew.kuchling | 2006-07-03 16:07:30 +0200 (Mon, 03 Jul 2006) | 1 line
[Bug #1515932] Clarify description of slice assignment
........
r47220 | andrew.kuchling | 2006-07-03 16:16:09 +0200 (Mon, 03 Jul 2006) | 4 lines
[Bug #1511911] Clarify description of optional arguments to sorted()
by improving the xref to the section on lists, and by
copying the explanations of the arguments (with a slight modification).
........
r47223 | kristjan.jonsson | 2006-07-03 16:59:05 +0200 (Mon, 03 Jul 2006) | 1 line
Fix build problems with the platform SDK on windows. It is not sufficient to test for the C compiler version when determining if we have the secure CRT from microsoft. Must test with an undocumented macro, __STDC_SECURE_LIB__ too.
........
r47224 | ronald.oussoren | 2006-07-04 14:30:22 +0200 (Tue, 04 Jul 2006) | 7 lines
Sync the darwin/x86 port libffi with the copy in PyObjC. This fixes a number
of bugs in that port. The most annoying ones were due to some subtle differences
between the document ABI and the actual implementation :-(
(there are no python unittests that fail without this patch, but without it
some of libffi's unittests fail).
........
r47234 | georg.brandl | 2006-07-05 10:21:00 +0200 (Wed, 05 Jul 2006) | 3 lines
Remove remaining references to OverflowWarning.
........
r47236 | thomas.heller | 2006-07-05 11:13:56 +0200 (Wed, 05 Jul 2006) | 3 lines
Fix the bitfield test when _ctypes is compiled with MingW. Structures
containing bitfields may have different layout on MSVC and MingW .
........
r47237 | thomas.wouters | 2006-07-05 13:03:49 +0200 (Wed, 05 Jul 2006) | 15 lines
Fix bug in passing tuples to string.Template. All other values (with working
str() or repr()) would work, just not multi-value tuples. Probably not a
backport candidate, since it changes the behaviour of passing a
single-element tuple:
>>> string.Template("$foo").substitute(dict(foo=(1,)))
'(1,)'
versus
'1'
........
r47241 | georg.brandl | 2006-07-05 16:18:45 +0200 (Wed, 05 Jul 2006) | 2 lines
Patch #1517490: fix glitches in filter() docs.
........
r47244 | georg.brandl | 2006-07-05 17:50:05 +0200 (Wed, 05 Jul 2006) | 2 lines
no need to elaborate "string".
........
r47251 | neal.norwitz | 2006-07-06 06:28:59 +0200 (Thu, 06 Jul 2006) | 3 lines
Fix refleaks reported by Shane Hathaway in SF patch #1515361. This change
contains only the changes related to leaking the copy variable.
........
r47253 | fred.drake | 2006-07-06 07:13:22 +0200 (Thu, 06 Jul 2006) | 4 lines
- back out Expat change; the final fix to Expat will be different
- change the pyexpat wrapper to not be so sensitive to this detail of the
Expat implementation (the ex-crasher test still passes)
........
r47257 | neal.norwitz | 2006-07-06 08:45:08 +0200 (Thu, 06 Jul 2006) | 1 line
Add a NEWS entry for a recent pyexpat fix
........
r47258 | martin.v.loewis | 2006-07-06 08:55:58 +0200 (Thu, 06 Jul 2006) | 2 lines
Add sqlite3.dll to the DLLs component, not to the TkDLLs component.
Fixes #1517388.
........
r47259 | martin.v.loewis | 2006-07-06 09:05:21 +0200 (Thu, 06 Jul 2006) | 1 line
Properly quote compileall and Lib paths in case TARGETDIR has a space.
........
r47260 | thomas.heller | 2006-07-06 09:50:18 +0200 (Thu, 06 Jul 2006) | 5 lines
Revert the change done in svn revision 47206:
Add a new function uses_seh() to the _ctypes extension module. This
will return True if Windows Structured Exception handling (SEH) is
used when calling functions, False otherwise.
........
r47261 | armin.rigo | 2006-07-06 09:58:18 +0200 (Thu, 06 Jul 2006) | 3 lines
A couple of examples about how to attack the fact that _PyType_Lookup()
returns a borrowed ref. Many of the calls are open to attack.
........
r47262 | thomas.heller | 2006-07-06 10:28:14 +0200 (Thu, 06 Jul 2006) | 2 lines
The test that calls a function with invalid arguments and catches the
resulting Windows access violation will not be run by default.
........
r47263 | thomas.heller | 2006-07-06 10:48:35 +0200 (Thu, 06 Jul 2006) | 5 lines
Patch #1517790: It is now possible to use custom objects in the ctypes
foreign function argtypes sequence as long as they provide a
from_param method, no longer is it required that the object is a
ctypes type.
........
r47264 | thomas.heller | 2006-07-06 10:58:40 +0200 (Thu, 06 Jul 2006) | 2 lines
Document the Struture and Union constructors.
........
r47265 | thomas.heller | 2006-07-06 11:11:22 +0200 (Thu, 06 Jul 2006) | 2 lines
Document the changes in svn revision 47263, from patch #1517790.
........
r47267 | ronald.oussoren | 2006-07-06 12:13:35 +0200 (Thu, 06 Jul 2006) | 7 lines
This patch solves the problem Skip was seeing with zlib, this patch ensures that
configure uses similar compiler flags as setup.py when doing the zlib test.
Without this patch configure would use the first shared library on the linker
path, with this patch it uses the first shared or static library on that path
just like setup.py.
........
r47268 | thomas.wouters | 2006-07-06 12:48:28 +0200 (Thu, 06 Jul 2006) | 4 lines
NEWS entry for r47267: fixing configure's zlib probing.
........
r47269 | fredrik.lundh | 2006-07-06 14:29:24 +0200 (Thu, 06 Jul 2006) | 3 lines
added XMLParser alias for cElementTree compatibility
........
r47271 | nick.coghlan | 2006-07-06 14:53:04 +0200 (Thu, 06 Jul 2006) | 1 line
Revert the __module_name__ changes made in rev 47142. We'll revisit this in Python 2.6
........
r47272 | nick.coghlan | 2006-07-06 15:04:56 +0200 (Thu, 06 Jul 2006) | 1 line
Update the tutorial section on relative imports
........
r47273 | nick.coghlan | 2006-07-06 15:35:27 +0200 (Thu, 06 Jul 2006) | 1 line
Ignore ImportWarning by default
........
r47274 | nick.coghlan | 2006-07-06 15:41:34 +0200 (Thu, 06 Jul 2006) | 1 line
Cover ImportWarning, PendingDeprecationWarning and simplefilter() in the warnings module docs
........
r47275 | nick.coghlan | 2006-07-06 15:47:18 +0200 (Thu, 06 Jul 2006) | 1 line
Add NEWS entries for the ImportWarning change and documentation update
........
r47276 | andrew.kuchling | 2006-07-06 15:57:28 +0200 (Thu, 06 Jul 2006) | 1 line
ImportWarning is now silent by default
........
r47277 | thomas.heller | 2006-07-06 17:06:05 +0200 (Thu, 06 Jul 2006) | 2 lines
Document the correct return type of PyLong_AsUnsignedLongLongMask.
........
r47278 | hyeshik.chang | 2006-07-06 17:21:52 +0200 (Thu, 06 Jul 2006) | 2 lines
Add a testcase for r47086 which fixed a bug in codec_getstreamcodec().
........
r47279 | hyeshik.chang | 2006-07-06 17:39:24 +0200 (Thu, 06 Jul 2006) | 3 lines
Test using all CJK encodings for the testcases which don't require
specific encodings.
........
r47280 | martin.v.loewis | 2006-07-06 21:28:03 +0200 (Thu, 06 Jul 2006) | 2 lines
Properly generate logical file ids. Fixes #1515998.
Also correct typo in Control.mapping.
........
r47287 | neal.norwitz | 2006-07-07 08:03:15 +0200 (Fri, 07 Jul 2006) | 17 lines
Restore rev 47014:
The hppa ubuntu box sometimes hangs forever in these tests. My guess
is that the wait is failing for some reason. Use WNOHANG, so we won't
wait until the buildbot kills the test suite.
I haven't been able to reproduce the failure, so I'm not sure if
this will help or not. Hopefully, this change will cause the test
to fail, rather than hang. That will be better since we will get
the rest of the test results. It may also help us debug the real problem.
*** The reason this originally failed was because there were many
zombie children outstanding before rev 47158 cleaned them up.
There are still hangs in test_subprocess that need to be addressed,
but that will take more work. This should close some holes.
........
r47289 | georg.brandl | 2006-07-07 10:15:12 +0200 (Fri, 07 Jul 2006) | 3 lines
Fix RFC number.
........
r50489 | neal.norwitz | 2006-07-08 07:31:37 +0200 (Sat, 08 Jul 2006) | 1 line
Fix SF bug #1519018: 'as' is now validated properly in import statements
........
r50490 | georg.brandl | 2006-07-08 14:15:27 +0200 (Sat, 08 Jul 2006) | 3 lines
Add an additional test for bug #1519018.
........
r50491 | tim.peters | 2006-07-08 21:55:05 +0200 (Sat, 08 Jul 2006) | 2 lines
Whitespace normalization.
........
r50493 | neil.schemenauer | 2006-07-09 18:16:34 +0200 (Sun, 09 Jul 2006) | 2 lines
Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation.
........
r50495 | neil.schemenauer | 2006-07-09 23:19:29 +0200 (Sun, 09 Jul 2006) | 2 lines
Fix SF bug 1441486: bad unary minus folding in compiler.
........
r50497 | neal.norwitz | 2006-07-10 00:14:42 +0200 (Mon, 10 Jul 2006) | 4 lines
On 64 bit systems, int literals that use less than 64 bits are now ints
rather than longs. This also fixes the test for eval(-sys.maxint - 1).
........
r50500 | neal.norwitz | 2006-07-10 02:04:44 +0200 (Mon, 10 Jul 2006) | 4 lines
Bug #1512814, Fix incorrect lineno's when code at module scope
started after line 256.
........
r50501 | neal.norwitz | 2006-07-10 02:05:34 +0200 (Mon, 10 Jul 2006) | 1 line
Fix doco. Backport candidate.
........
r50503 | neal.norwitz | 2006-07-10 02:23:17 +0200 (Mon, 10 Jul 2006) | 5 lines
Part of SF patch #1484695. This removes dead code. The chksum was
already verified in .frombuf() on the lines above. If there was
a problem an exception is raised, so there was no way this condition
could have been true.
........
r50504 | neal.norwitz | 2006-07-10 03:18:57 +0200 (Mon, 10 Jul 2006) | 3 lines
Patch #1516912: improve Modules support for OpenVMS.
........
r50506 | neal.norwitz | 2006-07-10 04:36:41 +0200 (Mon, 10 Jul 2006) | 7 lines
Patch #1504046: Add documentation for xml.etree.
/F wrote the text docs, Englebert Gruber massaged it to latex and I
did some more massaging to try and improve the consistency and
fix some name mismatches between the declaration and text.
........
r50509 | martin.v.loewis | 2006-07-10 09:23:48 +0200 (Mon, 10 Jul 2006) | 2 lines
Introduce DISTUTILS_USE_SDK as a flag to determine whether the
SDK environment should be used. Fixes #1508010.
........
r50510 | martin.v.loewis | 2006-07-10 09:26:41 +0200 (Mon, 10 Jul 2006) | 1 line
Change error message to indicate that VS2003 is necessary to build extension modules, not the .NET SDK.
........
r50511 | martin.v.loewis | 2006-07-10 09:29:41 +0200 (Mon, 10 Jul 2006) | 1 line
Add svn:ignore.
........
r50512 | anthony.baxter | 2006-07-10 09:41:04 +0200 (Mon, 10 Jul 2006) | 1 line
preparing for 2.5b2
........
r50513 | thomas.heller | 2006-07-10 11:10:28 +0200 (Mon, 10 Jul 2006) | 2 lines
Fix bug #1518190: accept any integer or long value in the
ctypes.c_void_p constructor.
........
r50514 | thomas.heller | 2006-07-10 11:31:06 +0200 (Mon, 10 Jul 2006) | 3 lines
Fixed a segfault when ctypes.wintypes were imported on
non-Windows machines.
........
r50516 | thomas.heller | 2006-07-10 13:11:10 +0200 (Mon, 10 Jul 2006) | 3 lines
Assigning None to pointer type structure fields possible overwrote
wrong fields.
........
r50517 | thomas.heller | 2006-07-10 13:17:37 +0200 (Mon, 10 Jul 2006) | 5 lines
Moved the ctypes news entries from the 'Library' section into the
'Extension Modules' section where they belong, probably.
This destroyes the original order of the news entries, don't know
if that is important or not.
........
r50526 | phillip.eby | 2006-07-10 21:03:29 +0200 (Mon, 10 Jul 2006) | 2 lines
Fix SF#1516184 and add a test to prevent regression.
........
r50528 | phillip.eby | 2006-07-10 21:18:35 +0200 (Mon, 10 Jul 2006) | 2 lines
Fix SF#1457312: bad socket error handling in distutils "upload" command.
........
r50537 | peter.astrand | 2006-07-10 22:39:49 +0200 (Mon, 10 Jul 2006) | 1 line
Make it possible to run test_subprocess.py with Python 2.2, which lacks test_support.reap_children().
........
r50541 | tim.peters | 2006-07-10 23:08:24 +0200 (Mon, 10 Jul 2006) | 5 lines
After approval from Anthony, merge the tim-current_frames
branch into the trunk. This adds a new sys._current_frames()
function, which returns a dict mapping thread id to topmost
thread stack frame.
........
r50542 | tim.peters | 2006-07-10 23:11:49 +0200 (Mon, 10 Jul 2006) | 2 lines
Whitespace normalization.
........
r50553 | martin.v.loewis | 2006-07-11 00:11:28 +0200 (Tue, 11 Jul 2006) | 4 lines
Patch #1519566: Remove unused _tofill member.
Make begin_fill idempotent.
Update demo2 to demonstrate filling of concave shapes.
........
r50567 | anthony.baxter | 2006-07-11 04:04:09 +0200 (Tue, 11 Jul 2006) | 4 lines
#1494314: Fix a regression with high-numbered sockets in 2.4.3. This
means that select() on sockets > FD_SETSIZE (typically 1024) work again.
The patch makes sockets use poll() internally where available.
........
r50568 | tim.peters | 2006-07-11 04:17:48 +0200 (Tue, 11 Jul 2006) | 2 lines
Whitespace normalization.
........
r50575 | thomas.heller | 2006-07-11 18:42:05 +0200 (Tue, 11 Jul 2006) | 1 line
Add missing Py_DECREF.
........
r50576 | thomas.heller | 2006-07-11 18:44:25 +0200 (Tue, 11 Jul 2006) | 1 line
Add missing Py_DECREFs.
........
r50579 | andrew.kuchling | 2006-07-11 19:20:16 +0200 (Tue, 11 Jul 2006) | 1 line
Bump version number; add sys._current_frames
........
r50582 | thomas.heller | 2006-07-11 20:28:35 +0200 (Tue, 11 Jul 2006) | 3 lines
When a foreign function is retrived by calling __getitem__ on a ctypes
library instance, do not set it as attribute.
........
r50583 | thomas.heller | 2006-07-11 20:40:50 +0200 (Tue, 11 Jul 2006) | 2 lines
Change the ctypes version number to 1.0.0.
........
r50597 | neal.norwitz | 2006-07-12 07:26:17 +0200 (Wed, 12 Jul 2006) | 3 lines
Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
........
r50598 | neal.norwitz | 2006-07-12 07:26:35 +0200 (Wed, 12 Jul 2006) | 1 line
Fix function name in error msg
........
r50599 | neal.norwitz | 2006-07-12 07:27:46 +0200 (Wed, 12 Jul 2006) | 4 lines
Fix uninitialized memory read reported by Valgrind when running doctest.
This could happen if size == 0.
........
r50600 | neal.norwitz | 2006-07-12 09:28:29 +0200 (Wed, 12 Jul 2006) | 1 line
Actually change the MAGIC #. Create a new section for 2.5c1 and mention the impact of changing the MAGIC #.
........
r50601 | thomas.heller | 2006-07-12 10:43:47 +0200 (Wed, 12 Jul 2006) | 3 lines
Fix #1467450: ctypes now uses RTLD_GLOBAL by default on OSX 10.3 to
load shared libraries.
........
r50604 | thomas.heller | 2006-07-12 16:25:18 +0200 (Wed, 12 Jul 2006) | 3 lines
Fix the wrong description of LibraryLoader.LoadLibrary, and document
the DEFAULT_MODE constant.
........
r50607 | georg.brandl | 2006-07-12 17:31:17 +0200 (Wed, 12 Jul 2006) | 3 lines
Accept long options "--help" and "--version".
........
r50617 | thomas.heller | 2006-07-13 11:53:47 +0200 (Thu, 13 Jul 2006) | 3 lines
A misspelled preprocessor symbol caused ctypes to be always compiled
without thread support. Replaced WITH_THREADS with WITH_THREAD.
........
r50619 | thomas.heller | 2006-07-13 19:01:14 +0200 (Thu, 13 Jul 2006) | 3 lines
Fix #1521375. When running with root priviledges, 'gcc -o /dev/null'
did overwrite /dev/null. Use a temporary file instead of /dev/null.
........
r50620 | thomas.heller | 2006-07-13 19:05:13 +0200 (Thu, 13 Jul 2006) | 2 lines
Fix misleading words.
........
r50622 | andrew.kuchling | 2006-07-13 19:37:26 +0200 (Thu, 13 Jul 2006) | 1 line
Typo fix
........
r50629 | georg.brandl | 2006-07-14 09:12:54 +0200 (Fri, 14 Jul 2006) | 3 lines
Patch #1521874: grammar errors in doanddont.tex.
........
r50630 | neal.norwitz | 2006-07-14 09:20:04 +0200 (Fri, 14 Jul 2006) | 1 line
Try to improve grammar further.
........
r50631 | martin.v.loewis | 2006-07-14 11:58:55 +0200 (Fri, 14 Jul 2006) | 1 line
Extend build_ssl to Win64, using VSExtComp.
........
r50632 | martin.v.loewis | 2006-07-14 14:10:09 +0200 (Fri, 14 Jul 2006) | 1 line
Add debug output to analyse buildbot failure.
........
r50633 | martin.v.loewis | 2006-07-14 14:31:05 +0200 (Fri, 14 Jul 2006) | 1 line
Fix Debug build of _ssl.
........
r50636 | andrew.kuchling | 2006-07-14 15:32:38 +0200 (Fri, 14 Jul 2006) | 1 line
Mention new options
........
r50638 | peter.astrand | 2006-07-14 16:04:45 +0200 (Fri, 14 Jul 2006) | 1 line
Bug #1223937: CalledProcessError.errno -> CalledProcessError.returncode.
........
r50640 | thomas.heller | 2006-07-14 17:01:05 +0200 (Fri, 14 Jul 2006) | 4 lines
Make the prototypes of our private PyUnicode_FromWideChar and
PyUnicode_AsWideChar replacement functions compatible to the official
functions by using Py_ssize_t instead of int.
........
r50643 | thomas.heller | 2006-07-14 19:51:14 +0200 (Fri, 14 Jul 2006) | 3 lines
Patch #1521817: The index range checking on ctypes arrays containing
exactly one element is enabled again.
........
r50647 | thomas.heller | 2006-07-14 20:22:50 +0200 (Fri, 14 Jul 2006) | 2 lines
Updates for the ctypes documentation.
........
r50655 | fredrik.lundh | 2006-07-14 23:45:48 +0200 (Fri, 14 Jul 2006) | 3 lines
typo
........
r50664 | george.yoshida | 2006-07-15 18:03:49 +0200 (Sat, 15 Jul 2006) | 2 lines
Bug #15187702 : ext/win-cookbook.html has a broken link to distutils
........
r50667 | bob.ippolito | 2006-07-15 18:53:15 +0200 (Sat, 15 Jul 2006) | 1 line
Patch #1220874: Update the binhex module for Mach-O.
........
r50671 | fred.drake | 2006-07-16 03:21:20 +0200 (Sun, 16 Jul 2006) | 1 line
clean up some link markup
........
r50673 | neal.norwitz | 2006-07-16 03:50:38 +0200 (Sun, 16 Jul 2006) | 4 lines
Bug #1512814, Fix incorrect lineno's when code within a function
had more than 255 blank lines. Byte codes need to go first, line #s second.
........
r50674 | neal.norwitz | 2006-07-16 04:00:32 +0200 (Sun, 16 Jul 2006) | 5 lines
a & b were dereffed above, so they are known to be valid pointers.
z is known to be NULL, nothing to DECREF.
Reported by Klockwork, #107.
........
r50675 | neal.norwitz | 2006-07-16 04:02:57 +0200 (Sun, 16 Jul 2006) | 5 lines
self is dereffed (and passed as first arg), so it's known to be good.
func is returned from PyArg_ParseTuple and also dereffed.
Reported by Klocwork, #30 (self one at least).
........
r50676 | neal.norwitz | 2006-07-16 04:05:35 +0200 (Sun, 16 Jul 2006) | 4 lines
proto was dereffed above and is known to be good. No need for X.
Reported by Klocwork, #39.
........
r50677 | neal.norwitz | 2006-07-16 04:15:27 +0200 (Sun, 16 Jul 2006) | 5 lines
Fix memory leaks in some conditions.
Reported by Klocwork #152.
........
r50678 | neal.norwitz | 2006-07-16 04:17:36 +0200 (Sun, 16 Jul 2006) | 4 lines
Fix memory leak under some conditions.
Reported by Klocwork, #98.
........
r50679 | neal.norwitz | 2006-07-16 04:22:30 +0200 (Sun, 16 Jul 2006) | 8 lines
Use sizeof(buffer) instead of duplicating the constants to ensure they won't
be wrong.
The real change is to pass (bufsz - 1) to PyOS_ascii_formatd and 1
to strncat. strncat copies n+1 bytes from src (not dest).
Reported by Klocwork #58.
........
r50680 | neal.norwitz | 2006-07-16 04:32:03 +0200 (Sun, 16 Jul 2006) | 5 lines
Handle a NULL name properly.
Reported by Klocwork #67
........
r50681 | neal.norwitz | 2006-07-16 04:35:47 +0200 (Sun, 16 Jul 2006) | 6 lines
PyFunction_SetDefaults() is documented as taking None or a tuple.
A NULL would crash the PyTuple_Check(). Now make NULL return a SystemError.
Reported by Klocwork #73.
........
r50683 | neal.norwitz | 2006-07-17 02:55:45 +0200 (Mon, 17 Jul 2006) | 5 lines
Stop INCREFing name, then checking if it's NULL. name (f_name) should never
be NULL so assert it. Fix one place where we could have passed NULL.
Reported by Klocwork #66.
........
r50684 | neal.norwitz | 2006-07-17 02:57:15 +0200 (Mon, 17 Jul 2006) | 5 lines
otherset is known to be non-NULL based on checks before and DECREF after.
DECREF otherset rather than XDECREF in error conditions too.
Reported by Klockwork #154.
........
r50685 | neal.norwitz | 2006-07-17 02:59:04 +0200 (Mon, 17 Jul 2006) | 7 lines
Reported by Klocwork #151.
v2 can be NULL if exception2 is NULL. I don't think that condition can happen,
but I'm not sure it can't either. Now the code will protect against either
being NULL.
........
r50686 | neal.norwitz | 2006-07-17 03:00:16 +0200 (Mon, 17 Jul 2006) | 1 line
Add NEWS entry for a bunch of fixes due to warnings produced by Klocworks static analysis tool.
........
r50687 | fred.drake | 2006-07-17 07:47:52 +0200 (Mon, 17 Jul 2006) | 3 lines
document xmlcore (still minimal; needs mention in each of the xml.* modules)
SF bug #1504456 (partial)
........
r50688 | georg.brandl | 2006-07-17 15:23:46 +0200 (Mon, 17 Jul 2006) | 3 lines
Remove usage of sets module (patch #1500609).
........
r50689 | georg.brandl | 2006-07-17 15:26:33 +0200 (Mon, 17 Jul 2006) | 3 lines
Add missing NEWS item (#1522771)
........
r50690 | andrew.kuchling | 2006-07-17 18:47:54 +0200 (Mon, 17 Jul 2006) | 1 line
Attribute more features
........
r50692 | kurt.kaiser | 2006-07-17 23:59:27 +0200 (Mon, 17 Jul 2006) | 8 lines
Patch 1479219 - Tal Einat
1. 'as' highlighted as builtin in comment string on import line
2. Comments such as "#False identity" which start with a keyword immediately
after the '#' character aren't colored as comments.
3. u or U beginning unicode string not correctly highlighted
Closes bug 1325071
........
r50693 | barry.warsaw | 2006-07-18 01:07:51 +0200 (Tue, 18 Jul 2006) | 16 lines
decode_rfc2231(): Be more robust against buggy RFC 2231 encodings.
Specifically, instead of raising a ValueError when there is a single tick in
the parameter, simply return that the entire string unquoted, with None for
both the charset and the language. Also, if there are more than 2 ticks in
the parameter, interpret the first three parts as the standard RFC 2231 parts,
then the rest of the parts as the encoded string.
Test cases added.
Original fewer-than-3-parts fix by Tokio Kikuchi.
Resolves SF bug # 1218081. I will back port the fix and tests to Python 2.4
(email 3.0) and Python 2.3 (email 2.5).
Also, bump the version number to email 4.0.1, removing the 'alpha' moniker.
........
r50695 | kurt.kaiser | 2006-07-18 06:03:16 +0200 (Tue, 18 Jul 2006) | 2 lines
Rebinding Tab key was inserting 'tab' instead of 'Tab'. Bug 1179168.
........
r50696 | brett.cannon | 2006-07-18 06:41:36 +0200 (Tue, 18 Jul 2006) | 6 lines
Fix bug #1520914. Starting in 2.4, time.strftime() began to check the bounds
of values in the time tuple passed in. Unfortunately people came to rely on
undocumented behaviour of setting unneeded values to 0, regardless of if it was
within the valid range. Now those values force the value internally to the
minimum value when 0 is passed in.
........
r50697 | facundo.batista | 2006-07-18 14:16:13 +0200 (Tue, 18 Jul 2006) | 1 line
Comments and docs cleanups, and some little fixes, provided by Santiágo Peresón
........
r50704 | martin.v.loewis | 2006-07-18 19:46:31 +0200 (Tue, 18 Jul 2006) | 2 lines
Patch #1524429: Use repr instead of backticks again.
........
r50706 | tim.peters | 2006-07-18 23:55:15 +0200 (Tue, 18 Jul 2006) | 2 lines
Whitespace normalization.
........
r50708 | tim.peters | 2006-07-19 02:03:19 +0200 (Wed, 19 Jul 2006) | 18 lines
SF bug 1524317: configure --without-threads fails to build
Moved the code for _PyThread_CurrentFrames() up, so it's no longer
in a huge "#ifdef WITH_THREAD" block (I didn't realize it /was/ in
one).
Changed test_sys's test_current_frames() so it passes with or without
thread supported compiled in.
Note that test_sys fails when Python is compiled without threads,
but for an unrelated reason (the old test_exit() fails with an
indirect ImportError on the `thread` module). There are also
other unrelated compilation failures without threads, in extension
modules (like ctypes); at least the core compiles again.
Do we really support --without-threads? If so, there are several
problems remaining.
........
r50713 | thomas.heller | 2006-07-19 11:09:32 +0200 (Wed, 19 Jul 2006) | 4 lines
Make sure the _ctypes extension can be compiled when WITH_THREAD is
not defined on Windows, even if that configuration is probably not
supported at all.
........
r50715 | martin.v.loewis | 2006-07-19 19:18:32 +0200 (Wed, 19 Jul 2006) | 4 lines
Revert r50706 (Whitespace normalization) and
r50697: Comments and docs cleanups, and some little fixes
per recommendation from Raymond Hettinger.
........
r50719 | phillip.eby | 2006-07-20 17:54:16 +0200 (Thu, 20 Jul 2006) | 4 lines
Fix SF#1516184 (again) and add a test to prevent regression.
(There was a problem with empty filenames still causing recursion)
........
r50720 | georg.brandl | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 3 lines
Guard for _active being None in __del__ method.
........
r50721 | vinay.sajip | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 1 line
Updated documentation for TimedRotatingFileHandler relating to how rollover files are named. The previous documentation was wrongly the same as for RotatingFileHandler.
........
r50731 | fred.drake | 2006-07-20 22:11:57 +0200 (Thu, 20 Jul 2006) | 1 line
markup fix
........
r50739 | kurt.kaiser | 2006-07-21 00:22:52 +0200 (Fri, 21 Jul 2006) | 7 lines
Avoid occasional failure to detect closing paren properly.
Patch 1407280 Tal Einat
M ParenMatch.py
M NEWS.txt
M CREDITS.txt
........
r50740 | vinay.sajip | 2006-07-21 01:20:12 +0200 (Fri, 21 Jul 2006) | 1 line
Addressed SF#1524081 by using a dictionary to map level names to syslog priority names, rather than a string.lower().
........
r50741 | neal.norwitz | 2006-07-21 07:29:58 +0200 (Fri, 21 Jul 2006) | 1 line
Add some asserts that we got good params passed
........
r50742 | neal.norwitz | 2006-07-21 07:31:02 +0200 (Fri, 21 Jul 2006) | 5 lines
Move the initialization of some pointers earlier. The problem is
that if we call Py_DECREF(frame) like we do if allocating locals fails,
frame_dealloc() will try to use these bogus values and crash.
........
r50743 | neal.norwitz | 2006-07-21 07:32:28 +0200 (Fri, 21 Jul 2006) | 4 lines
Handle allocation failures gracefully. Found with failmalloc.
Many (all?) of these could be backported.
........
r50745 | neal.norwitz | 2006-07-21 09:59:02 +0200 (Fri, 21 Jul 2006) | 1 line
Speel initialise write. Tanks Anthony.
........
r50746 | neal.norwitz | 2006-07-21 09:59:47 +0200 (Fri, 21 Jul 2006) | 2 lines
Handle more memory allocation failures without crashing.
........
r50754 | barry.warsaw | 2006-07-21 16:51:07 +0200 (Fri, 21 Jul 2006) | 23 lines
More RFC 2231 improvements for the email 4.0 package. As Mark Sapiro rightly
points out there are really two types of continued headers defined in this
RFC (i.e. "encoded" parameters with the form "name*0*=" and unencoded
parameters with the form "name*0="), but we were were handling them both the
same way and that isn't correct.
This patch should be much more RFC compliant in that only encoded params are
%-decoded and the charset/language information is only extract if there are
any encoded params in the segments. If there are no encoded params then the
RFC says that there will be no charset/language parts.
Note however that this will change the return value for Message.get_param() in
some cases. For example, whereas before if you had all unencoded param
continuations you would have still gotten a 3-tuple back from this method
(with charset and language == None), you will now get just a string. I don't
believe this is a backward incompatible change though because the
documentation for this method already indicates that either return value is
possible and that you must do an isinstance(val, tuple) check to discriminate
between the two. (Yeah that API kind of sucks but we can't change /that/
without breaking code.)
Test cases, some documentation updates, and a NEWS item accompany this patch.
........
r50759 | georg.brandl | 2006-07-21 19:36:31 +0200 (Fri, 21 Jul 2006) | 3 lines
Fix check for empty list (vs. None).
........
r50771 | brett.cannon | 2006-07-22 00:44:07 +0200 (Sat, 22 Jul 2006) | 2 lines
Remove an XXX marker in a comment.
........
r50773 | neal.norwitz | 2006-07-22 18:20:49 +0200 (Sat, 22 Jul 2006) | 1 line
Fix more memory allocation issues found with failmalloc.
........
r50774 | neal.norwitz | 2006-07-22 19:00:57 +0200 (Sat, 22 Jul 2006) | 1 line
Don't fail if the directory already exists
........
r50775 | greg.ward | 2006-07-23 04:25:53 +0200 (Sun, 23 Jul 2006) | 6 lines
Be a lot smarter about whether this test passes: instead of assuming
that a 2.93 sec audio file will always take 3.1 sec (as it did on the
hardware I had when I first wrote the test), expect that it will take
2.93 sec +/- 10%, and only fail if it's outside of that range.
Compute the expected
........
r50776 | kurt.kaiser | 2006-07-23 06:19:49 +0200 (Sun, 23 Jul 2006) | 2 lines
Tooltips failed on new-syle class __init__ args. Bug 1027566 Loren Guthrie
........
r50777 | neal.norwitz | 2006-07-23 09:50:36 +0200 (Sun, 23 Jul 2006) | 1 line
Handle more mem alloc issues found with failmalloc
........
r50778 | neal.norwitz | 2006-07-23 09:51:58 +0200 (Sun, 23 Jul 2006) | 5 lines
If the for loop isn't entered, entryblock will be NULL. If passed
to stackdepth_walk it will be dereffed.
Not sure if I found with failmalloc or Klockwork #55.
........
r50779 | neal.norwitz | 2006-07-23 09:53:14 +0200 (Sun, 23 Jul 2006) | 4 lines
Move the initialization of size_a down below the check for a being NULL.
Reported by Klocwork #106
........
r50780 | neal.norwitz | 2006-07-23 09:55:55 +0200 (Sun, 23 Jul 2006) | 9 lines
Check the allocation of b_objects and return if there was a failure.
Also fix a few memory leaks in other failure scenarios.
It seems that if b_objects == Py_None, we will have an extra ref to
b_objects. Add XXX comment so hopefully someone documents why the
else isn't necessary or adds it in.
Reported by Klocwork #20
........
r50781 | neal.norwitz | 2006-07-23 09:57:11 +0200 (Sun, 23 Jul 2006) | 2 lines
Fix memory leaks spotted by Klocwork #37.
........
r50782 | neal.norwitz | 2006-07-23 09:59:00 +0200 (Sun, 23 Jul 2006) | 5 lines
nextlink can be NULL if teedataobject_new fails, so use XINCREF.
Ensure that dataobj is never NULL.
Reported by Klocwork #102
........
r50783 | neal.norwitz | 2006-07-23 10:01:43 +0200 (Sun, 23 Jul 2006) | 8 lines
Ensure we don't write beyond errText. I think I got this right, but
it definitely could use some review to ensure I'm not off by one
and there's no possible overflow/wrap-around of bytes_left.
Reported by Klocwork #1.
Fix a problem if there is a failure allocating self->db.
Found with failmalloc.
........
r50784 | ronald.oussoren | 2006-07-23 11:41:09 +0200 (Sun, 23 Jul 2006) | 3 lines
Without this patch CMD-W won't close EditorWindows on MacOS X. This solves
part of bug #1517990.
........
r50785 | ronald.oussoren | 2006-07-23 11:46:11 +0200 (Sun, 23 Jul 2006) | 5 lines
Fix for bug #1517996: Class and Path browsers show Tk menu
This patch replaces the menubar that is used by AquaTk for windows without a
menubar of their own by one that is more appropriate for IDLE.
........
r50786 | andrew.macintyre | 2006-07-23 14:57:02 +0200 (Sun, 23 Jul 2006) | 2 lines
Build updates for OS/2 EMX port
........
r50787 | andrew.macintyre | 2006-07-23 15:00:04 +0200 (Sun, 23 Jul 2006) | 3 lines
bugfix: PyThread_start_new_thread() returns the thread ID, not a flag;
will backport.
........
r50789 | andrew.macintyre | 2006-07-23 15:04:00 +0200 (Sun, 23 Jul 2006) | 2 lines
Get mailbox module working on OS/2 EMX port.
........
r50791 | greg.ward | 2006-07-23 18:05:51 +0200 (Sun, 23 Jul 2006) | 1 line
Resync optparse with Optik 1.5.3: minor tweaks for/to tests.
........
r50794 | martin.v.loewis | 2006-07-24 07:05:22 +0200 (Mon, 24 Jul 2006) | 2 lines
Update list of unsupported systems. Fixes #1510853.
........
r50795 | martin.v.loewis | 2006-07-24 12:26:33 +0200 (Mon, 24 Jul 2006) | 1 line
Patch #1448199: Release GIL around ConnectRegistry.
........
r50796 | martin.v.loewis | 2006-07-24 13:54:53 +0200 (Mon, 24 Jul 2006) | 3 lines
Patch #1232023: Don't include empty path component from registry,
so that the current directory does not get added to sys.path.
Also fixes #1526785.
........
r50797 | martin.v.loewis | 2006-07-24 14:54:17 +0200 (Mon, 24 Jul 2006) | 3 lines
Bug #1524310: Properly report errors from FindNextFile in os.listdir.
Will backport to 2.4.
........
r50800 | georg.brandl | 2006-07-24 15:28:57 +0200 (Mon, 24 Jul 2006) | 7 lines
Patch #1523356: fix determining include dirs in python-config.
Also don't install "python-config" when doing altinstall, but
always install "python-config2.x" and make a link to it like
with the main executable.
........
r50802 | georg.brandl | 2006-07-24 15:46:47 +0200 (Mon, 24 Jul 2006) | 3 lines
Patch #1527744: right order of includes in order to have HAVE_CONIO_H defined properly.
........
r50803 | georg.brandl | 2006-07-24 16:09:56 +0200 (Mon, 24 Jul 2006) | 3 lines
Patch #1515343: Fix printing of deprecated string exceptions with a
value in the traceback module.
........
r50804 | kurt.kaiser | 2006-07-24 19:13:23 +0200 (Mon, 24 Jul 2006) | 7 lines
EditorWindow failed when used stand-alone if sys.ps1 not set.
Bug 1010370 Dave Florek
M EditorWindow.py
M PyShell.py
M NEWS.txt
........
r50805 | kurt.kaiser | 2006-07-24 20:05:51 +0200 (Mon, 24 Jul 2006) | 6 lines
- EditorWindow.test() was failing. Bug 1417598
M EditorWindow.py
M ScriptBinding.py
M NEWS.txt
........
r50808 | georg.brandl | 2006-07-24 22:11:35 +0200 (Mon, 24 Jul 2006) | 3 lines
Repair accidental NameError.
........
r50809 | tim.peters | 2006-07-24 23:02:15 +0200 (Mon, 24 Jul 2006) | 2 lines
Whitespace normalization.
........
r50810 | greg.ward | 2006-07-25 04:11:12 +0200 (Tue, 25 Jul 2006) | 3 lines
Don't use standard assert: want tests to fail even when run with -O.
Delete cruft.
........
r50811 | tim.peters | 2006-07-25 06:07:22 +0200 (Tue, 25 Jul 2006) | 10 lines
current_frames_with_threads(): There's actually no way
to guess /which/ line the spawned thread is in at the time
sys._current_frames() is called: we know it finished
enter_g.set(), but can't know whether the instruction
counter has advanced to the following leave_g.wait().
The latter is overwhelming most likely, but not guaranteed,
and I see that the "x86 Ubuntu dapper (icc) trunk" buildbot
found it on the other line once. Changed the test so it
passes in either case.
........
r50815 | martin.v.loewis | 2006-07-25 11:53:12 +0200 (Tue, 25 Jul 2006) | 2 lines
Bug #1525817: Don't truncate short lines in IDLE's tool tips.
........
r50816 | martin.v.loewis | 2006-07-25 12:05:47 +0200 (Tue, 25 Jul 2006) | 3 lines
Bug #978833: Really close underlying socket in _socketobject.close.
Will backport to 2.4.
........
r50817 | martin.v.loewis | 2006-07-25 12:11:14 +0200 (Tue, 25 Jul 2006) | 1 line
Revert incomplete checkin.
........
r50819 | georg.brandl | 2006-07-25 12:22:34 +0200 (Tue, 25 Jul 2006) | 4 lines
Patch #1525766: correctly pass onerror arg to recursive calls
of pkg.walk_packages. Also improve the docstrings.
........
r50825 | brett.cannon | 2006-07-25 19:32:20 +0200 (Tue, 25 Jul 2006) | 2 lines
Add comment for changes to test_ossaudiodev.
........
r50826 | brett.cannon | 2006-07-25 19:34:36 +0200 (Tue, 25 Jul 2006) | 3 lines
Fix a bug in the messages for an assert failure where not enough arguments to a string
were being converted in the format.
........
r50828 | armin.rigo | 2006-07-25 20:09:57 +0200 (Tue, 25 Jul 2006) | 2 lines
Document why is and is not a good way to fix the gc_inspection crasher.
........
r50829 | armin.rigo | 2006-07-25 20:11:07 +0200 (Tue, 25 Jul 2006) | 5 lines
Added another crasher, which hit me today (I was not intentionally
writing such code, of course, but it took some gdb time to figure out
what my bug was).
........
r50830 | armin.rigo | 2006-07-25 20:38:39 +0200 (Tue, 25 Jul 2006) | 3 lines
Document the crashers that will not go away soon as "won't fix",
and explain why.
........
r50831 | ronald.oussoren | 2006-07-25 21:13:35 +0200 (Tue, 25 Jul 2006) | 3 lines
Install the compatibility symlink to libpython.a on OSX using 'ln -sf' instead
of 'ln -s', this avoid problems when reinstalling python.
........
r50832 | ronald.oussoren | 2006-07-25 21:20:54 +0200 (Tue, 25 Jul 2006) | 7 lines
Fix for bug #1525447 (renaming to MacOSmodule.c would also work, but not
without causing problems for anyone that is on a case-insensitive filesystem).
Setup.py tries to compile the MacOS extension from MacOSmodule.c, while the
actual file is named macosmodule.c. This is no problem on the (default)
case-insensitive filesystem, but doesn't work on case-sensitive filesystems.
........
r50833 | ronald.oussoren | 2006-07-25 22:28:55 +0200 (Tue, 25 Jul 2006) | 7 lines
Fix bug #1517990: IDLE keybindings on OSX
This adds a new key definition for OSX, which is slightly different from the
classic mac definition.
Also add NEWS item for a couple of bugfixes I added recently.
........
r50834 | tim.peters | 2006-07-26 00:30:24 +0200 (Wed, 26 Jul 2006) | 2 lines
Whitespace normalization.
........
r50839 | neal.norwitz | 2006-07-26 06:00:18 +0200 (Wed, 26 Jul 2006) | 1 line
Hmm, only python2.x is installed, not plain python. Did that change recently?
........
r50840 | barry.warsaw | 2006-07-26 07:54:46 +0200 (Wed, 26 Jul 2006) | 6 lines
Forward port some fixes that were in email 2.5 but for some reason didn't make
it into email 4.0. Specifically, in Message.get_content_charset(), handle RFC
2231 headers that contain an encoding not known to Python, or a character in
the data that isn't in the charset encoding. Also forward port the
appropriate unit tests.
........
r50841 | georg.brandl | 2006-07-26 09:23:32 +0200 (Wed, 26 Jul 2006) | 3 lines
NEWS entry for #1525766.
........
r50842 | georg.brandl | 2006-07-26 09:40:17 +0200 (Wed, 26 Jul 2006) | 3 lines
Bug #1459963: properly capitalize HTTP header names.
........
r50843 | georg.brandl | 2006-07-26 10:03:10 +0200 (Wed, 26 Jul 2006) | 6 lines
Part of bug #1523610: fix miscalculation of buffer length.
Also add a guard against NULL in converttuple and add a test case
(that previously would have crashed).
........
r50844 | martin.v.loewis | 2006-07-26 14:12:56 +0200 (Wed, 26 Jul 2006) | 3 lines
Bug #978833: Really close underlying socket in _socketobject.close.
Fix httplib.HTTPConnection.getresponse to not close the
socket if it is still needed for the response.
........
r50845 | andrew.kuchling | 2006-07-26 19:16:52 +0200 (Wed, 26 Jul 2006) | 1 line
[Bug #1471938] Fix build problem on Solaris 8 by conditionalizing the use of mvwgetnstr(); it was conditionalized a few lines below. Fix from Paul Eggert. I also tried out the STRICT_SYSV_CURSES case and am therefore removing the 'untested' comment.
........
r50846 | andrew.kuchling | 2006-07-26 19:18:01 +0200 (Wed, 26 Jul 2006) | 1 line
Correct error message
........
r50847 | andrew.kuchling | 2006-07-26 19:19:39 +0200 (Wed, 26 Jul 2006) | 1 line
Minor grammar fix
........
r50848 | andrew.kuchling | 2006-07-26 19:22:21 +0200 (Wed, 26 Jul 2006) | 1 line
Put news item in right section
........
r50850 | andrew.kuchling | 2006-07-26 20:03:12 +0200 (Wed, 26 Jul 2006) | 1 line
Use sys.exc_info()
........
r50851 | andrew.kuchling | 2006-07-26 20:15:45 +0200 (Wed, 26 Jul 2006) | 1 line
Use sys.exc_info()
........
r50852 | phillip.eby | 2006-07-26 21:48:27 +0200 (Wed, 26 Jul 2006) | 4 lines
Allow the 'onerror' argument to walk_packages() to catch any Exception, not
just ImportError. This allows documentation tools to better skip unimportable
packages.
........
r50854 | tim.peters | 2006-07-27 01:23:15 +0200 (Thu, 27 Jul 2006) | 2 lines
Whitespace normalization.
........
r50855 | tim.peters | 2006-07-27 03:14:53 +0200 (Thu, 27 Jul 2006) | 21 lines
Bug #1521947: possible bug in mystrtol.c with recent gcc.
In general, C doesn't define anything about what happens when
an operation on a signed integral type overflows, and PyOS_strtol()
did several formally undefined things of that nature on signed
longs. Some version of gcc apparently tries to exploit that now,
and PyOS_strtol() could fail to detect overflow then.
Tried to repair all that, although it seems at least as likely to me
that we'll get screwed by bad platform definitions for LONG_MIN
and/or LONG_MAX now. For that reason, I don't recommend backporting
this.
Note that I have no box on which this makes a lick of difference --
can't really test it, except to note that it didn't break anything
on my boxes.
Silent change: PyOS_strtol() used to return the hard-coded 0x7fffffff
in case of overflow. Now it returns LONG_MAX. They're the same only on
32-bit boxes (although C doesn't guarantee that either ...).
........
r50856 | neal.norwitz | 2006-07-27 05:51:58 +0200 (Thu, 27 Jul 2006) | 6 lines
Don't kill a normal instance of python running on windows when checking
to kill a cygwin instance. build\\python.exe was matching a normal windows
instance. Prefix that with a \\ to ensure build is a directory and not
PCbuild. As discussed on python-dev.
........
r50857 | neal.norwitz | 2006-07-27 05:55:39 +0200 (Thu, 27 Jul 2006) | 5 lines
Closure can't be NULL at this point since we know it's a tuple.
Reported by Klocwork # 74.
........
r50858 | neal.norwitz | 2006-07-27 06:04:50 +0200 (Thu, 27 Jul 2006) | 1 line
No functional change. Add comment and assert to describe why there cannot be overflow which was reported by Klocwork. Discussed on python-dev
........
r50859 | martin.v.loewis | 2006-07-27 08:38:16 +0200 (Thu, 27 Jul 2006) | 3 lines
Bump distutils version to 2.5, as several new features
have been introduced since 2.4.
........
r50860 | andrew.kuchling | 2006-07-27 14:18:20 +0200 (Thu, 27 Jul 2006) | 1 line
Reformat docstring; fix typo
........
r50861 | georg.brandl | 2006-07-27 17:05:36 +0200 (Thu, 27 Jul 2006) | 6 lines
Add test_main() methods. These three tests were never run
by regrtest.py.
We really need a simpler testing framework.
........
r50862 | tim.peters | 2006-07-27 17:09:20 +0200 (Thu, 27 Jul 2006) | 2 lines
News for patch #1529686.
........
r50863 | tim.peters | 2006-07-27 17:11:00 +0200 (Thu, 27 Jul 2006) | 2 lines
Whitespace normalization.
........
r50864 | georg.brandl | 2006-07-27 17:38:33 +0200 (Thu, 27 Jul 2006) | 3 lines
Amend news entry.
........
r50865 | georg.brandl | 2006-07-27 18:08:15 +0200 (Thu, 27 Jul 2006) | 3 lines
Make uuid test suite pass on this box by requesting output with LC_ALL=C.
........
r50866 | andrew.kuchling | 2006-07-27 20:37:33 +0200 (Thu, 27 Jul 2006) | 1 line
Add example
........
r50867 | thomas.heller | 2006-07-27 20:39:55 +0200 (Thu, 27 Jul 2006) | 9 lines
Remove code that is no longer used (ctypes.com).
Fix the DllGetClassObject and DllCanUnloadNow so that they forward the
call to the comtypes.server.inprocserver module.
The latter was never documented, never used by published code, and
didn't work anyway, so I think it does not deserve a NEWS entry (but I
might be wrong).
........
r50868 | andrew.kuchling | 2006-07-27 20:41:21 +0200 (Thu, 27 Jul 2006) | 1 line
Typo fix ('publically' is rare, poss. non-standard)
........
r50869 | andrew.kuchling | 2006-07-27 20:42:41 +0200 (Thu, 27 Jul 2006) | 1 line
Add missing word
........
r50870 | andrew.kuchling | 2006-07-27 20:44:10 +0200 (Thu, 27 Jul 2006) | 1 line
Repair typos
........
r50872 | andrew.kuchling | 2006-07-27 20:53:33 +0200 (Thu, 27 Jul 2006) | 1 line
Update URL; add example
........
r50873 | andrew.kuchling | 2006-07-27 21:07:29 +0200 (Thu, 27 Jul 2006) | 1 line
Add punctuation mark; add some examples
........
r50874 | andrew.kuchling | 2006-07-27 21:11:07 +0200 (Thu, 27 Jul 2006) | 1 line
Mention base64 module; rewrite last sentence to be more positive
........
r50875 | andrew.kuchling | 2006-07-27 21:12:49 +0200 (Thu, 27 Jul 2006) | 1 line
If binhex is higher-level than binascii, it should come first in the chapter
........
r50876 | tim.peters | 2006-07-27 22:47:24 +0200 (Thu, 27 Jul 2006) | 28 lines
check_node(): stop spraying mystery output to stderr.
When a node number disagrees, keep track of all sources & the
node numbers they reported, and stick all that in the error message.
Changed all callers to supply a non-empty "source" argument; made
the "source" argument non-optional.
On my box, test_uuid still fails, but with the less confusing output:
AssertionError: different sources disagree on node:
from source 'getnode1', node was 00038a000015
from source 'getnode2', node was 00038a000015
from source 'ipconfig', node was 001111b2b7bf
Only the last one appears to be correct; e.g.,
C:\Code\python\PCbuild>getmac
Physical Address Transport Name
=================== ==========================================================
00-11-11-B2-B7-BF \Device\Tcpip_{190FB163-5AFD-4483-86A1-2FE16AC61FF1}
62-A1-AC-6C-FD-BE \Device\Tcpip_{8F77DF5A-EA3D-4F1D-975E-D472CEE6438A}
E2-1F-01-C6-5D-88 \Device\Tcpip_{CD18F76B-2EF3-409F-9B8A-6481EE70A1E4}
I can't find anything on my box with MAC 00-03-8a-00-00-15, and am
not clear on where that comes from.
........
r50878 | andrew.kuchling | 2006-07-28 00:40:05 +0200 (Fri, 28 Jul 2006) | 1 line
Reword paragraph
........
r50879 | andrew.kuchling | 2006-07-28 00:49:38 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50880 | andrew.kuchling | 2006-07-28 00:49:54 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50881 | barry.warsaw | 2006-07-28 01:43:15 +0200 (Fri, 28 Jul 2006) | 27 lines
Patch #1520294: Support for getset and member descriptors in types.py,
inspect.py, and pydoc.py. Specifically, this allows for querying the type of
an object against these built-in C types and more importantly, for getting
their docstrings printed in the interactive interpreter's help() function.
This patch includes a new built-in module called _types which provides
definitions of getset and member descriptors for use by the types.py module.
These types are exposed as types.GetSetDescriptorType and
types.MemberDescriptorType. Query functions are provided as
inspect.isgetsetdescriptor() and inspect.ismemberdescriptor(). The
implementations of these are robust enough to work with Python implementations
other than CPython, which may not have these fundamental types.
The patch also includes documentation and test suite updates.
I commit these changes now under these guiding principles:
1. Silence is assent. The release manager has not said "no", and of the few
people that cared enough to respond to the thread, the worst vote was "0".
2. It's easier to ask for forgiveness than permission.
3. It's so dang easy to revert stuff in svn, that you could view this as a
forcing function. :)
Windows build patches will follow.
........
r50882 | tim.peters | 2006-07-28 01:44:37 +0200 (Fri, 28 Jul 2006) | 4 lines
Bug #1529297: The rewrite of doctest for Python 2.4 unintentionally
lost that tests are sorted by name before being run. ``DocTestFinder``
has been changed to sort the list of tests it returns.
........
r50883 | tim.peters | 2006-07-28 01:45:48 +0200 (Fri, 28 Jul 2006) | 2 lines
Whitespace normalization.
........
r50884 | tim.peters | 2006-07-28 01:46:36 +0200 (Fri, 28 Jul 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r50885 | barry.warsaw | 2006-07-28 01:50:40 +0200 (Fri, 28 Jul 2006) | 4 lines
Enable the building of the _types module on Windows.
Note that this has only been tested for VS 2003 since that's all I have.
........
r50887 | tim.peters | 2006-07-28 02:23:15 +0200 (Fri, 28 Jul 2006) | 7 lines
defdict_reduce(): Plug leaks.
We didn't notice these before because test_defaultdict didn't
actually do anything before Georg fixed that earlier today.
Neal's next refleak run then showed test_defaultdict leaking
9 references on each run. That's repaired by this checkin.
........
r50888 | tim.peters | 2006-07-28 02:30:00 +0200 (Fri, 28 Jul 2006) | 2 lines
News about the repaired memory leak in defaultdict.
........
r50889 | gregory.p.smith | 2006-07-28 03:35:25 +0200 (Fri, 28 Jul 2006) | 7 lines
- pybsddb Bug #1527939: bsddb module DBEnv dbremove and dbrename
methods now allow their database parameter to be None as the
sleepycat API allows.
Also adds an appropriate test case for DBEnv.dbrename and dbremove.
........
r50895 | neal.norwitz | 2006-07-28 06:22:34 +0200 (Fri, 28 Jul 2006) | 1 line
Ensure the actual number matches the expected count
........
r50896 | tim.peters | 2006-07-28 06:51:59 +0200 (Fri, 28 Jul 2006) | 6 lines
Live with that "the hardware address" is an ill-defined
concept, and that different ways of trying to find "the
hardware address" may return different results. Certainly
true on both of my Windows boxes, and in different ways
(see whining on python-dev).
........
r50897 | neal.norwitz | 2006-07-28 09:21:27 +0200 (Fri, 28 Jul 2006) | 3 lines
Try to find the MAC addr on various flavours of Unix. This seems hopeless.
The reduces the test_uuid failures, but there's still another method failing.
........
r50898 | martin.v.loewis | 2006-07-28 09:45:49 +0200 (Fri, 28 Jul 2006) | 2 lines
Add UUID for upcoming 2.5b3.
........
r50899 | matt.fleming | 2006-07-28 13:27:27 +0200 (Fri, 28 Jul 2006) | 3 lines
Allow socketmodule to compile on NetBSD -current, whose bluetooth API
differs from both Linux and FreeBSD. Accepted by Neal Norwitz.
........
r50900 | andrew.kuchling | 2006-07-28 14:07:12 +0200 (Fri, 28 Jul 2006) | 1 line
[Patch #1529811] Correction to description of r|* mode
........
r50901 | andrew.kuchling | 2006-07-28 14:18:22 +0200 (Fri, 28 Jul 2006) | 1 line
Typo fix
........
r50902 | andrew.kuchling | 2006-07-28 14:32:43 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50903 | andrew.kuchling | 2006-07-28 14:33:19 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50904 | andrew.kuchling | 2006-07-28 14:45:55 +0200 (Fri, 28 Jul 2006) | 1 line
Don't overwrite built-in name; add some blank lines for readability
........
r50905 | andrew.kuchling | 2006-07-28 14:48:07 +0200 (Fri, 28 Jul 2006) | 1 line
Add example. Should I propagate this example to all the other DBM-ish modules, too?
........
r50912 | georg.brandl | 2006-07-28 20:31:39 +0200 (Fri, 28 Jul 2006) | 3 lines
Patch #1529686: also run test_email_codecs with regrtest.py.
........
r50913 | georg.brandl | 2006-07-28 20:36:01 +0200 (Fri, 28 Jul 2006) | 3 lines
Fix spelling.
........
r50915 | thomas.heller | 2006-07-28 21:42:40 +0200 (Fri, 28 Jul 2006) | 3 lines
Remove a useless XXX comment.
Cosmetic changes to the code so that the #ifdef _UNICODE block
doesn't mess emacs code formatting.
........
r50916 | phillip.eby | 2006-07-28 23:12:07 +0200 (Fri, 28 Jul 2006) | 5 lines
Bug #1529871: The speed enhancement patch #921466 broke Python's compliance
with PEP 302. This was fixed by adding an ``imp.NullImporter`` type that is
used in ``sys.path_importer_cache`` to cache non-directory paths and avoid
excessive filesystem operations during imports.
........
r50917 | phillip.eby | 2006-07-28 23:31:54 +0200 (Fri, 28 Jul 2006) | 2 lines
Fix svn merge spew.
........
r50918 | thomas.heller | 2006-07-28 23:43:20 +0200 (Fri, 28 Jul 2006) | 4 lines
Patch #1529514: More openbsd platforms for ctypes.
Regenerated Modules/_ctypes/libffi/configure with autoconf 2.59.
Approved by Neal.
........
r50922 | georg.brandl | 2006-07-29 10:51:21 +0200 (Sat, 29 Jul 2006) | 2 lines
Bug #835255: The "closure" argument to new.function() is now documented.
........
r50924 | georg.brandl | 2006-07-29 11:33:26 +0200 (Sat, 29 Jul 2006) | 3 lines
Bug #1441397: The compiler module now recognizes module and function
docstrings correctly as it did in Python 2.4.
........
r50925 | georg.brandl | 2006-07-29 12:25:46 +0200 (Sat, 29 Jul 2006) | 4 lines
Revert rev 42617, it was introduced to work around bug #1441397.
test_compiler now passes again.
........
r50926 | fred.drake | 2006-07-29 15:22:49 +0200 (Sat, 29 Jul 2006) | 1 line
update target version number
........
r50927 | andrew.kuchling | 2006-07-29 15:56:48 +0200 (Sat, 29 Jul 2006) | 1 line
Add example
........
r50928 | andrew.kuchling | 2006-07-29 16:04:47 +0200 (Sat, 29 Jul 2006) | 1 line
Update URL
........
r50930 | andrew.kuchling | 2006-07-29 16:08:15 +0200 (Sat, 29 Jul 2006) | 1 line
Reword paragraph to match the order of the subsequent sections
........
r50931 | andrew.kuchling | 2006-07-29 16:21:15 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1529157] Mention raw_input() and input(); while I'm at it, reword the description a bit
........
r50932 | andrew.kuchling | 2006-07-29 16:42:48 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1519571] Document some missing functions: setup(), title(), done()
........
r50933 | andrew.kuchling | 2006-07-29 16:43:55 +0200 (Sat, 29 Jul 2006) | 1 line
Fix docstring punctuation
........
r50934 | andrew.kuchling | 2006-07-29 17:10:32 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1414697] Change docstring of set/frozenset types to specify that the contents are unique. Raymond, please feel free to edit or revert.
........
r50935 | andrew.kuchling | 2006-07-29 17:35:21 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1530382] Document SSL.server(), .issuer() methods
........
r50936 | andrew.kuchling | 2006-07-29 17:42:46 +0200 (Sat, 29 Jul 2006) | 1 line
Typo fix
........
r50937 | andrew.kuchling | 2006-07-29 17:43:13 +0200 (Sat, 29 Jul 2006) | 1 line
Tweak wording
........
r50938 | matt.fleming | 2006-07-29 17:55:30 +0200 (Sat, 29 Jul 2006) | 2 lines
Fix typo
........
r50939 | andrew.kuchling | 2006-07-29 17:57:08 +0200 (Sat, 29 Jul 2006) | 6 lines
[Bug #1528258] Mention that the 'data' argument can be None.
The constructor docs referred the reader to the add_data() method's docs,
but they weren't very helpful. I've simply copied an earlier explanation
of 'data' that's more useful.
........
r50940 | andrew.kuchling | 2006-07-29 18:08:40 +0200 (Sat, 29 Jul 2006) | 1 line
Set bug/patch count. Take a bow, everyone!
........
r50941 | fred.drake | 2006-07-29 18:56:15 +0200 (Sat, 29 Jul 2006) | 18 lines
expunge the xmlcore changes:
41667, 41668 - initial switch to xmlcore
47044 - mention of xmlcore in What's New
50687 - mention of xmlcore in the library reference
re-apply xmlcore changes to xml:
41674 - line ending changes (re-applied manually), directory props
41677 - add cElementTree wrapper
41678 - PSF licensing for etree
41812 - whitespace normalization
42724 - fix svn:eol-style settings
43681, 43682 - remove Python version-compatibility cruft from minidom
46773 - fix encoding of \r\n\t in attr values in saxutils
47269 - added XMLParser alias for cElementTree compatibility
additional tests were added in Lib/test/test_sax.py that failed with
the xmlcore changes; these relate to SF bugs #1511497, #1513611
........
r50942 | andrew.kuchling | 2006-07-29 20:14:07 +0200 (Sat, 29 Jul 2006) | 17 lines
Reorganize the docs for 'file' and 'open()' after some discussion with Fred.
We want to encourage users to write open() when opening a file, but
open() was described with a single paragraph and
'file' had lots of explanation of the mode and bufsize arguments.
I've shrunk the description of 'file' to cross-reference to the 'File
objects' section, and to open() for an explanation of the arguments.
open() now has all the paragraphs about the mode string. The bufsize
argument was moved up so that it isn't buried at the end; now there's
1 paragraph on mode, 1 on bufsize, and then 3 more on mode. Various
other edits and rearrangements were made in the process.
It's probably best to read the final text and not to try to make sense
of the diffs.
........
r50943 | fred.drake | 2006-07-29 20:19:19 +0200 (Sat, 29 Jul 2006) | 1 line
restore test un-intentionally removed in the xmlcore purge (revision 50941)
........
r50944 | fred.drake | 2006-07-29 20:33:29 +0200 (Sat, 29 Jul 2006) | 3 lines
make the reference to older versions of the documentation a link
to the right page on python.org
........
r50945 | fred.drake | 2006-07-29 21:09:01 +0200 (Sat, 29 Jul 2006) | 1 line
document the footnote usage pattern
........
r50947 | fred.drake | 2006-07-29 21:14:10 +0200 (Sat, 29 Jul 2006) | 1 line
emphasize and oddball nuance of LaTeX comment syntax
........
r50948 | andrew.kuchling | 2006-07-29 21:24:04 +0200 (Sat, 29 Jul 2006) | 1 line
[Patch #1490989 from Skip Montanaro] Mention debugging builds in the API documentation. I've changed Skip's patch to point to Misc/SpecialBuilds and fiddled with the markup a bit.
........
r50949 | neal.norwitz | 2006-07-29 21:29:35 +0200 (Sat, 29 Jul 2006) | 6 lines
Disable these tests until they are reliable across platforms.
These problems may mask more important, real problems.
One or both methods are known to fail on: Solaris, OpenBSD, Debian, Ubuntu.
They pass on Windows and some Linux boxes.
........
r50950 | andrew.kuchling | 2006-07-29 21:50:37 +0200 (Sat, 29 Jul 2006) | 1 line
[Patch #1068277] Clarify that os.path.exists() can return False depending on permissions. Fred approved committing this patch in December 2004!
........
r50952 | fred.drake | 2006-07-29 22:04:42 +0200 (Sat, 29 Jul 2006) | 6 lines
SF bug #1193966: Weakref types documentation misplaced
The information about supporting weakrefs with types defined in C extensions
is moved to the Extending & Embedding manual. Py_TPFLAGS_HAVE_WEAKREFS is
no longer mentioned since it is part of Py_TPFLAGS_DEFAULT.
........
r50953 | skip.montanaro | 2006-07-29 22:06:05 +0200 (Sat, 29 Jul 2006) | 4 lines
Add a comment to the csv reader documentation that explains why the
treatment of newlines changed in 2.5. Pulled almost verbatim from a comment
by Andrew McNamara in <http://python.org/sf/1465014>.
........
r50954 | neal.norwitz | 2006-07-29 22:20:52 +0200 (Sat, 29 Jul 2006) | 3 lines
If the executable doesn't exist, there's no reason to try to start it.
This prevents garbage about command not found being printed on Solaris.
........
r50955 | fred.drake | 2006-07-29 22:21:25 +0200 (Sat, 29 Jul 2006) | 1 line
fix minor markup error that introduced extra punctuation
........
r50957 | neal.norwitz | 2006-07-29 22:37:08 +0200 (Sat, 29 Jul 2006) | 3 lines
Disable test_getnode too, since this is also unreliable.
........
r50958 | andrew.kuchling | 2006-07-29 23:27:12 +0200 (Sat, 29 Jul 2006) | 1 line
Follow TeX's conventions for hyphens
........
r50959 | andrew.kuchling | 2006-07-29 23:30:21 +0200 (Sat, 29 Jul 2006) | 1 line
Fix case for 'Unix'
........
r50960 | fred.drake | 2006-07-30 01:34:57 +0200 (Sun, 30 Jul 2006) | 1 line
markup cleanups
........
r50961 | andrew.kuchling | 2006-07-30 02:27:34 +0200 (Sun, 30 Jul 2006) | 1 line
Minor typo fixes
........
r50962 | andrew.kuchling | 2006-07-30 02:37:56 +0200 (Sun, 30 Jul 2006) | 1 line
[Bug #793553] Correct description of keyword arguments for SSL authentication
........
r50963 | tim.peters | 2006-07-30 02:58:15 +0200 (Sun, 30 Jul 2006) | 2 lines
Whitespace normalization.
........
r50964 | fred.drake | 2006-07-30 05:03:43 +0200 (Sun, 30 Jul 2006) | 1 line
lots of markup nits, most commonly Unix/unix --> \UNIX
........
r50965 | fred.drake | 2006-07-30 07:41:28 +0200 (Sun, 30 Jul 2006) | 1 line
update information on wxPython, from Robin Dunn
........
r50966 | fred.drake | 2006-07-30 07:49:49 +0200 (Sun, 30 Jul 2006) | 4 lines
remove possibly-outdated comment on what GUI toolkit is most commonly used;
it is hard to know whether this is right, and it does not add valuable reference information
at any rate
........
r50967 | fred.drake | 2006-07-30 07:55:39 +0200 (Sun, 30 Jul 2006) | 3 lines
- remove yet another reference to how commonly Tkinter is (thought to be) used
- fix an internal section reference
........
r50968 | neal.norwitz | 2006-07-30 08:53:31 +0200 (Sun, 30 Jul 2006) | 4 lines
Patch #1531113: Fix augmented assignment with yield expressions.
Also fix a SystemError when trying to assign to yield expressions.
........
r50969 | neal.norwitz | 2006-07-30 08:55:48 +0200 (Sun, 30 Jul 2006) | 5 lines
Add PyErr_WarnEx() so C code can pass the stacklevel to warnings.warn().
This provides the proper warning for struct.pack().
PyErr_Warn() is now deprecated in favor of PyErr_WarnEx().
As mentioned by Tim Peters on python-dev.
........
r50970 | neal.norwitz | 2006-07-30 08:57:04 +0200 (Sun, 30 Jul 2006) | 3 lines
Bug #1515471: string.replace() accepts character buffers again.
Pass the char* and size around rather than PyObject's.
........
r50971 | neal.norwitz | 2006-07-30 08:59:13 +0200 (Sun, 30 Jul 2006) | 1 line
Whitespace normalization
........
r50973 | georg.brandl | 2006-07-30 12:53:32 +0200 (Sun, 30 Jul 2006) | 3 lines
Clarify that __op__ methods must return NotImplemented if they don't support the operation.
........
r50974 | georg.brandl | 2006-07-30 13:07:23 +0200 (Sun, 30 Jul 2006) | 3 lines
Bug #1002398: The documentation for os.path.sameopenfile now correctly
refers to file descriptors, not file objects.
........
r50977 | martin.v.loewis | 2006-07-30 15:00:31 +0200 (Sun, 30 Jul 2006) | 3 lines
Don't copy directory stat times in shutil.copytree on Windows
Fixes #1525866.
........
r50978 | martin.v.loewis | 2006-07-30 15:14:05 +0200 (Sun, 30 Jul 2006) | 3 lines
Base __version__ on sys.version_info, as distutils is
no longer maintained separatedly.
........
r50979 | martin.v.loewis | 2006-07-30 15:27:31 +0200 (Sun, 30 Jul 2006) | 3 lines
Mention Cygwin in distutils error message about a missing VS 2003.
Fixes #1257728.
........
r50982 | martin.v.loewis | 2006-07-30 16:09:47 +0200 (Sun, 30 Jul 2006) | 5 lines
Drop usage of test -e in configure as it is not portable.
Fixes #1439538
Will backport to 2.4
Also regenerate pyconfig.h.in.
........
r50984 | georg.brandl | 2006-07-30 18:20:10 +0200 (Sun, 30 Jul 2006) | 3 lines
Fix makefile changes for python-config.
........
r50985 | george.yoshida | 2006-07-30 18:37:37 +0200 (Sun, 30 Jul 2006) | 2 lines
Rename struct.pack_to to struct.pack_into as changed in revision 46642.
........
r50986 | george.yoshida | 2006-07-30 18:41:30 +0200 (Sun, 30 Jul 2006) | 2 lines
Typo fix
........
r50987 | neal.norwitz | 2006-07-30 21:18:13 +0200 (Sun, 30 Jul 2006) | 1 line
Add some asserts and update comments
........
r50988 | neal.norwitz | 2006-07-30 21:18:38 +0200 (Sun, 30 Jul 2006) | 1 line
Verify that the signal handlers were really called
........
r50989 | neal.norwitz | 2006-07-30 21:20:42 +0200 (Sun, 30 Jul 2006) | 3 lines
Try to prevent hangs on Tru64/Alpha buildbot. I'm not certain this will help
and may need to be reverted if it causes problems.
........
r50990 | georg.brandl | 2006-07-30 22:18:51 +0200 (Sun, 30 Jul 2006) | 2 lines
Bug #1531349: right <-> left glitch in __rop__ description.
........
r50992 | tim.peters | 2006-07-31 03:46:03 +0200 (Mon, 31 Jul 2006) | 2 lines
Whitespace normalization.
........
r50993 | andrew.mcnamara | 2006-07-31 04:27:48 +0200 (Mon, 31 Jul 2006) | 2 lines
Redo the comment about the 2.5 change in quoted-newline handling.
........
r50994 | tim.peters | 2006-07-31 04:40:23 +0200 (Mon, 31 Jul 2006) | 10 lines
ZipFile.close(): Killed one of the struct.pack deprecation
warnings on Win32.
Also added an XXX about the line:
pos3 = self.fp.tell()
`pos3` is never referenced, and I have no idea what the code
intended to do instead.
........
r50996 | tim.peters | 2006-07-31 04:53:03 +0200 (Mon, 31 Jul 2006) | 8 lines
ZipFile.close(): Kill the other struct.pack deprecation
warning on Windows.
Afraid I can't detect a pattern to when the pack formats decide
to use a signed or unsigned format code -- appears nearly
arbitrary to my eyes. So I left all the pack formats alone and
changed the special-case data values instead.
........
r50997 | skip.montanaro | 2006-07-31 05:09:45 +0200 (Mon, 31 Jul 2006) | 1 line
minor tweaks
........
r50998 | skip.montanaro | 2006-07-31 05:11:11 +0200 (Mon, 31 Jul 2006) | 1 line
minor tweaks
........
r50999 | andrew.kuchling | 2006-07-31 14:20:24 +0200 (Mon, 31 Jul 2006) | 1 line
Add refcounts for PyErr_WarnEx
........
r51000 | andrew.kuchling | 2006-07-31 14:39:05 +0200 (Mon, 31 Jul 2006) | 9 lines
Document PyErr_WarnEx. (Bad Neal! No biscuit!)
Is the explanation of the 'stacklevel' parameter clear? Please feel free
to edit it.
I don't have LaTeX installed on this machine, so haven't verified that the
markup is correct. Will check tonight, or maybe the automatic doc build will
tell me.
........
r51001 | andrew.kuchling | 2006-07-31 14:52:26 +0200 (Mon, 31 Jul 2006) | 1 line
Add PyErr_WarnEx()
........
r51002 | andrew.kuchling | 2006-07-31 15:18:27 +0200 (Mon, 31 Jul 2006) | 1 line
Mention csv newline changes
........
r51003 | andrew.kuchling | 2006-07-31 17:22:58 +0200 (Mon, 31 Jul 2006) | 1 line
Typo fix
........
r51004 | andrew.kuchling | 2006-07-31 17:23:43 +0200 (Mon, 31 Jul 2006) | 1 line
Remove reference to notation
........
r51005 | georg.brandl | 2006-07-31 18:00:34 +0200 (Mon, 31 Jul 2006) | 3 lines
Fix function name.
........
r51006 | andrew.kuchling | 2006-07-31 18:10:24 +0200 (Mon, 31 Jul 2006) | 1 line
[Bug #1514540] Instead of putting the standard types in a section, put them in a chapter of their own. This means string methods will now show up in the ToC. (Should the types come before or after the functions+exceptions+constants chapter? I've put them after, for now.)
........
r51007 | andrew.kuchling | 2006-07-31 18:22:05 +0200 (Mon, 31 Jul 2006) | 1 line
[Bug #848556] Remove \d* from second alternative to avoid exponential case when repeating match
........
r51008 | andrew.kuchling | 2006-07-31 18:27:57 +0200 (Mon, 31 Jul 2006) | 1 line
Update list of files; fix a typo
........
r51013 | andrew.kuchling | 2006-08-01 18:24:30 +0200 (Tue, 01 Aug 2006) | 1 line
typo fix
........
r51018 | thomas.heller | 2006-08-01 18:54:43 +0200 (Tue, 01 Aug 2006) | 2 lines
Fix a potential segfault and various potentail refcount leaks
in the cast() function.
........
r51020 | thomas.heller | 2006-08-01 19:46:10 +0200 (Tue, 01 Aug 2006) | 1 line
Minimal useful docstring for CopyComPointer.
........
r51021 | andrew.kuchling | 2006-08-01 20:16:15 +0200 (Tue, 01 Aug 2006) | 8 lines
[Patch #1520905] Attempt to suppress core file created by test_subprocess.py.
Patch by Douglas Greiman.
The test_run_abort() testcase produces a core file on Unix systems,
even though the test is successful. This can be confusing or alarming
to someone who runs 'make test' and then finds that the Python
interpreter apparently crashed.
........
r51023 | georg.brandl | 2006-08-01 20:49:24 +0200 (Tue, 01 Aug 2006) | 3 lines
os.urandom no longer masks unrelated exceptions like SystemExit or
KeyboardInterrupt.
........
r51025 | thomas.heller | 2006-08-01 21:14:15 +0200 (Tue, 01 Aug 2006) | 2 lines
Speed up PyType_stgdict and PyObject_stgdict.
........
r51027 | ronald.oussoren | 2006-08-01 22:30:31 +0200 (Tue, 01 Aug 2006) | 3 lines
Make sure the postinstall action that optionally updates the user's profile
on MacOS X actually works correctly in all cases.
........
r51028 | ronald.oussoren | 2006-08-01 23:00:57 +0200 (Tue, 01 Aug 2006) | 4 lines
This fixes bug #1527397: PythonLauncher runs scripts with the wrong working
directory. It also fixes a bug where PythonLauncher failed to launch scripts
when the scriptname (or the path to the script) contains quotes.
........
r51031 | tim.peters | 2006-08-02 05:27:46 +0200 (Wed, 02 Aug 2006) | 2 lines
Whitespace normalization.
........
r51032 | tim.peters | 2006-08-02 06:12:36 +0200 (Wed, 02 Aug 2006) | 19 lines
Try to squash struct.pack warnings on the "amd64 gentoo trunk"
buildbot (& possibly other 64-bit boxes) during test_gzip.
The native zlib crc32 function returns an unsigned 32-bit integer,
which the Python wrapper implicitly casts to C long. Therefore the
same crc can "look negative" on a 32-bit box but "look positive" on
a 64-bit box. This patch papers over that platform difference when
writing the crc to file.
It may be better to change the Python wrapper, either to make
the result "look positive" on all platforms (which means it may
have to return a Python long at times on a 32-bit box), or to
keep the sign the same across boxes. But that would be a visible
change in what users see, while the current hack changes no
visible behavior (well, apart from stopping the struct deprecation
warning).
Note that the module-level write32() function is no longer used.
........
r51033 | neal.norwitz | 2006-08-02 06:27:11 +0200 (Wed, 02 Aug 2006) | 4 lines
Prevent memory leak on error.
Reported by Klocwork #36
........
r51034 | tim.peters | 2006-08-02 07:20:08 +0200 (Wed, 02 Aug 2006) | 9 lines
_Stream.close(): Try to kill struct.pack() warnings when
writing the crc to file on the "PPC64 Debian trunk" buildbot
when running test_tarfile.
This is again a case where the native zlib crc is an unsigned
32-bit int, but the Python wrapper implicitly casts it to
signed C long, so that "the sign bit looks different" on
different platforms.
........
r51035 | ronald.oussoren | 2006-08-02 08:10:10 +0200 (Wed, 02 Aug 2006) | 2 lines
Updated documentation for the script that builds the OSX installer.
........
r51036 | neal.norwitz | 2006-08-02 08:14:22 +0200 (Wed, 02 Aug 2006) | 2 lines
_PyWeakref_GetWeakrefCount() now returns a Py_ssize_t instead of long.
........
r51037 | neal.norwitz | 2006-08-02 08:15:10 +0200 (Wed, 02 Aug 2006) | 1 line
v is already checked for NULL, so just DECREF it
........
r51038 | neal.norwitz | 2006-08-02 08:19:19 +0200 (Wed, 02 Aug 2006) | 1 line
Let us know when there was a problem and the child had to kill the parent
........
r51039 | neal.norwitz | 2006-08-02 08:46:21 +0200 (Wed, 02 Aug 2006) | 5 lines
Patch #1519025 and bug #926423: If a KeyboardInterrupt occurs during
a socket operation on a socket with a timeout, the exception will be
caught correctly. Previously, the exception was not caught.
........
r51040 | neal.norwitz | 2006-08-02 09:09:32 +0200 (Wed, 02 Aug 2006) | 1 line
Add some explanation about Klocwork and Coverity static analysis
........
r51041 | anthony.baxter | 2006-08-02 09:43:09 +0200 (Wed, 02 Aug 2006) | 1 line
pre-release machinations
........
r51043 | thomas.heller | 2006-08-02 13:35:31 +0200 (Wed, 02 Aug 2006) | 4 lines
A few nore words about what ctypes does.
Document that using the wrong calling convention can also raise
'ValueError: Procedure called with the wrong number of arguments'.
........
r51045 | thomas.heller | 2006-08-02 14:00:13 +0200 (Wed, 02 Aug 2006) | 1 line
Fix a mistake.
........
r51046 | martin.v.loewis | 2006-08-02 15:53:55 +0200 (Wed, 02 Aug 2006) | 3 lines
Correction of patch #1455898: In the mbcs decoder, set final=False
for stream decoder, but final=True for the decode function.
........
r51049 | tim.peters | 2006-08-02 20:19:35 +0200 (Wed, 02 Aug 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r51079 | neal.norwitz | 2006-08-04 06:50:21 +0200 (Fri, 04 Aug 2006) | 3 lines
Bug #1531405, format_exception no longer raises an exception if
str(exception) raised an exception.
........
r51080 | neal.norwitz | 2006-08-04 06:58:47 +0200 (Fri, 04 Aug 2006) | 11 lines
Bug #1191458: tracing over for loops now produces a line event
on each iteration. I'm not positive this is the best way to handle
this. I'm also not sure that there aren't other cases where
the lnotab is generated incorrectly. It would be great if people
that use pdb or tracing could test heavily.
Also:
* Remove dead/duplicated code that wasn't used/necessary
because we already handled the docstring prior to entering the loop.
* add some debugging code into the compiler (#if 0'd out).
........
r51081 | neal.norwitz | 2006-08-04 07:09:28 +0200 (Fri, 04 Aug 2006) | 4 lines
Bug #1333982: string/number constants were inappropriately stored
in the byte code and co_consts even if they were not used, ie
immediately popped off the stack.
........
r51082 | neal.norwitz | 2006-08-04 07:12:19 +0200 (Fri, 04 Aug 2006) | 1 line
There were really two issues
........
r51084 | fred.drake | 2006-08-04 07:17:21 +0200 (Fri, 04 Aug 2006) | 1 line
SF patch #1534048 (bug #1531003): fix typo in error message
........
r51085 | gregory.p.smith | 2006-08-04 07:17:47 +0200 (Fri, 04 Aug 2006) | 3 lines
fix typos
........
r51087 | georg.brandl | 2006-08-04 08:03:53 +0200 (Fri, 04 Aug 2006) | 3 lines
Fix bug caused by first decrefing, then increfing.
........
r51109 | neil.schemenauer | 2006-08-04 18:20:30 +0200 (Fri, 04 Aug 2006) | 5 lines
Fix the 'compiler' package to generate correct code for MAKE_CLOSURE.
In the 2.5 development cycle, MAKE_CLOSURE as changed to take free
variables as a tuple rather than as individual items on the stack.
Closes patch #1534084.
........
r51110 | georg.brandl | 2006-08-04 20:03:37 +0200 (Fri, 04 Aug 2006) | 3 lines
Change fix for segfaulting property(), add a NEWS entry and a test.
........
r51111 | georg.brandl | 2006-08-04 20:07:34 +0200 (Fri, 04 Aug 2006) | 3 lines
Better fix for bug #1531405, not executing str(value) twice.
........
r51112 | thomas.heller | 2006-08-04 20:17:40 +0200 (Fri, 04 Aug 2006) | 1 line
On Windows, make PyErr_Warn an exported function again.
........
r51113 | thomas.heller | 2006-08-04 20:57:34 +0200 (Fri, 04 Aug 2006) | 4 lines
Fix #1530448 - fix ctypes build failure on solaris 10.
The '-mimpure-text' linker flag is required when linking _ctypes.so.
........
r51114 | thomas.heller | 2006-08-04 21:49:31 +0200 (Fri, 04 Aug 2006) | 3 lines
Fix #1534738: win32 debug version of _msi must be _msi_d.pyd, not _msi.pyd.
Fix the name of the pdb file as well.
........
r51115 | andrew.kuchling | 2006-08-04 22:37:43 +0200 (Fri, 04 Aug 2006) | 1 line
Typo fixes
........
r51116 | andrew.kuchling | 2006-08-04 23:10:03 +0200 (Fri, 04 Aug 2006) | 1 line
Fix mangled sentence
........
r51118 | tim.peters | 2006-08-05 00:00:35 +0200 (Sat, 05 Aug 2006) | 2 lines
Whitespace normalization.
........
r51119 | bob.ippolito | 2006-08-05 01:59:21 +0200 (Sat, 05 Aug 2006) | 5 lines
Fix #1530559, struct.pack raises TypeError where it used to convert.
Passing float arguments to struct.pack when integers are expected
now triggers a DeprecationWarning.
........
r51123 | georg.brandl | 2006-08-05 08:10:54 +0200 (Sat, 05 Aug 2006) | 3 lines
Patch #1534922: correct and enhance unittest docs.
........
r51126 | georg.brandl | 2006-08-06 09:06:33 +0200 (Sun, 06 Aug 2006) | 2 lines
Bug #1535182: really test the xreadlines() method of bz2 objects.
........
r51128 | georg.brandl | 2006-08-06 09:26:21 +0200 (Sun, 06 Aug 2006) | 4 lines
Bug #1535081: A leading underscore has been added to the names of
the md5 and sha modules, so add it in Modules/Setup.dist too.
........
r51129 | georg.brandl | 2006-08-06 10:23:54 +0200 (Sun, 06 Aug 2006) | 3 lines
Bug #1535165: fixed a segfault in input() and raw_input() when
sys.stdin is closed.
........
r51131 | georg.brandl | 2006-08-06 11:17:16 +0200 (Sun, 06 Aug 2006) | 2 lines
Don't produce output in test_builtin.
........
r51133 | andrew.macintyre | 2006-08-06 14:37:03 +0200 (Sun, 06 Aug 2006) | 4 lines
test_threading now skips testing alternate thread stack sizes on
platforms that don't support changing thread stack size.
........
r51134 | andrew.kuchling | 2006-08-07 00:07:04 +0200 (Mon, 07 Aug 2006) | 2 lines
[Patch #1464056] Ensure that we use the panelw library when linking with ncursesw.
Once I see how the buildbots react, I'll backport this to 2.4.
........
r51137 | georg.brandl | 2006-08-08 13:52:34 +0200 (Tue, 08 Aug 2006) | 3 lines
webbrowser: Silence stderr output if no gconftool or gnome browser found
........
r51138 | georg.brandl | 2006-08-08 13:56:21 +0200 (Tue, 08 Aug 2006) | 7 lines
Remove "non-mapping" and "non-sequence" from TypeErrors raised by
PyMapping_Size and PySequence_Size.
Because len() tries first sequence, then mapping size, it will always
raise a "non-mapping object has no len" error which is confusing.
........
r51139 | thomas.heller | 2006-08-08 19:37:00 +0200 (Tue, 08 Aug 2006) | 3 lines
memcmp() can return values other than -1, 0, and +1 but tp_compare
must not.
........
r51140 | thomas.heller | 2006-08-08 19:39:20 +0200 (Tue, 08 Aug 2006) | 1 line
Remove accidently committed, duplicated test.
........
r51147 | andrew.kuchling | 2006-08-08 20:50:14 +0200 (Tue, 08 Aug 2006) | 1 line
Reword paragraph to clarify
........
r51148 | andrew.kuchling | 2006-08-08 20:56:08 +0200 (Tue, 08 Aug 2006) | 1 line
Move obmalloc item into C API section
........
r51149 | andrew.kuchling | 2006-08-08 21:00:14 +0200 (Tue, 08 Aug 2006) | 1 line
'Other changes' section now has only one item; move the item elsewhere and remove the section
........
r51150 | andrew.kuchling | 2006-08-08 21:00:34 +0200 (Tue, 08 Aug 2006) | 1 line
Bump version number
........
r51151 | georg.brandl | 2006-08-08 22:11:22 +0200 (Tue, 08 Aug 2006) | 2 lines
Bug #1536828: typo: TypeType should have been StringType.
........
r51153 | georg.brandl | 2006-08-08 22:13:13 +0200 (Tue, 08 Aug 2006) | 2 lines
Bug #1536660: separate two words.
........
r51155 | georg.brandl | 2006-08-08 22:48:10 +0200 (Tue, 08 Aug 2006) | 3 lines
``str`` is now the same object as ``types.StringType``.
........
r51156 | tim.peters | 2006-08-09 02:52:26 +0200 (Wed, 09 Aug 2006) | 2 lines
Whitespace normalization.
........
r51158 | georg.brandl | 2006-08-09 09:03:22 +0200 (Wed, 09 Aug 2006) | 4 lines
Introduce an upper bound on tuple nesting depth in
C argument format strings; fixes rest of #1523610.
........
r51160 | martin.v.loewis | 2006-08-09 09:57:39 +0200 (Wed, 09 Aug 2006) | 4 lines
__hash__ may now return long int; the final hash
value is obtained by invoking hash on the long int.
Fixes #1536021.
........
r51168 | andrew.kuchling | 2006-08-09 15:03:41 +0200 (Wed, 09 Aug 2006) | 1 line
[Bug #1536021] Mention __hash__ change
........
r51169 | andrew.kuchling | 2006-08-09 15:57:05 +0200 (Wed, 09 Aug 2006) | 1 line
[Patch #1534027] Add notes on locale module changes
........
r51170 | andrew.kuchling | 2006-08-09 16:05:35 +0200 (Wed, 09 Aug 2006) | 1 line
Add missing 'self' parameters
........
r51171 | andrew.kuchling | 2006-08-09 16:06:19 +0200 (Wed, 09 Aug 2006) | 1 line
Reindent code
........
r51172 | armin.rigo | 2006-08-09 16:55:26 +0200 (Wed, 09 Aug 2006) | 2 lines
Fix and test for an infinite C recursion.
........
r51173 | ronald.oussoren | 2006-08-09 16:56:33 +0200 (Wed, 09 Aug 2006) | 2 lines
It's unlikely that future versions will require _POSIX_C_SOURCE
........
r51178 | armin.rigo | 2006-08-09 17:37:26 +0200 (Wed, 09 Aug 2006) | 2 lines
Concatenation on a long string breaks (SF #1526585).
........
r51180 | kurt.kaiser | 2006-08-09 18:46:15 +0200 (Wed, 09 Aug 2006) | 8 lines
1. When used w/o subprocess, all exceptions were preceeded by an error
message claiming they were IDLE internal errors (since 1.2a1).
2. Add Ronald Oussoren to CREDITS
M NEWS.txt
M PyShell.py
M CREDITS.txt
........
r51181 | kurt.kaiser | 2006-08-09 19:47:15 +0200 (Wed, 09 Aug 2006) | 4 lines
As a slight enhancement to the previous checkin, improve the
internal error reporting by moving message to IDLE console.
........
r51182 | andrew.kuchling | 2006-08-09 20:23:14 +0200 (Wed, 09 Aug 2006) | 1 line
Typo fix
........
r51183 | kurt.kaiser | 2006-08-09 22:34:46 +0200 (Wed, 09 Aug 2006) | 2 lines
ToggleTab dialog was setting indent to 8 even if cancelled (since 1.2a1).
........
r51184 | martin.v.loewis | 2006-08-10 01:42:18 +0200 (Thu, 10 Aug 2006) | 2 lines
Add some commentary on -mimpure-text.
........
r51185 | tim.peters | 2006-08-10 02:58:49 +0200 (Thu, 10 Aug 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r51186 | kurt.kaiser | 2006-08-10 03:41:17 +0200 (Thu, 10 Aug 2006) | 2 lines
Changing tokenize (39046) to detect dedent broke tabnanny check (since 1.2a1)
........
r51187 | tim.peters | 2006-08-10 05:01:26 +0200 (Thu, 10 Aug 2006) | 13 lines
test_copytree_simple(): This was leaving behind two new temp
directories each time it ran, at least on Windows.
Several changes: explicitly closed all files; wrapped long
lines; stopped suppressing errors when removing a file or
directory fails (removing /shouldn't/ fail!); and changed
what appeared to be incorrect usage of os.removedirs() (that
doesn't remove empty directories at and /under/ the given
path, instead it must be given an empty leaf directory and
then deletes empty directories moving /up/ the path -- could
be that the conceptually simpler shutil.rmtree() was really
actually intended here).
........
2006-08-11 14:57:12 +00:00
|
|
|
#ifdef HAVE_ERRNO_H
|
1992-08-04 12:41:02 +00:00
|
|
|
#include <errno.h>
|
1999-04-07 16:07:23 +00:00
|
|
|
#endif
|
2017-09-08 05:51:28 +00:00
|
|
|
|
2000-09-01 11:07:19 +00:00
|
|
|
int
|
|
|
|
Py_GetRecursionLimit(void)
|
2000-08-31 19:23:01 +00:00
|
|
|
{
|
2020-06-10 18:08:26 +00:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
return interp->ceval.recursion_limit;
|
2000-08-31 19:23:01 +00:00
|
|
|
}
|
|
|
|
|
2000-09-01 11:07:19 +00:00
|
|
|
void
|
|
|
|
Py_SetRecursionLimit(int new_limit)
|
2000-08-31 19:23:01 +00:00
|
|
|
{
|
2021-11-16 11:01:57 +00:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
interp->ceval.recursion_limit = new_limit;
|
2021-12-07 21:03:47 +00:00
|
|
|
for (PyThreadState *p = interp->threads.head; p != NULL; p = p->next) {
|
2022-10-05 00:34:03 +00:00
|
|
|
int depth = p->py_recursion_limit - p->py_recursion_remaining;
|
|
|
|
p->py_recursion_limit = new_limit;
|
|
|
|
p->py_recursion_remaining = new_limit - depth;
|
2021-11-16 11:01:57 +00:00
|
|
|
}
|
2000-08-31 19:23:01 +00:00
|
|
|
}
|
|
|
|
|
2022-05-04 11:30:23 +00:00
|
|
|
/* The function _Py_EnterRecursiveCallTstate() only calls _Py_CheckRecursiveCall()
|
2021-11-16 11:01:57 +00:00
|
|
|
if the recursion_depth reaches recursion_limit. */
|
2003-10-28 12:05:48 +00:00
|
|
|
int
|
2019-11-04 23:51:22 +00:00
|
|
|
_Py_CheckRecursiveCall(PyThreadState *tstate, const char *where)
|
2003-10-28 12:05:48 +00:00
|
|
|
{
|
|
|
|
#ifdef USE_STACKCHECK
|
2010-05-09 15:52:27 +00:00
|
|
|
if (PyOS_CheckStack()) {
|
2022-10-05 00:34:03 +00:00
|
|
|
++tstate->c_recursion_remaining;
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_SetString(tstate, PyExc_MemoryError, "Stack overflow");
|
2010-05-09 15:52:27 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2017-10-26 06:03:01 +00:00
|
|
|
#endif
|
2020-12-02 13:30:55 +00:00
|
|
|
if (tstate->recursion_headroom) {
|
2022-10-05 00:34:03 +00:00
|
|
|
if (tstate->c_recursion_remaining < -50) {
|
2010-05-09 15:52:27 +00:00
|
|
|
/* Overflowing while handling an overflow. Give up. */
|
|
|
|
Py_FatalError("Cannot recover from stack overflow.");
|
|
|
|
}
|
|
|
|
}
|
2020-12-02 13:30:55 +00:00
|
|
|
else {
|
2022-10-05 00:34:03 +00:00
|
|
|
if (tstate->c_recursion_remaining <= 0) {
|
2020-12-02 13:30:55 +00:00
|
|
|
tstate->recursion_headroom++;
|
|
|
|
_PyErr_Format(tstate, PyExc_RecursionError,
|
|
|
|
"maximum recursion depth exceeded%s",
|
|
|
|
where);
|
|
|
|
tstate->recursion_headroom--;
|
2022-10-05 00:34:03 +00:00
|
|
|
++tstate->c_recursion_remaining;
|
2020-12-02 13:30:55 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
|
|
|
return 0;
|
2003-10-28 12:05:48 +00:00
|
|
|
}
|
|
|
|
|
2021-02-26 22:51:55 +00:00
|
|
|
|
2021-11-16 13:53:57 +00:00
|
|
|
static const binaryfunc binary_ops[] = {
|
|
|
|
[NB_ADD] = PyNumber_Add,
|
|
|
|
[NB_AND] = PyNumber_And,
|
|
|
|
[NB_FLOOR_DIVIDE] = PyNumber_FloorDivide,
|
|
|
|
[NB_LSHIFT] = PyNumber_Lshift,
|
|
|
|
[NB_MATRIX_MULTIPLY] = PyNumber_MatrixMultiply,
|
|
|
|
[NB_MULTIPLY] = PyNumber_Multiply,
|
|
|
|
[NB_REMAINDER] = PyNumber_Remainder,
|
|
|
|
[NB_OR] = PyNumber_Or,
|
|
|
|
[NB_POWER] = _PyNumber_PowerNoMod,
|
|
|
|
[NB_RSHIFT] = PyNumber_Rshift,
|
|
|
|
[NB_SUBTRACT] = PyNumber_Subtract,
|
|
|
|
[NB_TRUE_DIVIDE] = PyNumber_TrueDivide,
|
|
|
|
[NB_XOR] = PyNumber_Xor,
|
|
|
|
[NB_INPLACE_ADD] = PyNumber_InPlaceAdd,
|
|
|
|
[NB_INPLACE_AND] = PyNumber_InPlaceAnd,
|
|
|
|
[NB_INPLACE_FLOOR_DIVIDE] = PyNumber_InPlaceFloorDivide,
|
|
|
|
[NB_INPLACE_LSHIFT] = PyNumber_InPlaceLshift,
|
|
|
|
[NB_INPLACE_MATRIX_MULTIPLY] = PyNumber_InPlaceMatrixMultiply,
|
|
|
|
[NB_INPLACE_MULTIPLY] = PyNumber_InPlaceMultiply,
|
|
|
|
[NB_INPLACE_REMAINDER] = PyNumber_InPlaceRemainder,
|
|
|
|
[NB_INPLACE_OR] = PyNumber_InPlaceOr,
|
|
|
|
[NB_INPLACE_POWER] = _PyNumber_InPlacePowerNoMod,
|
|
|
|
[NB_INPLACE_RSHIFT] = PyNumber_InPlaceRshift,
|
|
|
|
[NB_INPLACE_SUBTRACT] = PyNumber_InPlaceSubtract,
|
|
|
|
[NB_INPLACE_TRUE_DIVIDE] = PyNumber_InPlaceTrueDivide,
|
|
|
|
[NB_INPLACE_XOR] = PyNumber_InPlaceXor,
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2021-02-26 22:51:55 +00:00
|
|
|
// PEP 634: Structural Pattern Matching
|
|
|
|
|
|
|
|
|
|
|
|
// Return a tuple of values corresponding to keys, with error checks for
|
|
|
|
// duplicate/missing keys.
|
|
|
|
static PyObject*
|
|
|
|
match_keys(PyThreadState *tstate, PyObject *map, PyObject *keys)
|
|
|
|
{
|
|
|
|
assert(PyTuple_CheckExact(keys));
|
|
|
|
Py_ssize_t nkeys = PyTuple_GET_SIZE(keys);
|
|
|
|
if (!nkeys) {
|
|
|
|
// No keys means no items.
|
|
|
|
return PyTuple_New(0);
|
|
|
|
}
|
|
|
|
PyObject *seen = NULL;
|
|
|
|
PyObject *dummy = NULL;
|
|
|
|
PyObject *values = NULL;
|
2021-08-30 10:02:32 +00:00
|
|
|
PyObject *get = NULL;
|
2021-02-26 22:51:55 +00:00
|
|
|
// We use the two argument form of map.get(key, default) for two reasons:
|
|
|
|
// - Atomically check for a key and get its value without error handling.
|
|
|
|
// - Don't cause key creation or resizing in dict subclasses like
|
|
|
|
// collections.defaultdict that define __missing__ (or similar).
|
2022-02-08 20:39:07 +00:00
|
|
|
int meth_found = _PyObject_GetMethod(map, &_Py_ID(get), &get);
|
2021-02-26 22:51:55 +00:00
|
|
|
if (get == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
seen = PySet_New(NULL);
|
|
|
|
if (seen == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
// dummy = object()
|
2021-10-11 22:42:23 +00:00
|
|
|
dummy = _PyObject_CallNoArgs((PyObject *)&PyBaseObject_Type);
|
2021-02-26 22:51:55 +00:00
|
|
|
if (dummy == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
2021-08-30 10:02:32 +00:00
|
|
|
values = PyTuple_New(nkeys);
|
2021-02-26 22:51:55 +00:00
|
|
|
if (values == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
for (Py_ssize_t i = 0; i < nkeys; i++) {
|
|
|
|
PyObject *key = PyTuple_GET_ITEM(keys, i);
|
|
|
|
if (PySet_Contains(seen, key) || PySet_Add(seen, key)) {
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
// Seen it before!
|
|
|
|
_PyErr_Format(tstate, PyExc_ValueError,
|
|
|
|
"mapping pattern checks duplicate key (%R)", key);
|
|
|
|
}
|
|
|
|
goto fail;
|
|
|
|
}
|
2021-08-30 10:02:32 +00:00
|
|
|
PyObject *args[] = { map, key, dummy };
|
|
|
|
PyObject *value = NULL;
|
|
|
|
if (meth_found) {
|
|
|
|
value = PyObject_Vectorcall(get, args, 3, NULL);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
value = PyObject_Vectorcall(get, &args[1], 2, NULL);
|
|
|
|
}
|
2021-02-26 22:51:55 +00:00
|
|
|
if (value == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
if (value == dummy) {
|
|
|
|
// key not in map!
|
|
|
|
Py_DECREF(value);
|
|
|
|
Py_DECREF(values);
|
|
|
|
// Return None:
|
2022-11-10 10:25:33 +00:00
|
|
|
values = Py_NewRef(Py_None);
|
2021-02-26 22:51:55 +00:00
|
|
|
goto done;
|
|
|
|
}
|
2021-08-30 10:02:32 +00:00
|
|
|
PyTuple_SET_ITEM(values, i, value);
|
2021-02-26 22:51:55 +00:00
|
|
|
}
|
|
|
|
// Success:
|
|
|
|
done:
|
|
|
|
Py_DECREF(get);
|
|
|
|
Py_DECREF(seen);
|
|
|
|
Py_DECREF(dummy);
|
|
|
|
return values;
|
|
|
|
fail:
|
|
|
|
Py_XDECREF(get);
|
|
|
|
Py_XDECREF(seen);
|
|
|
|
Py_XDECREF(dummy);
|
|
|
|
Py_XDECREF(values);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Extract a named attribute from the subject, with additional bookkeeping to
|
|
|
|
// raise TypeErrors for repeated lookups. On failure, return NULL (with no
|
|
|
|
// error set). Use _PyErr_Occurred(tstate) to disambiguate.
|
|
|
|
static PyObject*
|
|
|
|
match_class_attr(PyThreadState *tstate, PyObject *subject, PyObject *type,
|
|
|
|
PyObject *name, PyObject *seen)
|
|
|
|
{
|
|
|
|
assert(PyUnicode_CheckExact(name));
|
|
|
|
assert(PySet_CheckExact(seen));
|
|
|
|
if (PySet_Contains(seen, name) || PySet_Add(seen, name)) {
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
// Seen it before!
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"%s() got multiple sub-patterns for attribute %R",
|
|
|
|
((PyTypeObject*)type)->tp_name, name);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyObject *attr = PyObject_GetAttr(subject, name);
|
|
|
|
if (attr == NULL && _PyErr_ExceptionMatches(tstate, PyExc_AttributeError)) {
|
|
|
|
_PyErr_Clear(tstate);
|
|
|
|
}
|
|
|
|
return attr;
|
|
|
|
}
|
|
|
|
|
|
|
|
// On success (match), return a tuple of extracted attributes. On failure (no
|
|
|
|
// match), return NULL. Use _PyErr_Occurred(tstate) to disambiguate.
|
|
|
|
static PyObject*
|
|
|
|
match_class(PyThreadState *tstate, PyObject *subject, PyObject *type,
|
|
|
|
Py_ssize_t nargs, PyObject *kwargs)
|
|
|
|
{
|
|
|
|
if (!PyType_Check(type)) {
|
2023-04-18 17:41:14 +00:00
|
|
|
const char *e = "called match pattern must be a class";
|
2021-02-26 22:51:55 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError, e);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
assert(PyTuple_CheckExact(kwargs));
|
|
|
|
// First, an isinstance check:
|
|
|
|
if (PyObject_IsInstance(subject, type) <= 0) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
// So far so good:
|
|
|
|
PyObject *seen = PySet_New(NULL);
|
|
|
|
if (seen == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyObject *attrs = PyList_New(0);
|
|
|
|
if (attrs == NULL) {
|
|
|
|
Py_DECREF(seen);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
// NOTE: From this point on, goto fail on failure:
|
|
|
|
PyObject *match_args = NULL;
|
|
|
|
// First, the positional subpatterns:
|
|
|
|
if (nargs) {
|
|
|
|
int match_self = 0;
|
|
|
|
match_args = PyObject_GetAttrString(type, "__match_args__");
|
|
|
|
if (match_args) {
|
|
|
|
if (!PyTuple_CheckExact(match_args)) {
|
2021-04-06 02:17:08 +00:00
|
|
|
const char *e = "%s.__match_args__ must be a tuple (got %s)";
|
2021-02-26 22:51:55 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError, e,
|
|
|
|
((PyTypeObject *)type)->tp_name,
|
|
|
|
Py_TYPE(match_args)->tp_name);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (_PyErr_ExceptionMatches(tstate, PyExc_AttributeError)) {
|
|
|
|
_PyErr_Clear(tstate);
|
|
|
|
// _Py_TPFLAGS_MATCH_SELF is only acknowledged if the type does not
|
|
|
|
// define __match_args__. This is natural behavior for subclasses:
|
|
|
|
// it's as if __match_args__ is some "magic" value that is lost as
|
|
|
|
// soon as they redefine it.
|
|
|
|
match_args = PyTuple_New(0);
|
|
|
|
match_self = PyType_HasFeature((PyTypeObject*)type,
|
|
|
|
_Py_TPFLAGS_MATCH_SELF);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
assert(PyTuple_CheckExact(match_args));
|
|
|
|
Py_ssize_t allowed = match_self ? 1 : PyTuple_GET_SIZE(match_args);
|
|
|
|
if (allowed < nargs) {
|
|
|
|
const char *plural = (allowed == 1) ? "" : "s";
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"%s() accepts %d positional sub-pattern%s (%d given)",
|
|
|
|
((PyTypeObject*)type)->tp_name,
|
|
|
|
allowed, plural, nargs);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
if (match_self) {
|
|
|
|
// Easy. Copy the subject itself, and move on to kwargs.
|
|
|
|
PyList_Append(attrs, subject);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for (Py_ssize_t i = 0; i < nargs; i++) {
|
|
|
|
PyObject *name = PyTuple_GET_ITEM(match_args, i);
|
|
|
|
if (!PyUnicode_CheckExact(name)) {
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"__match_args__ elements must be strings "
|
|
|
|
"(got %s)", Py_TYPE(name)->tp_name);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
PyObject *attr = match_class_attr(tstate, subject, type, name,
|
|
|
|
seen);
|
|
|
|
if (attr == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
PyList_Append(attrs, attr);
|
|
|
|
Py_DECREF(attr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_CLEAR(match_args);
|
|
|
|
}
|
|
|
|
// Finally, the keyword subpatterns:
|
|
|
|
for (Py_ssize_t i = 0; i < PyTuple_GET_SIZE(kwargs); i++) {
|
|
|
|
PyObject *name = PyTuple_GET_ITEM(kwargs, i);
|
|
|
|
PyObject *attr = match_class_attr(tstate, subject, type, name, seen);
|
|
|
|
if (attr == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
PyList_Append(attrs, attr);
|
|
|
|
Py_DECREF(attr);
|
|
|
|
}
|
|
|
|
Py_SETREF(attrs, PyList_AsTuple(attrs));
|
|
|
|
Py_DECREF(seen);
|
|
|
|
return attrs;
|
|
|
|
fail:
|
|
|
|
// We really don't care whether an error was raised or not... that's our
|
|
|
|
// caller's problem. All we know is that the match failed.
|
|
|
|
Py_XDECREF(match_args);
|
|
|
|
Py_DECREF(seen);
|
|
|
|
Py_DECREF(attrs);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-10 21:39:09 +00:00
|
|
|
static int do_raise(PyThreadState *tstate, PyObject *exc, PyObject *cause);
|
2021-12-14 16:48:15 +00:00
|
|
|
static int exception_group_match(
|
2021-12-17 14:46:22 +00:00
|
|
|
PyObject* exc_value, PyObject *match_type,
|
2021-12-14 16:48:15 +00:00
|
|
|
PyObject **match, PyObject **rest);
|
|
|
|
|
2019-05-24 15:01:38 +00:00
|
|
|
static int unpack_iterable(PyThreadState *, PyObject *, int, int, PyObject **);
|
1997-01-21 05:34:20 +00:00
|
|
|
|
1997-04-29 18:18:01 +00:00
|
|
|
PyObject *
|
2010-12-03 20:14:31 +00:00
|
|
|
PyEval_EvalCode(PyObject *co, PyObject *globals, PyObject *locals)
|
1995-07-18 14:51:37 +00:00
|
|
|
{
|
2021-10-13 12:09:13 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2021-02-01 10:42:03 +00:00
|
|
|
if (locals == NULL) {
|
|
|
|
locals = globals;
|
|
|
|
}
|
2021-03-18 13:51:24 +00:00
|
|
|
PyObject *builtins = _PyEval_BuiltinsFromGlobals(tstate, globals); // borrowed ref
|
2021-02-01 10:42:03 +00:00
|
|
|
if (builtins == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyFrameConstructor desc = {
|
|
|
|
.fc_globals = globals,
|
|
|
|
.fc_builtins = builtins,
|
|
|
|
.fc_name = ((PyCodeObject *)co)->co_name,
|
|
|
|
.fc_qualname = ((PyCodeObject *)co)->co_name,
|
|
|
|
.fc_code = co,
|
|
|
|
.fc_defaults = NULL,
|
|
|
|
.fc_kwdefaults = NULL,
|
|
|
|
.fc_closure = NULL
|
|
|
|
};
|
2021-11-23 09:53:24 +00:00
|
|
|
PyFunctionObject *func = _PyFunction_FromConstructor(&desc);
|
|
|
|
if (func == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2022-05-27 15:31:41 +00:00
|
|
|
EVAL_CALL_STAT_INC(EVAL_CALL_LEGACY);
|
2021-11-23 09:53:24 +00:00
|
|
|
PyObject *res = _PyEval_Vector(tstate, func, locals, NULL, 0, NULL);
|
|
|
|
Py_DECREF(func);
|
|
|
|
return res;
|
1995-07-18 14:51:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Interpreter main loop */
|
|
|
|
|
2004-06-27 15:43:12 +00:00
|
|
|
PyObject *
|
2019-11-14 11:20:46 +00:00
|
|
|
PyEval_EvalFrame(PyFrameObject *f)
|
|
|
|
{
|
2020-03-12 22:18:39 +00:00
|
|
|
/* Function kept for backward compatibility */
|
2019-11-14 11:20:46 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2021-07-26 10:22:16 +00:00
|
|
|
return _PyEval_EvalFrame(tstate, f->f_frame, 0);
|
2005-08-02 00:46:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2006-04-21 10:40:58 +00:00
|
|
|
PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
|
2016-09-05 22:33:46 +00:00
|
|
|
{
|
2019-11-14 11:20:46 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2021-07-26 10:22:16 +00:00
|
|
|
return _PyEval_EvalFrame(tstate, f->f_frame, throwflag);
|
2016-09-05 22:33:46 +00:00
|
|
|
}
|
|
|
|
|
2023-01-18 18:41:07 +00:00
|
|
|
#include "ceval_macros.h"
|
2021-12-01 12:09:36 +00:00
|
|
|
|
2022-10-05 00:34:03 +00:00
|
|
|
|
|
|
|
int _Py_CheckRecursiveCallPy(
|
|
|
|
PyThreadState *tstate)
|
|
|
|
{
|
|
|
|
if (tstate->recursion_headroom) {
|
|
|
|
if (tstate->py_recursion_remaining < -50) {
|
|
|
|
/* Overflowing while handling an overflow. Give up. */
|
|
|
|
Py_FatalError("Cannot recover from Python stack overflow.");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (tstate->py_recursion_remaining <= 0) {
|
|
|
|
tstate->recursion_headroom++;
|
|
|
|
_PyErr_Format(tstate, PyExc_RecursionError,
|
|
|
|
"maximum recursion depth exceeded");
|
|
|
|
tstate->recursion_headroom--;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int _Py_EnterRecursivePy(PyThreadState *tstate) {
|
|
|
|
return (tstate->py_recursion_remaining-- <= 0) &&
|
|
|
|
_Py_CheckRecursiveCallPy(tstate);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline void _Py_LeaveRecursiveCallPy(PyThreadState *tstate) {
|
|
|
|
tstate->py_recursion_remaining++;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-11-22 20:13:54 +00:00
|
|
|
/* Disable unused label warnings. They are handy for debugging, even
|
|
|
|
if computed gotos aren't used. */
|
|
|
|
|
|
|
|
/* TBD - what about other compilers? */
|
|
|
|
#if defined(__GNUC__)
|
|
|
|
# pragma GCC diagnostic push
|
|
|
|
# pragma GCC diagnostic ignored "-Wunused-label"
|
|
|
|
#elif defined(_MSC_VER) /* MS_WINDOWS */
|
|
|
|
# pragma warning(push)
|
|
|
|
# pragma warning(disable:4102)
|
|
|
|
#endif
|
|
|
|
|
2021-03-25 12:00:30 +00:00
|
|
|
PyObject* _Py_HOT_FUNCTION
|
2022-02-25 15:22:00 +00:00
|
|
|
_PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int throwflag)
|
2021-03-25 12:00:30 +00:00
|
|
|
{
|
|
|
|
_Py_EnsureTstateNotNULL(tstate);
|
2022-01-28 15:20:33 +00:00
|
|
|
CALL_STAT_INC(pyeval_calls);
|
2021-03-25 12:00:30 +00:00
|
|
|
|
|
|
|
#if USE_COMPUTED_GOTOS
|
|
|
|
/* Import the static jump table */
|
|
|
|
#include "opcode_targets.h"
|
|
|
|
#endif
|
|
|
|
|
2022-02-07 16:51:43 +00:00
|
|
|
#ifdef Py_STATS
|
2021-03-25 12:00:30 +00:00
|
|
|
int lastopcode = 0;
|
|
|
|
#endif
|
2022-04-21 18:53:57 +00:00
|
|
|
// opcode is an 8-bit value to improve the code generated by MSVC
|
|
|
|
// for the big switch below (in combination with the EXTRA_CASES macro).
|
|
|
|
uint8_t opcode; /* Current opcode */
|
2021-03-25 12:00:30 +00:00
|
|
|
int oparg; /* Current opcode argument, if any */
|
2021-04-13 10:08:14 +00:00
|
|
|
_Py_atomic_int * const eval_breaker = &tstate->interp->ceval.eval_breaker;
|
2022-05-25 09:45:33 +00:00
|
|
|
#ifdef LLTRACE
|
|
|
|
int lltrace = 0;
|
|
|
|
#endif
|
1997-05-05 20:56:21 +00:00
|
|
|
|
2022-02-28 15:03:57 +00:00
|
|
|
_PyCFrame cframe;
|
2022-11-10 12:34:57 +00:00
|
|
|
_PyInterpreterFrame entry_frame;
|
|
|
|
PyObject *kwnames = NULL; // Borrowed reference. Reset by CALL instructions.
|
2021-12-14 18:22:44 +00:00
|
|
|
|
2022-02-28 15:03:57 +00:00
|
|
|
/* WARNING: Because the _PyCFrame lives on the C stack,
|
2021-04-13 10:08:14 +00:00
|
|
|
* but can be accessed from a heap allocated object (tstate)
|
|
|
|
* strict stack discipline must be maintained.
|
|
|
|
*/
|
2022-02-28 15:03:57 +00:00
|
|
|
_PyCFrame *prev_cframe = tstate->cframe;
|
2021-06-10 07:46:59 +00:00
|
|
|
cframe.previous = prev_cframe;
|
|
|
|
tstate->cframe = &cframe;
|
2021-04-13 10:08:14 +00:00
|
|
|
|
2022-11-10 12:34:57 +00:00
|
|
|
assert(tstate->interp->interpreter_trampoline != NULL);
|
|
|
|
#ifdef Py_DEBUG
|
|
|
|
/* Set these to invalid but identifiable values for debugging. */
|
|
|
|
entry_frame.f_funcobj = (PyObject*)0xaaa0;
|
|
|
|
entry_frame.f_locals = (PyObject*)0xaaa1;
|
|
|
|
entry_frame.frame_obj = (PyFrameObject*)0xaaa2;
|
|
|
|
entry_frame.f_globals = (PyObject*)0xaaa3;
|
|
|
|
entry_frame.f_builtins = (PyObject*)0xaaa4;
|
|
|
|
#endif
|
|
|
|
entry_frame.f_code = tstate->interp->interpreter_trampoline;
|
|
|
|
entry_frame.prev_instr =
|
|
|
|
_PyCode_CODE(tstate->interp->interpreter_trampoline);
|
|
|
|
entry_frame.stacktop = 0;
|
|
|
|
entry_frame.owner = FRAME_OWNED_BY_CSTACK;
|
2023-04-13 15:19:07 +00:00
|
|
|
entry_frame.return_offset = 0;
|
2021-10-28 12:59:11 +00:00
|
|
|
/* Push frame */
|
2022-11-10 12:34:57 +00:00
|
|
|
entry_frame.previous = prev_cframe->current_frame;
|
|
|
|
frame->previous = &entry_frame;
|
2021-10-28 12:59:11 +00:00
|
|
|
cframe.current_frame = frame;
|
2010-05-09 15:52:27 +00:00
|
|
|
|
2022-10-05 00:34:03 +00:00
|
|
|
if (_Py_EnterRecursiveCallTstate(tstate, "")) {
|
|
|
|
tstate->c_recursion_remaining--;
|
|
|
|
tstate->py_recursion_remaining--;
|
|
|
|
goto exit_unwind;
|
|
|
|
}
|
|
|
|
|
2021-12-01 12:09:36 +00:00
|
|
|
/* support for generator.throw() */
|
|
|
|
if (throwflag) {
|
2022-10-05 00:34:03 +00:00
|
|
|
if (_Py_EnterRecursivePy(tstate)) {
|
2021-12-01 12:09:36 +00:00
|
|
|
goto exit_unwind;
|
|
|
|
}
|
2023-04-12 11:04:55 +00:00
|
|
|
/* Because this avoids the RESUME,
|
|
|
|
* we need to update instrumentation */
|
|
|
|
_Py_Instrument(frame->f_code, tstate->interp);
|
|
|
|
monitor_throw(tstate, frame, frame->prev_instr);
|
|
|
|
/* TO DO -- Monitor throw entry. */
|
2021-12-01 12:09:36 +00:00
|
|
|
goto resume_with_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Local "register" variables.
|
|
|
|
* These are cached values from the frame and code object. */
|
|
|
|
|
|
|
|
_Py_CODEUNIT *next_instr;
|
|
|
|
PyObject **stack_pointer;
|
|
|
|
|
|
|
|
/* Sets the above local variables from the frame */
|
|
|
|
#define SET_LOCALS_FROM_FRAME() \
|
2022-04-07 19:31:01 +00:00
|
|
|
assert(_PyInterpreterFrame_LASTI(frame) >= -1); \
|
2022-03-21 11:11:17 +00:00
|
|
|
/* Jump back to the last instruction executed... */ \
|
2022-04-07 19:31:01 +00:00
|
|
|
next_instr = frame->prev_instr + 1; \
|
2023-04-12 11:04:55 +00:00
|
|
|
stack_pointer = _PyFrame_GetStackPointer(frame);
|
2021-12-01 12:09:36 +00:00
|
|
|
|
2021-10-09 15:51:30 +00:00
|
|
|
start_frame:
|
2022-10-05 00:34:03 +00:00
|
|
|
if (_Py_EnterRecursivePy(tstate)) {
|
2021-12-01 12:09:36 +00:00
|
|
|
goto exit_unwind;
|
2021-10-09 15:51:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
resume_frame:
|
2021-12-01 12:09:36 +00:00
|
|
|
SET_LOCALS_FROM_FRAME();
|
2010-05-09 15:52:27 +00:00
|
|
|
|
2001-06-18 22:08:13 +00:00
|
|
|
#ifdef LLTRACE
|
2020-10-26 06:43:39 +00:00
|
|
|
{
|
2022-11-10 12:34:57 +00:00
|
|
|
if (frame != &entry_frame) {
|
|
|
|
int r = PyDict_Contains(GLOBALS(), &_Py_ID(__lltrace__));
|
|
|
|
if (r < 0) {
|
|
|
|
goto exit_unwind;
|
|
|
|
}
|
|
|
|
lltrace = r;
|
|
|
|
}
|
|
|
|
if (lltrace) {
|
|
|
|
lltrace_resume_frame(frame);
|
2020-10-26 06:43:39 +00:00
|
|
|
}
|
2022-04-16 21:36:29 +00:00
|
|
|
}
|
2001-06-18 22:08:13 +00:00
|
|
|
#endif
|
2001-01-17 15:42:30 +00:00
|
|
|
|
2013-07-17 23:41:08 +00:00
|
|
|
#ifdef Py_DEBUG
|
2020-03-12 22:18:39 +00:00
|
|
|
/* _PyEval_EvalFrameDefault() must not be called with an exception set,
|
2017-01-18 13:12:51 +00:00
|
|
|
because it can clear it (directly or indirectly) and so the
|
2015-10-07 10:26:23 +00:00
|
|
|
caller loses its exception */
|
2019-05-24 15:01:38 +00:00
|
|
|
assert(!_PyErr_Occurred(tstate));
|
2013-07-17 23:41:08 +00:00
|
|
|
#endif
|
|
|
|
|
2022-01-20 11:46:39 +00:00
|
|
|
DISPATCH();
|
2010-05-09 15:52:27 +00:00
|
|
|
|
2022-01-20 11:46:39 +00:00
|
|
|
handle_eval_breaker:
|
|
|
|
|
|
|
|
/* Do periodic things, like check for signals and async I/0.
|
|
|
|
* We need to do reasonably frequently, but not too frequently.
|
|
|
|
* All loops should include a check of the eval breaker.
|
|
|
|
* We also check on return from any builtin function.
|
|
|
|
*/
|
2022-08-24 13:21:01 +00:00
|
|
|
if (_Py_HandlePending(tstate) != 0) {
|
2022-01-20 11:46:39 +00:00
|
|
|
goto error;
|
|
|
|
}
|
2021-08-11 08:25:26 +00:00
|
|
|
DISPATCH();
|
|
|
|
|
2022-01-20 11:46:39 +00:00
|
|
|
{
|
2021-08-11 13:02:11 +00:00
|
|
|
/* Start instructions */
|
2022-10-11 23:45:53 +00:00
|
|
|
#if !USE_COMPUTED_GOTOS
|
2021-04-08 10:22:55 +00:00
|
|
|
dispatch_opcode:
|
2022-10-11 23:45:53 +00:00
|
|
|
switch (opcode)
|
2021-08-11 13:02:11 +00:00
|
|
|
#endif
|
2022-10-11 23:45:53 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
|
2022-11-03 04:31:26 +00:00
|
|
|
#include "generated_cases.c.h"
|
2022-02-25 12:11:34 +00:00
|
|
|
|
2010-08-13 21:15:58 +00:00
|
|
|
#if USE_COMPUTED_GOTOS
|
2010-05-09 15:52:27 +00:00
|
|
|
_unknown_opcode:
|
2021-08-11 13:02:11 +00:00
|
|
|
#else
|
2022-04-21 18:53:57 +00:00
|
|
|
EXTRA_CASES // From opcode.h, a 'case' for each unused opcode
|
2021-08-11 13:02:11 +00:00
|
|
|
#endif
|
2022-06-30 15:38:29 +00:00
|
|
|
/* Tell C compilers not to hold the opcode variable in the loop.
|
|
|
|
next_instr points the current instruction without TARGET(). */
|
2023-02-20 14:56:48 +00:00
|
|
|
opcode = next_instr->op.code;
|
2022-09-20 10:00:34 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_SystemError,
|
|
|
|
"%U:%d: unknown opcode %d",
|
|
|
|
frame->f_code->co_filename,
|
2023-05-05 16:53:07 +00:00
|
|
|
PyUnstable_InterpreterFrame_GetLine(frame),
|
2022-09-20 10:00:34 +00:00
|
|
|
opcode);
|
2012-10-12 15:34:51 +00:00
|
|
|
goto error;
|
1992-08-12 15:35:34 +00:00
|
|
|
|
2021-08-11 13:02:11 +00:00
|
|
|
} /* End instructions */
|
1990-12-20 15:06:42 +00:00
|
|
|
|
2012-10-12 15:34:51 +00:00
|
|
|
/* This should never be reached. Every opcode should end with DISPATCH()
|
|
|
|
or goto error. */
|
2017-09-15 01:13:16 +00:00
|
|
|
Py_UNREACHABLE();
|
2001-01-17 15:42:30 +00:00
|
|
|
|
2021-08-16 11:23:13 +00:00
|
|
|
unbound_local_error:
|
|
|
|
{
|
|
|
|
format_exc_check_arg(tstate, PyExc_UnboundLocalError,
|
|
|
|
UNBOUNDLOCAL_ERROR_MSG,
|
2021-12-01 12:09:36 +00:00
|
|
|
PyTuple_GetItem(frame->f_code->co_localsplusnames, oparg)
|
2021-08-16 11:23:13 +00:00
|
|
|
);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2022-11-08 16:22:56 +00:00
|
|
|
pop_4_error:
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
pop_3_error:
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
pop_2_error:
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
pop_1_error:
|
|
|
|
STACK_SHRINK(1);
|
2012-10-12 15:34:51 +00:00
|
|
|
error:
|
2022-11-10 12:34:57 +00:00
|
|
|
kwnames = NULL;
|
2012-10-12 15:34:51 +00:00
|
|
|
/* Double-check exception status. */
|
2013-07-11 22:11:58 +00:00
|
|
|
#ifdef NDEBUG
|
2019-05-24 15:01:38 +00:00
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_SystemError,
|
|
|
|
"error return without exception set");
|
|
|
|
}
|
2013-07-11 22:11:58 +00:00
|
|
|
#else
|
2019-05-24 15:01:38 +00:00
|
|
|
assert(_PyErr_Occurred(tstate));
|
2013-07-11 22:11:58 +00:00
|
|
|
#endif
|
1992-01-12 02:29:51 +00:00
|
|
|
|
2012-10-12 15:34:51 +00:00
|
|
|
/* Log traceback info. */
|
2022-11-10 12:34:57 +00:00
|
|
|
assert(frame != &entry_frame);
|
2022-09-13 08:25:16 +00:00
|
|
|
if (!_PyFrame_IsIncomplete(frame)) {
|
|
|
|
PyFrameObject *f = _PyFrame_GetFrameObject(frame);
|
|
|
|
if (f != NULL) {
|
|
|
|
PyTraceBack_Here(f);
|
|
|
|
}
|
2021-07-26 10:22:16 +00:00
|
|
|
}
|
2023-04-12 11:04:55 +00:00
|
|
|
monitor_raise(tstate, frame, next_instr-1);
|
2021-06-10 07:46:01 +00:00
|
|
|
|
2018-02-22 21:33:30 +00:00
|
|
|
exception_unwind:
|
2022-03-22 12:57:19 +00:00
|
|
|
{
|
|
|
|
/* We can't use frame->f_lasti here, as RERAISE may have set it */
|
|
|
|
int offset = INSTR_OFFSET()-1;
|
|
|
|
int level, handler, lasti;
|
|
|
|
if (get_exception_handler(frame->f_code, offset, &level, &handler, &lasti) == 0) {
|
|
|
|
// No handlers, so exit.
|
|
|
|
assert(_PyErr_Occurred(tstate));
|
|
|
|
|
|
|
|
/* Pop remaining stack entries. */
|
|
|
|
PyObject **stackbase = _PyFrame_Stackbase(frame);
|
|
|
|
while (stack_pointer > stackbase) {
|
|
|
|
PyObject *o = POP();
|
|
|
|
Py_XDECREF(o);
|
|
|
|
}
|
|
|
|
assert(STACK_LEVEL() == 0);
|
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer);
|
2023-04-12 11:04:55 +00:00
|
|
|
monitor_unwind(tstate, frame, next_instr-1);
|
2022-03-22 12:57:19 +00:00
|
|
|
goto exit_unwind;
|
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
|
2022-03-22 12:57:19 +00:00
|
|
|
assert(STACK_LEVEL() >= level);
|
|
|
|
PyObject **new_top = _PyFrame_Stackbase(frame) + level;
|
|
|
|
while (stack_pointer > new_top) {
|
|
|
|
PyObject *v = POP();
|
|
|
|
Py_XDECREF(v);
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2022-03-22 12:57:19 +00:00
|
|
|
if (lasti) {
|
2022-04-07 19:31:01 +00:00
|
|
|
int frame_lasti = _PyInterpreterFrame_LASTI(frame);
|
|
|
|
PyObject *lasti = PyLong_FromLong(frame_lasti);
|
2022-03-22 12:57:19 +00:00
|
|
|
if (lasti == NULL) {
|
|
|
|
goto exception_unwind;
|
|
|
|
}
|
|
|
|
PUSH(lasti);
|
|
|
|
}
|
2023-02-28 11:50:52 +00:00
|
|
|
|
2022-03-22 12:57:19 +00:00
|
|
|
/* Make the raw exception data
|
|
|
|
available to the handler,
|
|
|
|
so a program can emulate the
|
|
|
|
Python main loop. */
|
2023-04-12 11:04:55 +00:00
|
|
|
PyObject *exc = _PyErr_GetRaisedException(tstate);
|
|
|
|
PUSH(exc);
|
2022-03-22 12:57:19 +00:00
|
|
|
JUMPTO(handler);
|
2023-04-12 11:04:55 +00:00
|
|
|
monitor_handled(tstate, frame, next_instr, exc);
|
2022-03-22 12:57:19 +00:00
|
|
|
/* Resume normal execution */
|
|
|
|
DISPATCH();
|
2021-05-07 14:19:19 +00:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2021-08-12 10:47:38 +00:00
|
|
|
|
2021-12-01 12:09:36 +00:00
|
|
|
exit_unwind:
|
|
|
|
assert(_PyErr_Occurred(tstate));
|
2022-10-05 00:34:03 +00:00
|
|
|
_Py_LeaveRecursiveCallPy(tstate);
|
2022-11-10 12:34:57 +00:00
|
|
|
assert(frame != &entry_frame);
|
2022-12-06 14:01:38 +00:00
|
|
|
// GH-99729: We need to unlink the frame *before* clearing it:
|
|
|
|
_PyInterpreterFrame *dying = frame;
|
|
|
|
frame = cframe.current_frame = dying->previous;
|
|
|
|
_PyEvalFrameClearAndPop(tstate, dying);
|
2023-04-13 15:19:07 +00:00
|
|
|
frame->return_offset = 0;
|
2022-11-10 12:34:57 +00:00
|
|
|
if (frame == &entry_frame) {
|
2021-12-01 12:09:36 +00:00
|
|
|
/* Restore previous cframe and exit */
|
|
|
|
tstate->cframe = cframe.previous;
|
|
|
|
assert(tstate->cframe->current_frame == frame->previous);
|
2022-10-05 00:34:03 +00:00
|
|
|
_Py_LeaveRecursiveCallTstate(tstate);
|
2021-12-01 12:09:36 +00:00
|
|
|
return NULL;
|
2021-10-09 15:51:30 +00:00
|
|
|
}
|
2021-12-01 12:09:36 +00:00
|
|
|
|
|
|
|
resume_with_error:
|
|
|
|
SET_LOCALS_FROM_FRAME();
|
|
|
|
goto error;
|
2021-10-09 15:51:30 +00:00
|
|
|
|
2001-06-18 22:08:13 +00:00
|
|
|
}
|
2022-11-22 20:13:54 +00:00
|
|
|
#if defined(__GNUC__)
|
|
|
|
# pragma GCC diagnostic pop
|
|
|
|
#elif defined(_MSC_VER) /* MS_WINDOWS */
|
|
|
|
# pragma warning(pop)
|
|
|
|
#endif
|
2001-06-18 22:08:13 +00:00
|
|
|
|
2011-06-06 03:04:07 +00:00
|
|
|
static void
|
2019-05-24 15:01:38 +00:00
|
|
|
format_missing(PyThreadState *tstate, const char *kind,
|
2020-05-22 20:40:17 +00:00
|
|
|
PyCodeObject *co, PyObject *names, PyObject *qualname)
|
2011-06-24 14:37:26 +00:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
Py_ssize_t len = PyList_GET_SIZE(names);
|
|
|
|
PyObject *name_str, *comma, *tail, *tmp;
|
|
|
|
|
|
|
|
assert(PyList_CheckExact(names));
|
|
|
|
assert(len >= 1);
|
|
|
|
/* Deal with the joys of natural language. */
|
|
|
|
switch (len) {
|
|
|
|
case 1:
|
|
|
|
name_str = PyList_GET_ITEM(names, 0);
|
|
|
|
Py_INCREF(name_str);
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
name_str = PyUnicode_FromFormat("%U and %U",
|
|
|
|
PyList_GET_ITEM(names, len - 2),
|
|
|
|
PyList_GET_ITEM(names, len - 1));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
tail = PyUnicode_FromFormat(", %U, and %U",
|
|
|
|
PyList_GET_ITEM(names, len - 2),
|
|
|
|
PyList_GET_ITEM(names, len - 1));
|
2012-06-01 18:18:22 +00:00
|
|
|
if (tail == NULL)
|
|
|
|
return;
|
2011-06-24 14:37:26 +00:00
|
|
|
/* Chop off the last two objects in the list. This shouldn't actually
|
|
|
|
fail, but we can't be too careful. */
|
|
|
|
err = PyList_SetSlice(names, len - 2, len, NULL);
|
|
|
|
if (err == -1) {
|
|
|
|
Py_DECREF(tail);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* Stitch everything up into a nice comma-separated list. */
|
|
|
|
comma = PyUnicode_FromString(", ");
|
|
|
|
if (comma == NULL) {
|
|
|
|
Py_DECREF(tail);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
tmp = PyUnicode_Join(comma, names);
|
|
|
|
Py_DECREF(comma);
|
|
|
|
if (tmp == NULL) {
|
|
|
|
Py_DECREF(tail);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
name_str = PyUnicode_Concat(tmp, tail);
|
|
|
|
Py_DECREF(tmp);
|
|
|
|
Py_DECREF(tail);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (name_str == NULL)
|
|
|
|
return;
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"%U() missing %i required %s argument%s: %U",
|
2020-05-22 20:40:17 +00:00
|
|
|
qualname,
|
2019-05-24 15:01:38 +00:00
|
|
|
len,
|
|
|
|
kind,
|
|
|
|
len == 1 ? "" : "s",
|
|
|
|
name_str);
|
2011-06-24 14:37:26 +00:00
|
|
|
Py_DECREF(name_str);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2019-05-24 15:01:38 +00:00
|
|
|
missing_arguments(PyThreadState *tstate, PyCodeObject *co,
|
|
|
|
Py_ssize_t missing, Py_ssize_t defcount,
|
2021-06-07 18:22:26 +00:00
|
|
|
PyObject **localsplus, PyObject *qualname)
|
2011-06-24 14:37:26 +00:00
|
|
|
{
|
2016-08-24 22:04:09 +00:00
|
|
|
Py_ssize_t i, j = 0;
|
|
|
|
Py_ssize_t start, end;
|
|
|
|
int positional = (defcount != -1);
|
2011-06-24 14:37:26 +00:00
|
|
|
const char *kind = positional ? "positional" : "keyword-only";
|
|
|
|
PyObject *missing_names;
|
|
|
|
|
|
|
|
/* Compute the names of the arguments that are missing. */
|
|
|
|
missing_names = PyList_New(missing);
|
|
|
|
if (missing_names == NULL)
|
|
|
|
return;
|
|
|
|
if (positional) {
|
|
|
|
start = 0;
|
2019-06-01 17:08:04 +00:00
|
|
|
end = co->co_argcount - defcount;
|
2011-06-24 14:37:26 +00:00
|
|
|
}
|
|
|
|
else {
|
2019-06-01 17:08:04 +00:00
|
|
|
start = co->co_argcount;
|
2011-06-24 14:37:26 +00:00
|
|
|
end = start + co->co_kwonlyargcount;
|
|
|
|
}
|
|
|
|
for (i = start; i < end; i++) {
|
2021-08-25 12:44:20 +00:00
|
|
|
if (localsplus[i] == NULL) {
|
2021-06-07 18:22:26 +00:00
|
|
|
PyObject *raw = PyTuple_GET_ITEM(co->co_localsplusnames, i);
|
2011-06-24 14:37:26 +00:00
|
|
|
PyObject *name = PyObject_Repr(raw);
|
|
|
|
if (name == NULL) {
|
|
|
|
Py_DECREF(missing_names);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
PyList_SET_ITEM(missing_names, j++, name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assert(j == missing);
|
2020-05-22 20:40:17 +00:00
|
|
|
format_missing(tstate, kind, co, missing_names, qualname);
|
2011-06-24 14:37:26 +00:00
|
|
|
Py_DECREF(missing_names);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2019-05-24 15:01:38 +00:00
|
|
|
too_many_positional(PyThreadState *tstate, PyCodeObject *co,
|
2021-01-29 13:24:55 +00:00
|
|
|
Py_ssize_t given, PyObject *defaults,
|
2021-06-07 18:22:26 +00:00
|
|
|
PyObject **localsplus, PyObject *qualname)
|
2011-06-06 03:04:07 +00:00
|
|
|
{
|
|
|
|
int plural;
|
2016-08-24 22:04:09 +00:00
|
|
|
Py_ssize_t kwonly_given = 0;
|
|
|
|
Py_ssize_t i;
|
2011-06-06 03:04:07 +00:00
|
|
|
PyObject *sig, *kwonly_sig;
|
2016-08-24 22:04:09 +00:00
|
|
|
Py_ssize_t co_argcount = co->co_argcount;
|
2011-06-06 03:04:07 +00:00
|
|
|
|
2011-06-24 14:37:26 +00:00
|
|
|
assert((co->co_flags & CO_VARARGS) == 0);
|
|
|
|
/* Count missing keyword-only args. */
|
2019-06-01 17:08:04 +00:00
|
|
|
for (i = co_argcount; i < co_argcount + co->co_kwonlyargcount; i++) {
|
2021-08-25 12:44:20 +00:00
|
|
|
if (localsplus[i] != NULL) {
|
2011-06-06 03:04:07 +00:00
|
|
|
kwonly_given++;
|
2016-08-24 22:04:09 +00:00
|
|
|
}
|
|
|
|
}
|
2021-01-29 13:24:55 +00:00
|
|
|
Py_ssize_t defcount = defaults == NULL ? 0 : PyTuple_GET_SIZE(defaults);
|
2011-06-24 14:37:26 +00:00
|
|
|
if (defcount) {
|
2019-06-01 17:08:04 +00:00
|
|
|
Py_ssize_t atleast = co_argcount - defcount;
|
2011-06-06 03:04:07 +00:00
|
|
|
plural = 1;
|
2019-06-01 17:08:04 +00:00
|
|
|
sig = PyUnicode_FromFormat("from %zd to %zd", atleast, co_argcount);
|
2011-06-06 03:04:07 +00:00
|
|
|
}
|
|
|
|
else {
|
2019-06-01 17:08:04 +00:00
|
|
|
plural = (co_argcount != 1);
|
|
|
|
sig = PyUnicode_FromFormat("%zd", co_argcount);
|
2011-06-06 03:04:07 +00:00
|
|
|
}
|
|
|
|
if (sig == NULL)
|
|
|
|
return;
|
|
|
|
if (kwonly_given) {
|
2016-08-24 22:04:09 +00:00
|
|
|
const char *format = " positional argument%s (and %zd keyword-only argument%s)";
|
|
|
|
kwonly_sig = PyUnicode_FromFormat(format,
|
|
|
|
given != 1 ? "s" : "",
|
|
|
|
kwonly_given,
|
|
|
|
kwonly_given != 1 ? "s" : "");
|
2011-06-06 03:04:07 +00:00
|
|
|
if (kwonly_sig == NULL) {
|
|
|
|
Py_DECREF(sig);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* This will not fail. */
|
|
|
|
kwonly_sig = PyUnicode_FromString("");
|
2011-06-24 14:37:26 +00:00
|
|
|
assert(kwonly_sig != NULL);
|
2011-06-06 03:04:07 +00:00
|
|
|
}
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"%U() takes %U positional argument%s but %zd%U %s given",
|
2020-05-22 20:40:17 +00:00
|
|
|
qualname,
|
2019-05-24 15:01:38 +00:00
|
|
|
sig,
|
|
|
|
plural ? "s" : "",
|
|
|
|
given,
|
|
|
|
kwonly_sig,
|
|
|
|
given == 1 && !kwonly_given ? "was" : "were");
|
2011-06-06 03:04:07 +00:00
|
|
|
Py_DECREF(sig);
|
|
|
|
Py_DECREF(kwonly_sig);
|
|
|
|
}
|
|
|
|
|
2019-04-29 12:36:57 +00:00
|
|
|
static int
|
2019-05-24 15:01:38 +00:00
|
|
|
positional_only_passed_as_keyword(PyThreadState *tstate, PyCodeObject *co,
|
2021-02-01 10:42:03 +00:00
|
|
|
Py_ssize_t kwcount, PyObject* kwnames,
|
2020-05-22 20:40:17 +00:00
|
|
|
PyObject *qualname)
|
2019-04-29 12:36:57 +00:00
|
|
|
{
|
|
|
|
int posonly_conflicts = 0;
|
|
|
|
PyObject* posonly_names = PyList_New(0);
|
2023-02-18 00:52:23 +00:00
|
|
|
if (posonly_names == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
2019-04-29 12:36:57 +00:00
|
|
|
for(int k=0; k < co->co_posonlyargcount; k++){
|
2021-06-07 18:22:26 +00:00
|
|
|
PyObject* posonly_name = PyTuple_GET_ITEM(co->co_localsplusnames, k);
|
2019-04-29 12:36:57 +00:00
|
|
|
|
|
|
|
for (int k2=0; k2<kwcount; k2++){
|
|
|
|
/* Compare the pointers first and fallback to PyObject_RichCompareBool*/
|
2021-02-01 10:42:03 +00:00
|
|
|
PyObject* kwname = PyTuple_GET_ITEM(kwnames, k2);
|
2019-04-29 12:36:57 +00:00
|
|
|
if (kwname == posonly_name){
|
|
|
|
if(PyList_Append(posonly_names, kwname) != 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
posonly_conflicts++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
int cmp = PyObject_RichCompareBool(posonly_name, kwname, Py_EQ);
|
|
|
|
|
|
|
|
if ( cmp > 0) {
|
|
|
|
if(PyList_Append(posonly_names, kwname) != 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
posonly_conflicts++;
|
|
|
|
} else if (cmp < 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (posonly_conflicts) {
|
|
|
|
PyObject* comma = PyUnicode_FromString(", ");
|
|
|
|
if (comma == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
PyObject* error_names = PyUnicode_Join(comma, posonly_names);
|
|
|
|
Py_DECREF(comma);
|
|
|
|
if (error_names == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"%U() got some positional-only arguments passed"
|
|
|
|
" as keyword arguments: '%U'",
|
2020-05-22 20:40:17 +00:00
|
|
|
qualname, error_names);
|
2019-04-29 12:36:57 +00:00
|
|
|
Py_DECREF(error_names);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_DECREF(posonly_names);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
Py_XDECREF(posonly_names);
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2021-05-07 14:19:19 +00:00
|
|
|
|
|
|
|
static inline unsigned char *
|
|
|
|
scan_back_to_entry_start(unsigned char *p) {
|
|
|
|
for (; (p[0]&128) == 0; p--);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned char *
|
2021-05-10 09:10:22 +00:00
|
|
|
skip_to_next_entry(unsigned char *p, unsigned char *end) {
|
|
|
|
while (p < end && ((p[0] & 128) == 0)) {
|
|
|
|
p++;
|
|
|
|
}
|
2021-05-07 14:19:19 +00:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#define MAX_LINEAR_SEARCH 40
|
|
|
|
|
2021-05-12 13:04:38 +00:00
|
|
|
static int
|
|
|
|
get_exception_handler(PyCodeObject *code, int index, int *level, int *handler, int *lasti)
|
2021-05-07 14:19:19 +00:00
|
|
|
{
|
|
|
|
unsigned char *start = (unsigned char *)PyBytes_AS_STRING(code->co_exceptiontable);
|
|
|
|
unsigned char *end = start + PyBytes_GET_SIZE(code->co_exceptiontable);
|
|
|
|
/* Invariants:
|
|
|
|
* start_table == end_table OR
|
|
|
|
* start_table points to a legal entry and end_table points
|
|
|
|
* beyond the table or to a legal entry that is after index.
|
|
|
|
*/
|
|
|
|
if (end - start > MAX_LINEAR_SEARCH) {
|
|
|
|
int offset;
|
|
|
|
parse_varint(start, &offset);
|
|
|
|
if (offset > index) {
|
2021-05-12 13:04:38 +00:00
|
|
|
return 0;
|
2021-05-07 14:19:19 +00:00
|
|
|
}
|
|
|
|
do {
|
|
|
|
unsigned char * mid = start + ((end-start)>>1);
|
|
|
|
mid = scan_back_to_entry_start(mid);
|
|
|
|
parse_varint(mid, &offset);
|
|
|
|
if (offset > index) {
|
|
|
|
end = mid;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
start = mid;
|
|
|
|
}
|
|
|
|
|
|
|
|
} while (end - start > MAX_LINEAR_SEARCH);
|
|
|
|
}
|
|
|
|
unsigned char *scan = start;
|
|
|
|
while (scan < end) {
|
|
|
|
int start_offset, size;
|
|
|
|
scan = parse_varint(scan, &start_offset);
|
|
|
|
if (start_offset > index) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
scan = parse_varint(scan, &size);
|
|
|
|
if (start_offset + size > index) {
|
2021-05-12 13:04:38 +00:00
|
|
|
scan = parse_varint(scan, handler);
|
|
|
|
int depth_and_lasti;
|
|
|
|
parse_varint(scan, &depth_and_lasti);
|
|
|
|
*level = depth_and_lasti >> 1;
|
|
|
|
*lasti = depth_and_lasti & 1;
|
|
|
|
return 1;
|
2021-05-07 14:19:19 +00:00
|
|
|
}
|
2021-05-10 09:10:22 +00:00
|
|
|
scan = skip_to_next_entry(scan, end);
|
2021-05-07 14:19:19 +00:00
|
|
|
}
|
2021-05-12 13:04:38 +00:00
|
|
|
return 0;
|
2021-05-07 14:19:19 +00:00
|
|
|
}
|
2004-03-01 15:44:05 +00:00
|
|
|
|
2021-05-21 09:57:35 +00:00
|
|
|
static int
|
2021-11-23 09:53:24 +00:00
|
|
|
initialize_locals(PyThreadState *tstate, PyFunctionObject *func,
|
2021-06-07 18:22:26 +00:00
|
|
|
PyObject **localsplus, PyObject *const *args,
|
2021-10-28 15:14:59 +00:00
|
|
|
Py_ssize_t argcount, PyObject *kwnames)
|
2001-06-18 22:08:13 +00:00
|
|
|
{
|
2021-11-23 09:53:24 +00:00
|
|
|
PyCodeObject *co = (PyCodeObject*)func->func_code;
|
2019-06-01 17:08:04 +00:00
|
|
|
const Py_ssize_t total_args = co->co_argcount + co->co_kwonlyargcount;
|
2010-05-09 15:52:27 +00:00
|
|
|
|
2016-08-16 21:40:29 +00:00
|
|
|
/* Create a dictionary for keyword parameters (**kwags) */
|
2020-06-04 13:19:02 +00:00
|
|
|
PyObject *kwdict;
|
|
|
|
Py_ssize_t i;
|
2011-06-06 03:04:07 +00:00
|
|
|
if (co->co_flags & CO_VARKEYWORDS) {
|
|
|
|
kwdict = PyDict_New();
|
2021-10-09 15:51:30 +00:00
|
|
|
if (kwdict == NULL) {
|
2021-10-18 08:57:24 +00:00
|
|
|
goto fail_pre_positional;
|
2021-10-09 15:51:30 +00:00
|
|
|
}
|
2011-06-06 03:04:07 +00:00
|
|
|
i = total_args;
|
2016-08-16 21:40:29 +00:00
|
|
|
if (co->co_flags & CO_VARARGS) {
|
2011-06-06 03:04:07 +00:00
|
|
|
i++;
|
2016-08-16 21:40:29 +00:00
|
|
|
}
|
2021-08-25 12:44:20 +00:00
|
|
|
assert(localsplus[i] == NULL);
|
|
|
|
localsplus[i] = kwdict;
|
2011-06-06 03:04:07 +00:00
|
|
|
}
|
2016-08-16 21:40:29 +00:00
|
|
|
else {
|
|
|
|
kwdict = NULL;
|
|
|
|
}
|
|
|
|
|
2019-06-01 17:08:04 +00:00
|
|
|
/* Copy all positional arguments into local variables */
|
2020-06-04 13:19:02 +00:00
|
|
|
Py_ssize_t j, n;
|
2019-06-01 17:08:04 +00:00
|
|
|
if (argcount > co->co_argcount) {
|
|
|
|
n = co->co_argcount;
|
2019-04-29 12:36:57 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
n = argcount;
|
|
|
|
}
|
|
|
|
for (j = 0; j < n; j++) {
|
2020-06-04 13:19:02 +00:00
|
|
|
PyObject *x = args[j];
|
2021-08-25 12:44:20 +00:00
|
|
|
assert(localsplus[j] == NULL);
|
|
|
|
localsplus[j] = x;
|
2019-04-29 12:36:57 +00:00
|
|
|
}
|
|
|
|
|
2016-08-16 21:40:29 +00:00
|
|
|
/* Pack other positional arguments into the *args argument */
|
2011-06-06 03:04:07 +00:00
|
|
|
if (co->co_flags & CO_VARARGS) {
|
2021-10-09 15:51:30 +00:00
|
|
|
PyObject *u = NULL;
|
2022-09-10 00:12:06 +00:00
|
|
|
if (argcount == n) {
|
|
|
|
u = Py_NewRef(&_Py_SINGLETON(tuple_empty));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
assert(args != NULL);
|
|
|
|
u = _PyTuple_FromArraySteal(args + n, argcount - n);
|
|
|
|
}
|
2016-08-16 21:40:29 +00:00
|
|
|
if (u == NULL) {
|
2021-10-18 08:57:24 +00:00
|
|
|
goto fail_post_positional;
|
2016-08-16 21:40:29 +00:00
|
|
|
}
|
2021-08-25 12:44:20 +00:00
|
|
|
assert(localsplus[total_args] == NULL);
|
|
|
|
localsplus[total_args] = u;
|
2011-06-06 03:04:07 +00:00
|
|
|
}
|
2021-10-18 08:57:24 +00:00
|
|
|
else if (argcount > n) {
|
|
|
|
/* Too many postional args. Error is reported later */
|
2021-10-28 15:14:59 +00:00
|
|
|
for (j = n; j < argcount; j++) {
|
|
|
|
Py_DECREF(args[j]);
|
2021-10-18 08:57:24 +00:00
|
|
|
}
|
|
|
|
}
|
2016-08-16 21:40:29 +00:00
|
|
|
|
2021-02-01 10:42:03 +00:00
|
|
|
/* Handle keyword arguments */
|
|
|
|
if (kwnames != NULL) {
|
|
|
|
Py_ssize_t kwcount = PyTuple_GET_SIZE(kwnames);
|
|
|
|
for (i = 0; i < kwcount; i++) {
|
|
|
|
PyObject **co_varnames;
|
|
|
|
PyObject *keyword = PyTuple_GET_ITEM(kwnames, i);
|
|
|
|
PyObject *value = args[i+argcount];
|
|
|
|
Py_ssize_t j;
|
2016-08-16 21:40:29 +00:00
|
|
|
|
2021-02-01 10:42:03 +00:00
|
|
|
if (keyword == NULL || !PyUnicode_Check(keyword)) {
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"%U() keywords must be strings",
|
2021-11-23 09:53:24 +00:00
|
|
|
func->func_qualname);
|
2021-10-18 08:57:24 +00:00
|
|
|
goto kw_fail;
|
2016-08-22 21:17:30 +00:00
|
|
|
}
|
2016-08-16 21:40:29 +00:00
|
|
|
|
2021-02-01 10:42:03 +00:00
|
|
|
/* Speed hack: do raw pointer compares. As names are
|
|
|
|
normally interned this should almost always hit. */
|
2021-06-07 18:22:26 +00:00
|
|
|
co_varnames = ((PyTupleObject *)(co->co_localsplusnames))->ob_item;
|
2021-02-01 10:42:03 +00:00
|
|
|
for (j = co->co_posonlyargcount; j < total_args; j++) {
|
|
|
|
PyObject *varname = co_varnames[j];
|
|
|
|
if (varname == keyword) {
|
|
|
|
goto kw_found;
|
|
|
|
}
|
2016-08-22 21:17:30 +00:00
|
|
|
}
|
2021-02-01 10:42:03 +00:00
|
|
|
|
|
|
|
/* Slow fallback, just in case */
|
|
|
|
for (j = co->co_posonlyargcount; j < total_args; j++) {
|
|
|
|
PyObject *varname = co_varnames[j];
|
|
|
|
int cmp = PyObject_RichCompareBool( keyword, varname, Py_EQ);
|
|
|
|
if (cmp > 0) {
|
|
|
|
goto kw_found;
|
|
|
|
}
|
|
|
|
else if (cmp < 0) {
|
2021-10-18 08:57:24 +00:00
|
|
|
goto kw_fail;
|
2021-02-01 10:42:03 +00:00
|
|
|
}
|
2016-08-22 21:17:30 +00:00
|
|
|
}
|
2016-08-16 21:40:29 +00:00
|
|
|
|
2021-02-01 10:42:03 +00:00
|
|
|
assert(j >= total_args);
|
|
|
|
if (kwdict == NULL) {
|
2019-04-29 12:36:57 +00:00
|
|
|
|
2021-02-01 10:42:03 +00:00
|
|
|
if (co->co_posonlyargcount
|
|
|
|
&& positional_only_passed_as_keyword(tstate, co,
|
|
|
|
kwcount, kwnames,
|
2021-11-23 09:53:24 +00:00
|
|
|
func->func_qualname))
|
2021-02-01 10:42:03 +00:00
|
|
|
{
|
2021-10-18 08:57:24 +00:00
|
|
|
goto kw_fail;
|
2021-02-01 10:42:03 +00:00
|
|
|
}
|
2019-04-29 12:36:57 +00:00
|
|
|
|
2021-02-01 10:42:03 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"%U() got an unexpected keyword argument '%S'",
|
2021-11-23 09:53:24 +00:00
|
|
|
func->func_qualname, keyword);
|
2021-10-18 08:57:24 +00:00
|
|
|
goto kw_fail;
|
2021-02-01 10:42:03 +00:00
|
|
|
}
|
2016-08-16 21:40:29 +00:00
|
|
|
|
2021-02-01 10:42:03 +00:00
|
|
|
if (PyDict_SetItem(kwdict, keyword, value) == -1) {
|
2021-10-18 08:57:24 +00:00
|
|
|
goto kw_fail;
|
2021-02-01 10:42:03 +00:00
|
|
|
}
|
2021-10-28 15:14:59 +00:00
|
|
|
Py_DECREF(value);
|
2021-02-01 10:42:03 +00:00
|
|
|
continue;
|
2016-08-16 21:40:29 +00:00
|
|
|
|
2021-10-18 08:57:24 +00:00
|
|
|
kw_fail:
|
2021-10-28 15:14:59 +00:00
|
|
|
for (;i < kwcount; i++) {
|
|
|
|
PyObject *value = args[i+argcount];
|
|
|
|
Py_DECREF(value);
|
2021-10-18 08:57:24 +00:00
|
|
|
}
|
2021-10-28 15:14:59 +00:00
|
|
|
goto fail_post_args;
|
2021-10-18 08:57:24 +00:00
|
|
|
|
2021-02-01 10:42:03 +00:00
|
|
|
kw_found:
|
2021-08-25 12:44:20 +00:00
|
|
|
if (localsplus[j] != NULL) {
|
2021-02-01 10:42:03 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"%U() got multiple values for argument '%S'",
|
2021-11-23 09:53:24 +00:00
|
|
|
func->func_qualname, keyword);
|
2021-10-18 08:57:24 +00:00
|
|
|
goto kw_fail;
|
2021-02-01 10:42:03 +00:00
|
|
|
}
|
2021-08-25 12:44:20 +00:00
|
|
|
localsplus[j] = value;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2011-06-06 03:04:07 +00:00
|
|
|
}
|
2016-08-16 21:40:29 +00:00
|
|
|
|
|
|
|
/* Check the number of positional arguments */
|
2019-06-01 17:08:04 +00:00
|
|
|
if ((argcount > co->co_argcount) && !(co->co_flags & CO_VARARGS)) {
|
2021-11-23 09:53:24 +00:00
|
|
|
too_many_positional(tstate, co, argcount, func->func_defaults, localsplus,
|
|
|
|
func->func_qualname);
|
2021-10-28 15:14:59 +00:00
|
|
|
goto fail_post_args;
|
2011-06-06 03:04:07 +00:00
|
|
|
}
|
2016-08-16 21:40:29 +00:00
|
|
|
|
|
|
|
/* Add missing positional arguments (copy default values from defs) */
|
2019-06-01 17:08:04 +00:00
|
|
|
if (argcount < co->co_argcount) {
|
2021-11-23 09:53:24 +00:00
|
|
|
Py_ssize_t defcount = func->func_defaults == NULL ? 0 : PyTuple_GET_SIZE(func->func_defaults);
|
2019-06-01 17:08:04 +00:00
|
|
|
Py_ssize_t m = co->co_argcount - defcount;
|
2016-08-16 21:39:42 +00:00
|
|
|
Py_ssize_t missing = 0;
|
|
|
|
for (i = argcount; i < m; i++) {
|
2021-08-25 12:44:20 +00:00
|
|
|
if (localsplus[i] == NULL) {
|
2011-06-24 14:37:26 +00:00
|
|
|
missing++;
|
2016-08-16 21:39:42 +00:00
|
|
|
}
|
|
|
|
}
|
2011-06-24 14:37:26 +00:00
|
|
|
if (missing) {
|
2021-06-07 18:22:26 +00:00
|
|
|
missing_arguments(tstate, co, missing, defcount, localsplus,
|
2021-11-23 09:53:24 +00:00
|
|
|
func->func_qualname);
|
2021-10-28 15:14:59 +00:00
|
|
|
goto fail_post_args;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2011-06-06 03:04:07 +00:00
|
|
|
if (n > m)
|
|
|
|
i = n - m;
|
|
|
|
else
|
|
|
|
i = 0;
|
2021-01-29 13:24:55 +00:00
|
|
|
if (defcount) {
|
2021-11-23 09:53:24 +00:00
|
|
|
PyObject **defs = &PyTuple_GET_ITEM(func->func_defaults, 0);
|
2021-01-29 13:24:55 +00:00
|
|
|
for (; i < defcount; i++) {
|
2021-08-25 12:44:20 +00:00
|
|
|
if (localsplus[m+i] == NULL) {
|
2021-01-29 13:24:55 +00:00
|
|
|
PyObject *def = defs[i];
|
2022-11-10 10:25:33 +00:00
|
|
|
localsplus[m+i] = Py_NewRef(def);
|
2021-01-29 13:24:55 +00:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2011-06-06 03:04:07 +00:00
|
|
|
}
|
|
|
|
}
|
2016-08-16 21:40:29 +00:00
|
|
|
|
|
|
|
/* Add missing keyword arguments (copy default values from kwdefs) */
|
2011-06-06 03:04:07 +00:00
|
|
|
if (co->co_kwonlyargcount > 0) {
|
2016-08-16 21:39:42 +00:00
|
|
|
Py_ssize_t missing = 0;
|
2019-06-01 17:08:04 +00:00
|
|
|
for (i = co->co_argcount; i < total_args; i++) {
|
2021-08-25 12:44:20 +00:00
|
|
|
if (localsplus[i] != NULL)
|
2011-06-06 03:04:07 +00:00
|
|
|
continue;
|
2021-06-07 18:22:26 +00:00
|
|
|
PyObject *varname = PyTuple_GET_ITEM(co->co_localsplusnames, i);
|
2021-11-23 09:53:24 +00:00
|
|
|
if (func->func_kwdefaults != NULL) {
|
|
|
|
PyObject *def = PyDict_GetItemWithError(func->func_kwdefaults, varname);
|
2011-06-06 03:04:07 +00:00
|
|
|
if (def) {
|
2022-11-10 10:25:33 +00:00
|
|
|
localsplus[i] = Py_NewRef(def);
|
2011-06-06 03:04:07 +00:00
|
|
|
continue;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2019-05-24 15:01:38 +00:00
|
|
|
else if (_PyErr_Occurred(tstate)) {
|
2021-10-28 15:14:59 +00:00
|
|
|
goto fail_post_args;
|
2019-02-25 15:59:46 +00:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2011-06-24 14:37:26 +00:00
|
|
|
missing++;
|
|
|
|
}
|
|
|
|
if (missing) {
|
2021-06-07 18:22:26 +00:00
|
|
|
missing_arguments(tstate, co, missing, -1, localsplus,
|
2021-11-23 09:53:24 +00:00
|
|
|
func->func_qualname);
|
2021-10-28 15:14:59 +00:00
|
|
|
goto fail_post_args;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
|
|
|
}
|
2021-05-21 09:57:35 +00:00
|
|
|
return 0;
|
2015-06-04 14:16:51 +00:00
|
|
|
|
2021-10-18 08:57:24 +00:00
|
|
|
fail_pre_positional:
|
2021-10-28 15:14:59 +00:00
|
|
|
for (j = 0; j < argcount; j++) {
|
|
|
|
Py_DECREF(args[j]);
|
2021-10-18 08:57:24 +00:00
|
|
|
}
|
|
|
|
/* fall through */
|
|
|
|
fail_post_positional:
|
2021-10-28 15:14:59 +00:00
|
|
|
if (kwnames) {
|
|
|
|
Py_ssize_t kwcount = PyTuple_GET_SIZE(kwnames);
|
2021-10-18 08:57:24 +00:00
|
|
|
for (j = argcount; j < argcount+kwcount; j++) {
|
|
|
|
Py_DECREF(args[j]);
|
2021-10-13 13:38:41 +00:00
|
|
|
}
|
|
|
|
}
|
2021-10-18 08:57:24 +00:00
|
|
|
/* fall through */
|
2021-10-28 15:14:59 +00:00
|
|
|
fail_post_args:
|
2021-05-21 09:57:35 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2021-12-01 12:09:36 +00:00
|
|
|
static void
|
2022-11-07 14:49:51 +00:00
|
|
|
clear_thread_frame(PyThreadState *tstate, _PyInterpreterFrame * frame)
|
2021-07-26 10:22:16 +00:00
|
|
|
{
|
2022-11-07 14:49:51 +00:00
|
|
|
assert(frame->owner == FRAME_OWNED_BY_THREAD);
|
2022-07-09 01:52:26 +00:00
|
|
|
// Make sure that this is, indeed, the top frame. We can't check this in
|
|
|
|
// _PyThreadState_PopFrame, since f_code is already cleared at that point:
|
|
|
|
assert((PyObject **)frame + frame->f_code->co_framesize ==
|
2022-11-07 14:49:51 +00:00
|
|
|
tstate->datastack_top);
|
2022-10-05 00:34:03 +00:00
|
|
|
tstate->c_recursion_remaining--;
|
2022-03-22 12:57:19 +00:00
|
|
|
assert(frame->frame_obj == NULL || frame->frame_obj->f_frame == frame);
|
2023-02-23 10:19:01 +00:00
|
|
|
_PyFrame_ClearExceptCode(frame);
|
|
|
|
Py_DECREF(frame->f_code);
|
2022-10-05 00:34:03 +00:00
|
|
|
tstate->c_recursion_remaining++;
|
2021-07-26 10:22:16 +00:00
|
|
|
_PyThreadState_PopFrame(tstate, frame);
|
|
|
|
}
|
|
|
|
|
2022-11-07 14:49:51 +00:00
|
|
|
static void
|
|
|
|
clear_gen_frame(PyThreadState *tstate, _PyInterpreterFrame * frame)
|
|
|
|
{
|
|
|
|
assert(frame->owner == FRAME_OWNED_BY_GENERATOR);
|
|
|
|
PyGenObject *gen = _PyFrame_GetGenerator(frame);
|
|
|
|
gen->gi_frame_state = FRAME_CLEARED;
|
|
|
|
assert(tstate->exc_info == &gen->gi_exc_state);
|
|
|
|
tstate->exc_info = gen->gi_exc_state.previous_item;
|
|
|
|
gen->gi_exc_state.previous_item = NULL;
|
|
|
|
tstate->c_recursion_remaining--;
|
|
|
|
assert(frame->frame_obj == NULL || frame->frame_obj->f_frame == frame);
|
2023-02-23 10:19:01 +00:00
|
|
|
_PyFrame_ClearExceptCode(frame);
|
2022-11-07 14:49:51 +00:00
|
|
|
tstate->c_recursion_remaining++;
|
|
|
|
frame->previous = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_PyEvalFrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame * frame)
|
|
|
|
{
|
|
|
|
if (frame->owner == FRAME_OWNED_BY_THREAD) {
|
|
|
|
clear_thread_frame(tstate, frame);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
clear_gen_frame(tstate, frame);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-02-23 10:19:01 +00:00
|
|
|
/* Consumes references to func, locals and all the args */
|
|
|
|
static _PyInterpreterFrame *
|
|
|
|
_PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
|
|
|
|
PyObject *locals, PyObject* const* args,
|
|
|
|
size_t argcount, PyObject *kwnames)
|
|
|
|
{
|
|
|
|
PyCodeObject * code = (PyCodeObject *)func->func_code;
|
|
|
|
CALL_STAT_INC(frames_pushed);
|
|
|
|
_PyInterpreterFrame *frame = _PyThreadState_PushFrame(tstate, code->co_framesize);
|
|
|
|
if (frame == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
_PyFrame_Initialize(frame, func, locals, code, 0);
|
|
|
|
if (initialize_locals(tstate, func, frame->localsplus, args, argcount, kwnames)) {
|
|
|
|
assert(frame->owner == FRAME_OWNED_BY_THREAD);
|
|
|
|
clear_thread_frame(tstate, frame);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return frame;
|
|
|
|
fail:
|
|
|
|
/* Consume the references */
|
|
|
|
for (size_t i = 0; i < argcount; i++) {
|
|
|
|
Py_DECREF(args[i]);
|
|
|
|
}
|
|
|
|
if (kwnames) {
|
|
|
|
Py_ssize_t kwcount = PyTuple_GET_SIZE(kwnames);
|
|
|
|
for (Py_ssize_t i = 0; i < kwcount; i++) {
|
|
|
|
Py_DECREF(args[i+argcount]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
2022-11-07 14:49:51 +00:00
|
|
|
|
2023-04-30 13:08:26 +00:00
|
|
|
/* Same as _PyEvalFramePushAndInit but takes an args tuple and kwargs dict.
|
|
|
|
Steals references to func, callargs and kwargs.
|
|
|
|
*/
|
|
|
|
static _PyInterpreterFrame *
|
|
|
|
_PyEvalFramePushAndInit_Ex(PyThreadState *tstate, PyFunctionObject *func,
|
|
|
|
PyObject *locals, Py_ssize_t nargs, PyObject *callargs, PyObject *kwargs)
|
|
|
|
{
|
|
|
|
bool has_dict = (kwargs != NULL && PyDict_GET_SIZE(kwargs) > 0);
|
|
|
|
PyObject *kwnames = NULL;
|
|
|
|
PyObject *const *newargs;
|
|
|
|
if (has_dict) {
|
|
|
|
newargs = _PyStack_UnpackDict(tstate, _PyTuple_ITEMS(callargs), nargs, kwargs, &kwnames);
|
|
|
|
if (newargs == NULL) {
|
|
|
|
Py_DECREF(func);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
newargs = &PyTuple_GET_ITEM(callargs, 0);
|
|
|
|
/* We need to incref all our args since the new frame steals the references. */
|
|
|
|
for (Py_ssize_t i = 0; i < nargs; ++i) {
|
|
|
|
Py_INCREF(PyTuple_GET_ITEM(callargs, i));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_PyInterpreterFrame *new_frame = _PyEvalFramePushAndInit(
|
|
|
|
tstate, (PyFunctionObject *)func, locals,
|
|
|
|
newargs, nargs, kwnames
|
|
|
|
);
|
|
|
|
if (has_dict) {
|
|
|
|
_PyStack_UnpackDict_FreeNoDecRef(newargs, kwnames);
|
|
|
|
}
|
|
|
|
/* No need to decref func here because the reference has been stolen by
|
|
|
|
_PyEvalFramePushAndInit.
|
|
|
|
*/
|
|
|
|
Py_DECREF(callargs);
|
|
|
|
Py_XDECREF(kwargs);
|
|
|
|
return new_frame;
|
|
|
|
error:
|
|
|
|
Py_DECREF(callargs);
|
|
|
|
Py_XDECREF(kwargs);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2021-02-01 10:42:03 +00:00
|
|
|
PyObject *
|
2021-11-23 09:53:24 +00:00
|
|
|
_PyEval_Vector(PyThreadState *tstate, PyFunctionObject *func,
|
2021-02-01 10:42:03 +00:00
|
|
|
PyObject *locals,
|
|
|
|
PyObject* const* args, size_t argcount,
|
|
|
|
PyObject *kwnames)
|
|
|
|
{
|
2022-02-03 18:36:28 +00:00
|
|
|
/* _PyEvalFramePushAndInit consumes the references
|
2022-06-20 11:59:25 +00:00
|
|
|
* to func, locals and all its arguments */
|
2022-02-03 18:36:28 +00:00
|
|
|
Py_INCREF(func);
|
2022-06-20 11:59:25 +00:00
|
|
|
Py_XINCREF(locals);
|
2021-10-28 15:14:59 +00:00
|
|
|
for (size_t i = 0; i < argcount; i++) {
|
|
|
|
Py_INCREF(args[i]);
|
|
|
|
}
|
|
|
|
if (kwnames) {
|
|
|
|
Py_ssize_t kwcount = PyTuple_GET_SIZE(kwnames);
|
|
|
|
for (Py_ssize_t i = 0; i < kwcount; i++) {
|
|
|
|
Py_INCREF(args[i+argcount]);
|
|
|
|
}
|
|
|
|
}
|
2022-02-25 15:22:00 +00:00
|
|
|
_PyInterpreterFrame *frame = _PyEvalFramePushAndInit(
|
2021-11-23 09:53:24 +00:00
|
|
|
tstate, func, locals, args, argcount, kwnames);
|
2021-07-26 10:22:16 +00:00
|
|
|
if (frame == NULL) {
|
2021-02-01 10:42:03 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2022-05-27 15:31:41 +00:00
|
|
|
EVAL_CALL_STAT_INC(EVAL_CALL_VECTOR);
|
2022-11-10 12:34:57 +00:00
|
|
|
return _PyEval_EvalFrame(tstate, frame, 0);
|
1991-04-04 10:40:29 +00:00
|
|
|
}
|
|
|
|
|
2021-01-29 13:24:55 +00:00
|
|
|
/* Legacy API */
|
2019-11-16 00:03:22 +00:00
|
|
|
PyObject *
|
2021-02-01 10:42:03 +00:00
|
|
|
PyEval_EvalCodeEx(PyObject *_co, PyObject *globals, PyObject *locals,
|
|
|
|
PyObject *const *args, int argcount,
|
|
|
|
PyObject *const *kws, int kwcount,
|
|
|
|
PyObject *const *defs, int defcount,
|
|
|
|
PyObject *kwdefs, PyObject *closure)
|
2019-11-16 00:03:22 +00:00
|
|
|
{
|
2021-02-20 14:17:18 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2022-01-11 23:37:09 +00:00
|
|
|
PyObject *res = NULL;
|
2021-01-29 13:24:55 +00:00
|
|
|
PyObject *defaults = _PyTuple_FromArray(defs, defcount);
|
|
|
|
if (defaults == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2021-03-18 13:51:24 +00:00
|
|
|
PyObject *builtins = _PyEval_BuiltinsFromGlobals(tstate, globals); // borrowed ref
|
2021-01-29 13:24:55 +00:00
|
|
|
if (builtins == NULL) {
|
|
|
|
Py_DECREF(defaults);
|
|
|
|
return NULL;
|
|
|
|
}
|
2021-02-01 10:42:03 +00:00
|
|
|
if (locals == NULL) {
|
|
|
|
locals = globals;
|
|
|
|
}
|
2022-01-11 23:37:09 +00:00
|
|
|
PyObject *kwnames = NULL;
|
2021-02-01 10:42:03 +00:00
|
|
|
PyObject *const *allargs;
|
2022-01-11 23:37:09 +00:00
|
|
|
PyObject **newargs = NULL;
|
|
|
|
PyFunctionObject *func = NULL;
|
2021-02-01 10:42:03 +00:00
|
|
|
if (kwcount == 0) {
|
|
|
|
allargs = args;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
kwnames = PyTuple_New(kwcount);
|
|
|
|
if (kwnames == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
newargs = PyMem_Malloc(sizeof(PyObject *)*(kwcount+argcount));
|
|
|
|
if (newargs == NULL) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
for (int i = 0; i < argcount; i++) {
|
|
|
|
newargs[i] = args[i];
|
|
|
|
}
|
|
|
|
for (int i = 0; i < kwcount; i++) {
|
2022-11-10 10:25:33 +00:00
|
|
|
PyTuple_SET_ITEM(kwnames, i, Py_NewRef(kws[2*i]));
|
2021-02-01 10:42:03 +00:00
|
|
|
newargs[argcount+i] = kws[2*i+1];
|
|
|
|
}
|
|
|
|
allargs = newargs;
|
|
|
|
}
|
2021-01-29 13:24:55 +00:00
|
|
|
PyFrameConstructor constr = {
|
|
|
|
.fc_globals = globals,
|
|
|
|
.fc_builtins = builtins,
|
2021-02-01 10:42:03 +00:00
|
|
|
.fc_name = ((PyCodeObject *)_co)->co_name,
|
|
|
|
.fc_qualname = ((PyCodeObject *)_co)->co_name,
|
2021-01-29 13:24:55 +00:00
|
|
|
.fc_code = _co,
|
|
|
|
.fc_defaults = defaults,
|
|
|
|
.fc_kwdefaults = kwdefs,
|
|
|
|
.fc_closure = closure
|
|
|
|
};
|
2022-01-11 23:37:09 +00:00
|
|
|
func = _PyFunction_FromConstructor(&constr);
|
2021-11-23 09:53:24 +00:00
|
|
|
if (func == NULL) {
|
2022-01-11 23:37:09 +00:00
|
|
|
goto fail;
|
2021-11-23 09:53:24 +00:00
|
|
|
}
|
2022-05-27 15:31:41 +00:00
|
|
|
EVAL_CALL_STAT_INC(EVAL_CALL_LEGACY);
|
2021-11-23 09:53:24 +00:00
|
|
|
res = _PyEval_Vector(tstate, func, locals,
|
2021-02-18 18:20:16 +00:00
|
|
|
allargs, argcount,
|
|
|
|
kwnames);
|
2021-02-01 10:42:03 +00:00
|
|
|
fail:
|
2022-01-11 23:37:09 +00:00
|
|
|
Py_XDECREF(func);
|
|
|
|
Py_XDECREF(kwnames);
|
|
|
|
PyMem_Free(newargs);
|
2021-01-29 13:24:55 +00:00
|
|
|
Py_DECREF(defaults);
|
|
|
|
return res;
|
2019-11-16 00:03:22 +00:00
|
|
|
}
|
|
|
|
|
2001-06-18 22:08:13 +00:00
|
|
|
|
1996-12-10 18:07:35 +00:00
|
|
|
/* Logic for the raise statement (too complicated for inlining).
|
|
|
|
This *consumes* a reference count to each of its arguments. */
|
2012-10-12 15:34:51 +00:00
|
|
|
static int
|
2019-05-10 21:39:09 +00:00
|
|
|
do_raise(PyThreadState *tstate, PyObject *exc, PyObject *cause)
|
1996-12-10 18:07:35 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
PyObject *type = NULL, *value = NULL;
|
|
|
|
|
|
|
|
if (exc == NULL) {
|
|
|
|
/* Reraise */
|
2017-10-22 21:41:51 +00:00
|
|
|
_PyErr_StackItem *exc_info = _PyErr_GetTopmostException(tstate);
|
2023-03-13 15:56:24 +00:00
|
|
|
exc = exc_info->exc_value;
|
|
|
|
if (Py_IsNone(exc) || exc == NULL) {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_SetString(tstate, PyExc_RuntimeError,
|
|
|
|
"No active exception to reraise");
|
2012-10-12 15:34:51 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2023-03-13 15:56:24 +00:00
|
|
|
Py_INCREF(exc);
|
|
|
|
assert(PyExceptionInstance_Check(exc));
|
|
|
|
_PyErr_SetRaisedException(tstate, exc);
|
2012-10-12 15:34:51 +00:00
|
|
|
return 1;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* We support the following forms of raise:
|
|
|
|
raise
|
2007-08-31 00:04:24 +00:00
|
|
|
raise <instance>
|
|
|
|
raise <type> */
|
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
if (PyExceptionClass_Check(exc)) {
|
|
|
|
type = exc;
|
2021-10-11 22:42:23 +00:00
|
|
|
value = _PyObject_CallNoArgs(exc);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (value == NULL)
|
|
|
|
goto raise_error;
|
2011-07-15 19:09:26 +00:00
|
|
|
if (!PyExceptionInstance_Check(value)) {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"calling %R should have returned an instance of "
|
|
|
|
"BaseException, not %R",
|
|
|
|
type, Py_TYPE(value));
|
|
|
|
goto raise_error;
|
2011-07-15 19:09:26 +00:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
|
|
|
else if (PyExceptionInstance_Check(exc)) {
|
|
|
|
value = exc;
|
|
|
|
type = PyExceptionInstance_Class(exc);
|
|
|
|
Py_INCREF(type);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Not something you can raise. You get an exception
|
|
|
|
anyway, just not what you specified :-) */
|
|
|
|
Py_DECREF(exc);
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
"exceptions must derive from BaseException");
|
2010-05-09 15:52:27 +00:00
|
|
|
goto raise_error;
|
|
|
|
}
|
|
|
|
|
2016-09-27 08:37:10 +00:00
|
|
|
assert(type != NULL);
|
|
|
|
assert(value != NULL);
|
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
if (cause) {
|
|
|
|
PyObject *fixed_cause;
|
|
|
|
if (PyExceptionClass_Check(cause)) {
|
2021-10-11 22:42:23 +00:00
|
|
|
fixed_cause = _PyObject_CallNoArgs(cause);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (fixed_cause == NULL)
|
|
|
|
goto raise_error;
|
2012-05-15 05:09:31 +00:00
|
|
|
Py_DECREF(cause);
|
|
|
|
}
|
|
|
|
else if (PyExceptionInstance_Check(cause)) {
|
2010-05-09 15:52:27 +00:00
|
|
|
fixed_cause = cause;
|
|
|
|
}
|
2021-04-10 22:17:39 +00:00
|
|
|
else if (Py_IsNone(cause)) {
|
2012-05-15 05:09:31 +00:00
|
|
|
Py_DECREF(cause);
|
|
|
|
fixed_cause = NULL;
|
|
|
|
}
|
|
|
|
else {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
"exception causes must derive from "
|
|
|
|
"BaseException");
|
2010-05-09 15:52:27 +00:00
|
|
|
goto raise_error;
|
|
|
|
}
|
2012-05-15 05:09:31 +00:00
|
|
|
PyException_SetCause(value, fixed_cause);
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
|
|
|
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_SetObject(tstate, type, value);
|
2020-01-28 02:37:45 +00:00
|
|
|
/* _PyErr_SetObject incref's its arguments */
|
2016-09-27 08:37:10 +00:00
|
|
|
Py_DECREF(value);
|
|
|
|
Py_DECREF(type);
|
2012-10-12 15:34:51 +00:00
|
|
|
return 0;
|
2007-08-31 00:04:24 +00:00
|
|
|
|
|
|
|
raise_error:
|
2010-05-09 15:52:27 +00:00
|
|
|
Py_XDECREF(value);
|
|
|
|
Py_XDECREF(type);
|
|
|
|
Py_XDECREF(cause);
|
2012-10-12 15:34:51 +00:00
|
|
|
return 0;
|
1996-12-10 18:07:35 +00:00
|
|
|
}
|
|
|
|
|
2021-12-14 16:48:15 +00:00
|
|
|
/* Logic for matching an exception in an except* clause (too
|
|
|
|
complicated for inlining).
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
2021-12-17 14:46:22 +00:00
|
|
|
exception_group_match(PyObject* exc_value, PyObject *match_type,
|
|
|
|
PyObject **match, PyObject **rest)
|
2021-12-14 16:48:15 +00:00
|
|
|
{
|
2021-12-17 14:46:22 +00:00
|
|
|
if (Py_IsNone(exc_value)) {
|
2021-12-14 16:48:15 +00:00
|
|
|
*match = Py_NewRef(Py_None);
|
|
|
|
*rest = Py_NewRef(Py_None);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
assert(PyExceptionInstance_Check(exc_value));
|
|
|
|
|
2021-12-17 14:46:22 +00:00
|
|
|
if (PyErr_GivenExceptionMatches(exc_value, match_type)) {
|
2021-12-14 16:48:15 +00:00
|
|
|
/* Full match of exc itself */
|
|
|
|
bool is_eg = _PyBaseExceptionGroup_Check(exc_value);
|
|
|
|
if (is_eg) {
|
|
|
|
*match = Py_NewRef(exc_value);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* naked exception - wrap it */
|
|
|
|
PyObject *excs = PyTuple_Pack(1, exc_value);
|
|
|
|
if (excs == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
PyObject *wrapped = _PyExc_CreateExceptionGroup("", excs);
|
|
|
|
Py_DECREF(excs);
|
|
|
|
if (wrapped == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*match = wrapped;
|
|
|
|
}
|
|
|
|
*rest = Py_NewRef(Py_None);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* exc_value does not match match_type.
|
|
|
|
* Check for partial match if it's an exception group.
|
|
|
|
*/
|
|
|
|
if (_PyBaseExceptionGroup_Check(exc_value)) {
|
|
|
|
PyObject *pair = PyObject_CallMethod(exc_value, "split", "(O)",
|
|
|
|
match_type);
|
|
|
|
if (pair == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
assert(PyTuple_CheckExact(pair));
|
|
|
|
assert(PyTuple_GET_SIZE(pair) == 2);
|
|
|
|
*match = Py_NewRef(PyTuple_GET_ITEM(pair, 0));
|
|
|
|
*rest = Py_NewRef(PyTuple_GET_ITEM(pair, 1));
|
|
|
|
Py_DECREF(pair);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* no match */
|
|
|
|
*match = Py_NewRef(Py_None);
|
2023-01-24 09:43:16 +00:00
|
|
|
*rest = Py_NewRef(exc_value);
|
2021-12-14 16:48:15 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-06-21 02:49:55 +00:00
|
|
|
/* Iterate v argcnt times and store the results on the stack (via decreasing
|
Merged revisions 55225-55227,55229-55269 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55238 | guido.van.rossum | 2007-05-10 16:46:05 -0700 (Thu, 10 May 2007) | 9 lines
Merged revisions 55227 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55227 | guido.van.rossum | 2007-05-10 10:20:15 -0700 (Thu, 10 May 2007) | 2 lines
Fix a bug in test_c_api() that caused a negative refcount.
........
................
r55246 | neal.norwitz | 2007-05-11 00:01:52 -0700 (Fri, 11 May 2007) | 1 line
Remove commands.getstatus() it is obsolete.
................
r55248 | neal.norwitz | 2007-05-11 00:29:05 -0700 (Fri, 11 May 2007) | 2 lines
Remove bsddb185 support.
................
r55249 | neal.norwitz | 2007-05-11 00:29:50 -0700 (Fri, 11 May 2007) | 1 line
Remove bsddb185 module too
................
r55250 | neal.norwitz | 2007-05-11 00:32:13 -0700 (Fri, 11 May 2007) | 1 line
bsddb185: Gotta remove from the file checked in, not Setup
................
r55251 | neal.norwitz | 2007-05-11 00:53:26 -0700 (Fri, 11 May 2007) | 1 line
Remove obsolete IRIX modules (as much as I could find, there is probably more)
................
r55252 | neal.norwitz | 2007-05-11 00:55:35 -0700 (Fri, 11 May 2007) | 1 line
Remove SGI turd.
................
r55254 | georg.brandl | 2007-05-11 03:11:01 -0700 (Fri, 11 May 2007) | 2 lines
Add a case for set comprehensions to the "cannot assign to" switch.
................
r55255 | georg.brandl | 2007-05-11 03:11:25 -0700 (Fri, 11 May 2007) | 2 lines
Fix wrong imports.
................
r55261 | georg.brandl | 2007-05-11 07:37:48 -0700 (Fri, 11 May 2007) | 2 lines
Remove removed tex files.
................
r55262 | georg.brandl | 2007-05-11 08:28:41 -0700 (Fri, 11 May 2007) | 2 lines
Commit PEP 3132 implementation.
................
r55264 | georg.brandl | 2007-05-11 08:50:19 -0700 (Fri, 11 May 2007) | 2 lines
Check in the inevitable AST version number and format Py_ssize_t with %zd.
................
r55265 | neal.norwitz | 2007-05-11 09:12:22 -0700 (Fri, 11 May 2007) | 1 line
Remove mention of os.popen* and popen2.* since these will be removed.
................
r55266 | neal.norwitz | 2007-05-11 09:19:57 -0700 (Fri, 11 May 2007) | 1 line
Get doc to build again (almost, the doc is fine)
................
r55267 | neal.norwitz | 2007-05-11 09:21:02 -0700 (Fri, 11 May 2007) | 1 line
Really get doc to build (remove use of string module)
................
r55269 | neal.norwitz | 2007-05-11 09:29:43 -0700 (Fri, 11 May 2007) | 1 line
Add some notes to cleanup later
................
2007-05-11 16:50:42 +00:00
|
|
|
sp). Return 1 for success, 0 if error.
|
2008-07-25 22:39:39 +00:00
|
|
|
|
Merged revisions 55225-55227,55229-55269 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55238 | guido.van.rossum | 2007-05-10 16:46:05 -0700 (Thu, 10 May 2007) | 9 lines
Merged revisions 55227 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55227 | guido.van.rossum | 2007-05-10 10:20:15 -0700 (Thu, 10 May 2007) | 2 lines
Fix a bug in test_c_api() that caused a negative refcount.
........
................
r55246 | neal.norwitz | 2007-05-11 00:01:52 -0700 (Fri, 11 May 2007) | 1 line
Remove commands.getstatus() it is obsolete.
................
r55248 | neal.norwitz | 2007-05-11 00:29:05 -0700 (Fri, 11 May 2007) | 2 lines
Remove bsddb185 support.
................
r55249 | neal.norwitz | 2007-05-11 00:29:50 -0700 (Fri, 11 May 2007) | 1 line
Remove bsddb185 module too
................
r55250 | neal.norwitz | 2007-05-11 00:32:13 -0700 (Fri, 11 May 2007) | 1 line
bsddb185: Gotta remove from the file checked in, not Setup
................
r55251 | neal.norwitz | 2007-05-11 00:53:26 -0700 (Fri, 11 May 2007) | 1 line
Remove obsolete IRIX modules (as much as I could find, there is probably more)
................
r55252 | neal.norwitz | 2007-05-11 00:55:35 -0700 (Fri, 11 May 2007) | 1 line
Remove SGI turd.
................
r55254 | georg.brandl | 2007-05-11 03:11:01 -0700 (Fri, 11 May 2007) | 2 lines
Add a case for set comprehensions to the "cannot assign to" switch.
................
r55255 | georg.brandl | 2007-05-11 03:11:25 -0700 (Fri, 11 May 2007) | 2 lines
Fix wrong imports.
................
r55261 | georg.brandl | 2007-05-11 07:37:48 -0700 (Fri, 11 May 2007) | 2 lines
Remove removed tex files.
................
r55262 | georg.brandl | 2007-05-11 08:28:41 -0700 (Fri, 11 May 2007) | 2 lines
Commit PEP 3132 implementation.
................
r55264 | georg.brandl | 2007-05-11 08:50:19 -0700 (Fri, 11 May 2007) | 2 lines
Check in the inevitable AST version number and format Py_ssize_t with %zd.
................
r55265 | neal.norwitz | 2007-05-11 09:12:22 -0700 (Fri, 11 May 2007) | 1 line
Remove mention of os.popen* and popen2.* since these will be removed.
................
r55266 | neal.norwitz | 2007-05-11 09:19:57 -0700 (Fri, 11 May 2007) | 1 line
Get doc to build again (almost, the doc is fine)
................
r55267 | neal.norwitz | 2007-05-11 09:21:02 -0700 (Fri, 11 May 2007) | 1 line
Really get doc to build (remove use of string module)
................
r55269 | neal.norwitz | 2007-05-11 09:29:43 -0700 (Fri, 11 May 2007) | 1 line
Add some notes to cleanup later
................
2007-05-11 16:50:42 +00:00
|
|
|
If argcntafter == -1, do a simple unpack. If it is >= 0, do an unpack
|
|
|
|
with a variable target.
|
|
|
|
*/
|
2001-06-21 02:49:55 +00:00
|
|
|
|
1997-08-25 22:13:04 +00:00
|
|
|
static int
|
2019-05-24 15:01:38 +00:00
|
|
|
unpack_iterable(PyThreadState *tstate, PyObject *v,
|
|
|
|
int argcnt, int argcntafter, PyObject **sp)
|
1997-08-25 22:13:04 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
int i = 0, j = 0;
|
|
|
|
Py_ssize_t ll = 0;
|
|
|
|
PyObject *it; /* iter(v) */
|
|
|
|
PyObject *w;
|
|
|
|
PyObject *l = NULL; /* variable list */
|
|
|
|
|
|
|
|
assert(v != NULL);
|
|
|
|
|
|
|
|
it = PyObject_GetIter(v);
|
2017-12-26 10:30:41 +00:00
|
|
|
if (it == NULL) {
|
2019-05-24 15:01:38 +00:00
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError) &&
|
2020-02-07 01:24:48 +00:00
|
|
|
Py_TYPE(v)->tp_iter == NULL && !PySequence_Check(v))
|
2017-12-26 10:30:41 +00:00
|
|
|
{
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"cannot unpack non-iterable %.200s object",
|
2020-02-07 01:24:48 +00:00
|
|
|
Py_TYPE(v)->tp_name);
|
2017-12-26 10:30:41 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
|
|
|
|
for (; i < argcnt; i++) {
|
|
|
|
w = PyIter_Next(it);
|
|
|
|
if (w == NULL) {
|
|
|
|
/* Iterator done, via error or exhaustion. */
|
2019-05-24 15:01:38 +00:00
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
2015-04-15 21:08:45 +00:00
|
|
|
if (argcntafter == -1) {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_ValueError,
|
|
|
|
"not enough values to unpack "
|
|
|
|
"(expected %d, got %d)",
|
|
|
|
argcnt, i);
|
2015-04-15 21:08:45 +00:00
|
|
|
}
|
|
|
|
else {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_ValueError,
|
|
|
|
"not enough values to unpack "
|
|
|
|
"(expected at least %d, got %d)",
|
|
|
|
argcnt + argcntafter, i);
|
2015-04-15 21:08:45 +00:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
|
|
|
goto Error;
|
|
|
|
}
|
|
|
|
*--sp = w;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argcntafter == -1) {
|
|
|
|
/* We better have exhausted the iterator now. */
|
|
|
|
w = PyIter_Next(it);
|
|
|
|
if (w == NULL) {
|
2019-05-24 15:01:38 +00:00
|
|
|
if (_PyErr_Occurred(tstate))
|
2010-05-09 15:52:27 +00:00
|
|
|
goto Error;
|
|
|
|
Py_DECREF(it);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
Py_DECREF(w);
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_ValueError,
|
|
|
|
"too many values to unpack (expected %d)",
|
|
|
|
argcnt);
|
2010-05-09 15:52:27 +00:00
|
|
|
goto Error;
|
|
|
|
}
|
|
|
|
|
|
|
|
l = PySequence_List(it);
|
|
|
|
if (l == NULL)
|
|
|
|
goto Error;
|
|
|
|
*--sp = l;
|
|
|
|
i++;
|
|
|
|
|
|
|
|
ll = PyList_GET_SIZE(l);
|
|
|
|
if (ll < argcntafter) {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_ValueError,
|
2015-04-15 21:08:45 +00:00
|
|
|
"not enough values to unpack (expected at least %d, got %zd)",
|
|
|
|
argcnt + argcntafter, argcnt + ll);
|
2010-05-09 15:52:27 +00:00
|
|
|
goto Error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Pop the "after-variable" args off the list. */
|
|
|
|
for (j = argcntafter; j > 0; j--, i++) {
|
|
|
|
*--sp = PyList_GET_ITEM(l, ll - j);
|
|
|
|
}
|
|
|
|
/* Resize the list. */
|
2020-02-07 22:18:08 +00:00
|
|
|
Py_SET_SIZE(l, ll - argcntafter);
|
2010-05-09 15:52:27 +00:00
|
|
|
Py_DECREF(it);
|
|
|
|
return 1;
|
Merged revisions 55225-55227,55229-55269 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55238 | guido.van.rossum | 2007-05-10 16:46:05 -0700 (Thu, 10 May 2007) | 9 lines
Merged revisions 55227 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55227 | guido.van.rossum | 2007-05-10 10:20:15 -0700 (Thu, 10 May 2007) | 2 lines
Fix a bug in test_c_api() that caused a negative refcount.
........
................
r55246 | neal.norwitz | 2007-05-11 00:01:52 -0700 (Fri, 11 May 2007) | 1 line
Remove commands.getstatus() it is obsolete.
................
r55248 | neal.norwitz | 2007-05-11 00:29:05 -0700 (Fri, 11 May 2007) | 2 lines
Remove bsddb185 support.
................
r55249 | neal.norwitz | 2007-05-11 00:29:50 -0700 (Fri, 11 May 2007) | 1 line
Remove bsddb185 module too
................
r55250 | neal.norwitz | 2007-05-11 00:32:13 -0700 (Fri, 11 May 2007) | 1 line
bsddb185: Gotta remove from the file checked in, not Setup
................
r55251 | neal.norwitz | 2007-05-11 00:53:26 -0700 (Fri, 11 May 2007) | 1 line
Remove obsolete IRIX modules (as much as I could find, there is probably more)
................
r55252 | neal.norwitz | 2007-05-11 00:55:35 -0700 (Fri, 11 May 2007) | 1 line
Remove SGI turd.
................
r55254 | georg.brandl | 2007-05-11 03:11:01 -0700 (Fri, 11 May 2007) | 2 lines
Add a case for set comprehensions to the "cannot assign to" switch.
................
r55255 | georg.brandl | 2007-05-11 03:11:25 -0700 (Fri, 11 May 2007) | 2 lines
Fix wrong imports.
................
r55261 | georg.brandl | 2007-05-11 07:37:48 -0700 (Fri, 11 May 2007) | 2 lines
Remove removed tex files.
................
r55262 | georg.brandl | 2007-05-11 08:28:41 -0700 (Fri, 11 May 2007) | 2 lines
Commit PEP 3132 implementation.
................
r55264 | georg.brandl | 2007-05-11 08:50:19 -0700 (Fri, 11 May 2007) | 2 lines
Check in the inevitable AST version number and format Py_ssize_t with %zd.
................
r55265 | neal.norwitz | 2007-05-11 09:12:22 -0700 (Fri, 11 May 2007) | 1 line
Remove mention of os.popen* and popen2.* since these will be removed.
................
r55266 | neal.norwitz | 2007-05-11 09:19:57 -0700 (Fri, 11 May 2007) | 1 line
Get doc to build again (almost, the doc is fine)
................
r55267 | neal.norwitz | 2007-05-11 09:21:02 -0700 (Fri, 11 May 2007) | 1 line
Really get doc to build (remove use of string module)
................
r55269 | neal.norwitz | 2007-05-11 09:29:43 -0700 (Fri, 11 May 2007) | 1 line
Add some notes to cleanup later
................
2007-05-11 16:50:42 +00:00
|
|
|
|
2001-06-21 02:49:55 +00:00
|
|
|
Error:
|
2010-05-09 15:52:27 +00:00
|
|
|
for (; i > 0; i--, sp++)
|
|
|
|
Py_DECREF(*sp);
|
|
|
|
Py_XDECREF(it);
|
|
|
|
return 0;
|
1997-08-25 22:13:04 +00:00
|
|
|
}
|
|
|
|
|
2023-04-12 11:04:55 +00:00
|
|
|
static int
|
|
|
|
do_monitor_exc(PyThreadState *tstate, _PyInterpreterFrame *frame,
|
|
|
|
_Py_CODEUNIT *instr, int event)
|
1992-03-23 18:19:28 +00:00
|
|
|
{
|
2023-04-12 11:04:55 +00:00
|
|
|
assert(event < PY_MONITORING_UNGROUPED_EVENTS);
|
|
|
|
PyObject *exc = PyErr_GetRaisedException();
|
|
|
|
assert(exc != NULL);
|
|
|
|
int err = _Py_call_instrumentation_arg(tstate, event, frame, instr, exc);
|
|
|
|
if (err == 0) {
|
|
|
|
PyErr_SetRaisedException(exc);
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2023-04-12 11:04:55 +00:00
|
|
|
else {
|
|
|
|
Py_DECREF(exc);
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2023-04-12 11:04:55 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
no_tools_for_event(PyThreadState *tstate, _PyInterpreterFrame *frame, int event)
|
|
|
|
{
|
|
|
|
_PyCoMonitoringData *data = frame->f_code->_co_monitoring;
|
|
|
|
if (data) {
|
|
|
|
if (data->active_monitors.tools[event] == 0) {
|
|
|
|
return 1;
|
|
|
|
}
|
2019-05-24 15:01:38 +00:00
|
|
|
}
|
2010-05-09 15:52:27 +00:00
|
|
|
else {
|
2023-04-12 11:04:55 +00:00
|
|
|
if (tstate->interp->monitors.tools[event] == 0) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
monitor_raise(PyThreadState *tstate, _PyInterpreterFrame *frame,
|
|
|
|
_Py_CODEUNIT *instr)
|
|
|
|
{
|
|
|
|
if (no_tools_for_event(tstate, frame, PY_MONITORING_EVENT_RAISE)) {
|
|
|
|
return;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2023-04-12 11:04:55 +00:00
|
|
|
do_monitor_exc(tstate, frame, instr, PY_MONITORING_EVENT_RAISE);
|
1992-03-23 18:19:28 +00:00
|
|
|
}
|
|
|
|
|
2007-11-13 01:05:30 +00:00
|
|
|
static int
|
2023-04-12 11:04:55 +00:00
|
|
|
monitor_stop_iteration(PyThreadState *tstate, _PyInterpreterFrame *frame,
|
|
|
|
_Py_CODEUNIT *instr)
|
2001-10-04 19:26:43 +00:00
|
|
|
{
|
2023-04-12 11:04:55 +00:00
|
|
|
if (no_tools_for_event(tstate, frame, PY_MONITORING_EVENT_STOP_ITERATION)) {
|
2010-05-09 15:52:27 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2023-04-12 11:04:55 +00:00
|
|
|
return do_monitor_exc(tstate, frame, instr, PY_MONITORING_EVENT_STOP_ITERATION);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
monitor_unwind(PyThreadState *tstate,
|
|
|
|
_PyInterpreterFrame *frame,
|
|
|
|
_Py_CODEUNIT *instr)
|
|
|
|
{
|
|
|
|
if (no_tools_for_event(tstate, frame, PY_MONITORING_EVENT_PY_UNWIND)) {
|
|
|
|
return;
|
2010-05-09 15:52:27 +00:00
|
|
|
}
|
2023-04-12 11:04:55 +00:00
|
|
|
_Py_call_instrumentation_exc0(tstate, PY_MONITORING_EVENT_PY_UNWIND, frame, instr);
|
2001-10-04 19:26:43 +00:00
|
|
|
}
|
|
|
|
|
2023-04-12 11:04:55 +00:00
|
|
|
|
2021-03-05 14:45:50 +00:00
|
|
|
static void
|
2023-04-12 11:04:55 +00:00
|
|
|
monitor_handled(PyThreadState *tstate,
|
|
|
|
_PyInterpreterFrame *frame,
|
|
|
|
_Py_CODEUNIT *instr, PyObject *exc)
|
2021-03-05 14:45:50 +00:00
|
|
|
{
|
2023-04-12 11:04:55 +00:00
|
|
|
if (no_tools_for_event(tstate, frame, PY_MONITORING_EVENT_EXCEPTION_HANDLED)) {
|
|
|
|
return;
|
2021-03-05 14:45:50 +00:00
|
|
|
}
|
2023-04-12 11:04:55 +00:00
|
|
|
_Py_call_instrumentation_arg(tstate, PY_MONITORING_EVENT_EXCEPTION_HANDLED, frame, instr, exc);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
monitor_throw(PyThreadState *tstate,
|
|
|
|
_PyInterpreterFrame *frame,
|
|
|
|
_Py_CODEUNIT *instr)
|
|
|
|
{
|
|
|
|
if (no_tools_for_event(tstate, frame, PY_MONITORING_EVENT_PY_THROW)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
_Py_call_instrumentation_exc0(tstate, PY_MONITORING_EVENT_PY_THROW, frame, instr);
|
2021-03-05 14:45:50 +00:00
|
|
|
}
|
|
|
|
|
2022-03-15 17:06:21 +00:00
|
|
|
void
|
|
|
|
PyThreadState_EnterTracing(PyThreadState *tstate)
|
|
|
|
{
|
2023-04-12 11:04:55 +00:00
|
|
|
assert(tstate->tracing >= 0);
|
2022-03-15 17:06:21 +00:00
|
|
|
tstate->tracing++;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
PyThreadState_LeaveTracing(PyThreadState *tstate)
|
|
|
|
{
|
2023-04-12 11:04:55 +00:00
|
|
|
assert(tstate->tracing > 0);
|
2022-03-15 17:06:21 +00:00
|
|
|
tstate->tracing--;
|
|
|
|
}
|
|
|
|
|
1992-01-12 02:29:51 +00:00
|
|
|
|
2022-03-21 02:03:22 +00:00
|
|
|
PyObject*
|
2003-04-09 19:06:21 +00:00
|
|
|
_PyEval_CallTracing(PyObject *func, PyObject *args)
|
|
|
|
{
|
2022-03-21 02:03:22 +00:00
|
|
|
// Save and disable tracing
|
2018-11-01 00:51:40 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2010-05-09 15:52:27 +00:00
|
|
|
int save_tracing = tstate->tracing;
|
|
|
|
tstate->tracing = 0;
|
2022-03-21 02:03:22 +00:00
|
|
|
|
|
|
|
// Call the tracing function
|
|
|
|
PyObject *result = PyObject_Call(func, args, NULL);
|
|
|
|
|
|
|
|
// Restore tracing
|
2010-05-09 15:52:27 +00:00
|
|
|
tstate->tracing = save_tracing;
|
|
|
|
return result;
|
2003-04-09 19:06:21 +00:00
|
|
|
}
|
|
|
|
|
2001-06-27 19:19:46 +00:00
|
|
|
void
|
2020-03-13 15:39:12 +00:00
|
|
|
PyEval_SetProfile(Py_tracefunc func, PyObject *arg)
|
|
|
|
{
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2020-03-16 16:41:44 +00:00
|
|
|
if (_PyEval_SetProfile(tstate, func, arg) < 0) {
|
2020-03-27 14:11:45 +00:00
|
|
|
/* Log _PySys_Audit() error */
|
2020-03-16 16:41:44 +00:00
|
|
|
_PyErr_WriteUnraisableMsg("in PyEval_SetProfile", NULL);
|
|
|
|
}
|
2020-03-13 15:39:12 +00:00
|
|
|
}
|
|
|
|
|
2022-08-24 22:21:39 +00:00
|
|
|
void
|
|
|
|
PyEval_SetProfileAllThreads(Py_tracefunc func, PyObject *arg)
|
|
|
|
{
|
|
|
|
PyThreadState *this_tstate = _PyThreadState_GET();
|
|
|
|
PyInterpreterState* interp = this_tstate->interp;
|
|
|
|
|
|
|
|
_PyRuntimeState *runtime = &_PyRuntime;
|
|
|
|
HEAD_LOCK(runtime);
|
|
|
|
PyThreadState* ts = PyInterpreterState_ThreadHead(interp);
|
|
|
|
HEAD_UNLOCK(runtime);
|
|
|
|
|
|
|
|
while (ts) {
|
|
|
|
if (_PyEval_SetProfile(ts, func, arg) < 0) {
|
|
|
|
_PyErr_WriteUnraisableMsg("in PyEval_SetProfileAllThreads", NULL);
|
|
|
|
}
|
|
|
|
HEAD_LOCK(runtime);
|
|
|
|
ts = PyThreadState_Next(ts);
|
|
|
|
HEAD_UNLOCK(runtime);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-13 15:39:12 +00:00
|
|
|
void
|
|
|
|
PyEval_SetTrace(Py_tracefunc func, PyObject *arg)
|
|
|
|
{
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2020-03-16 16:41:44 +00:00
|
|
|
if (_PyEval_SetTrace(tstate, func, arg) < 0) {
|
2020-03-27 14:11:45 +00:00
|
|
|
/* Log _PySys_Audit() error */
|
2020-03-16 16:41:44 +00:00
|
|
|
_PyErr_WriteUnraisableMsg("in PyEval_SetTrace", NULL);
|
|
|
|
}
|
2001-06-16 21:02:31 +00:00
|
|
|
}
|
|
|
|
|
2022-08-24 22:21:39 +00:00
|
|
|
void
|
|
|
|
PyEval_SetTraceAllThreads(Py_tracefunc func, PyObject *arg)
|
|
|
|
{
|
|
|
|
PyThreadState *this_tstate = _PyThreadState_GET();
|
|
|
|
PyInterpreterState* interp = this_tstate->interp;
|
|
|
|
|
|
|
|
_PyRuntimeState *runtime = &_PyRuntime;
|
|
|
|
HEAD_LOCK(runtime);
|
|
|
|
PyThreadState* ts = PyInterpreterState_ThreadHead(interp);
|
|
|
|
HEAD_UNLOCK(runtime);
|
|
|
|
|
|
|
|
while (ts) {
|
|
|
|
if (_PyEval_SetTrace(ts, func, arg) < 0) {
|
|
|
|
_PyErr_WriteUnraisableMsg("in PyEval_SetTraceAllThreads", NULL);
|
|
|
|
}
|
|
|
|
HEAD_LOCK(runtime);
|
|
|
|
ts = PyThreadState_Next(ts);
|
|
|
|
HEAD_UNLOCK(runtime);
|
|
|
|
}
|
|
|
|
}
|
2020-03-13 15:39:12 +00:00
|
|
|
|
2022-03-21 01:24:00 +00:00
|
|
|
int
|
|
|
|
_PyEval_SetCoroutineOriginTrackingDepth(int depth)
|
2018-01-21 14:44:07 +00:00
|
|
|
{
|
2022-03-21 01:24:00 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
if (depth < 0) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_ValueError, "depth must be >= 0");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
tstate->coroutine_origin_tracking_depth = depth;
|
|
|
|
return 0;
|
2018-01-21 14:44:07 +00:00
|
|
|
}
|
|
|
|
|
2022-03-21 01:24:00 +00:00
|
|
|
|
2018-01-21 14:44:07 +00:00
|
|
|
int
|
|
|
|
_PyEval_GetCoroutineOriginTrackingDepth(void)
|
|
|
|
{
|
2018-11-01 00:51:40 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2018-01-21 14:44:07 +00:00
|
|
|
return tstate->coroutine_origin_tracking_depth;
|
|
|
|
}
|
|
|
|
|
2020-03-26 12:11:13 +00:00
|
|
|
int
|
2016-09-09 05:01:51 +00:00
|
|
|
_PyEval_SetAsyncGenFirstiter(PyObject *firstiter)
|
|
|
|
{
|
2018-11-01 00:51:40 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2019-05-23 15:45:22 +00:00
|
|
|
|
2020-03-27 14:11:45 +00:00
|
|
|
if (_PySys_Audit(tstate, "sys.set_asyncgen_hook_firstiter", NULL) < 0) {
|
2020-03-26 12:11:13 +00:00
|
|
|
return -1;
|
2019-05-23 15:45:22 +00:00
|
|
|
}
|
|
|
|
|
2022-11-10 10:25:33 +00:00
|
|
|
Py_XSETREF(tstate->async_gen_firstiter, Py_XNewRef(firstiter));
|
2020-03-26 12:11:13 +00:00
|
|
|
return 0;
|
2016-09-09 05:01:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
_PyEval_GetAsyncGenFirstiter(void)
|
|
|
|
{
|
2018-11-01 00:51:40 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2016-09-09 05:01:51 +00:00
|
|
|
return tstate->async_gen_firstiter;
|
|
|
|
}
|
|
|
|
|
2020-03-26 12:11:13 +00:00
|
|
|
int
|
2016-09-09 05:01:51 +00:00
|
|
|
_PyEval_SetAsyncGenFinalizer(PyObject *finalizer)
|
|
|
|
{
|
2018-11-01 00:51:40 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2019-05-23 15:45:22 +00:00
|
|
|
|
2020-03-27 14:11:45 +00:00
|
|
|
if (_PySys_Audit(tstate, "sys.set_asyncgen_hook_finalizer", NULL) < 0) {
|
2020-03-26 12:11:13 +00:00
|
|
|
return -1;
|
2019-05-23 15:45:22 +00:00
|
|
|
}
|
|
|
|
|
2022-11-10 10:25:33 +00:00
|
|
|
Py_XSETREF(tstate->async_gen_finalizer, Py_XNewRef(finalizer));
|
2020-03-26 12:11:13 +00:00
|
|
|
return 0;
|
2016-09-09 05:01:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
_PyEval_GetAsyncGenFinalizer(void)
|
|
|
|
{
|
2018-11-01 00:51:40 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2016-09-09 05:01:51 +00:00
|
|
|
return tstate->async_gen_finalizer;
|
|
|
|
}
|
|
|
|
|
2022-02-25 15:22:00 +00:00
|
|
|
_PyInterpreterFrame *
|
2021-07-26 10:22:16 +00:00
|
|
|
_PyEval_GetFrame(void)
|
|
|
|
{
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2023-01-09 20:20:04 +00:00
|
|
|
return _PyThreadState_GetFrame(tstate);
|
2021-07-26 10:22:16 +00:00
|
|
|
}
|
|
|
|
|
2019-05-24 15:01:38 +00:00
|
|
|
PyFrameObject *
|
|
|
|
PyEval_GetFrame(void)
|
|
|
|
{
|
2022-09-22 16:16:52 +00:00
|
|
|
_PyInterpreterFrame *frame = _PyEval_GetFrame();
|
|
|
|
if (frame == NULL) {
|
2021-07-26 10:22:16 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2022-09-22 16:16:52 +00:00
|
|
|
PyFrameObject *f = _PyFrame_GetFrameObject(frame);
|
2021-07-26 10:22:16 +00:00
|
|
|
if (f == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
return f;
|
2019-05-24 15:01:38 +00:00
|
|
|
}
|
|
|
|
|
2021-02-20 14:17:18 +00:00
|
|
|
PyObject *
|
|
|
|
_PyEval_GetBuiltins(PyThreadState *tstate)
|
|
|
|
{
|
2023-01-09 20:20:04 +00:00
|
|
|
_PyInterpreterFrame *frame = _PyThreadState_GetFrame(tstate);
|
2021-02-20 14:17:18 +00:00
|
|
|
if (frame != NULL) {
|
2021-07-26 10:22:16 +00:00
|
|
|
return frame->f_builtins;
|
2021-02-20 14:17:18 +00:00
|
|
|
}
|
|
|
|
return tstate->interp->builtins;
|
|
|
|
}
|
|
|
|
|
1997-04-29 18:18:01 +00:00
|
|
|
PyObject *
|
2000-07-22 18:47:25 +00:00
|
|
|
PyEval_GetBuiltins(void)
|
1995-01-09 17:53:26 +00:00
|
|
|
{
|
2019-05-24 15:01:38 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2021-02-20 14:17:18 +00:00
|
|
|
return _PyEval_GetBuiltins(tstate);
|
1995-01-09 17:53:26 +00:00
|
|
|
}
|
|
|
|
|
2018-12-11 06:28:18 +00:00
|
|
|
/* Convenience function to get a builtin from its name */
|
|
|
|
PyObject *
|
2022-02-08 20:39:07 +00:00
|
|
|
_PyEval_GetBuiltin(PyObject *name)
|
2018-12-11 06:28:18 +00:00
|
|
|
{
|
2019-05-24 15:01:38 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2022-02-08 20:39:07 +00:00
|
|
|
PyObject *attr = PyDict_GetItemWithError(PyEval_GetBuiltins(), name);
|
2018-12-11 06:28:18 +00:00
|
|
|
if (attr) {
|
|
|
|
Py_INCREF(attr);
|
|
|
|
}
|
2019-05-24 15:01:38 +00:00
|
|
|
else if (!_PyErr_Occurred(tstate)) {
|
2022-02-08 20:39:07 +00:00
|
|
|
_PyErr_SetObject(tstate, PyExc_AttributeError, name);
|
2018-12-11 06:28:18 +00:00
|
|
|
}
|
|
|
|
return attr;
|
|
|
|
}
|
|
|
|
|
2022-02-08 20:39:07 +00:00
|
|
|
PyObject *
|
|
|
|
_PyEval_GetBuiltinId(_Py_Identifier *name)
|
|
|
|
{
|
|
|
|
return _PyEval_GetBuiltin(_PyUnicode_FromId(name));
|
|
|
|
}
|
|
|
|
|
1997-04-29 18:18:01 +00:00
|
|
|
PyObject *
|
2000-07-22 18:47:25 +00:00
|
|
|
PyEval_GetLocals(void)
|
1993-03-30 17:46:03 +00:00
|
|
|
{
|
2019-05-24 15:01:38 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2023-01-09 20:20:04 +00:00
|
|
|
_PyInterpreterFrame *current_frame = _PyThreadState_GetFrame(tstate);
|
2013-10-29 00:19:37 +00:00
|
|
|
if (current_frame == NULL) {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_SetString(tstate, PyExc_SystemError, "frame does not exist");
|
2010-05-09 15:52:27 +00:00
|
|
|
return NULL;
|
2013-10-29 00:19:37 +00:00
|
|
|
}
|
|
|
|
|
2021-07-26 10:22:16 +00:00
|
|
|
if (_PyFrame_FastToLocalsWithError(current_frame) < 0) {
|
2013-10-29 00:19:37 +00:00
|
|
|
return NULL;
|
2019-05-24 15:01:38 +00:00
|
|
|
}
|
2013-10-29 00:19:37 +00:00
|
|
|
|
2021-07-26 10:22:16 +00:00
|
|
|
PyObject *locals = current_frame->f_locals;
|
2021-05-21 09:57:35 +00:00
|
|
|
assert(locals != NULL);
|
|
|
|
return locals;
|
1993-03-30 17:46:03 +00:00
|
|
|
}
|
|
|
|
|
1997-04-29 18:18:01 +00:00
|
|
|
PyObject *
|
2000-07-22 18:47:25 +00:00
|
|
|
PyEval_GetGlobals(void)
|
1991-04-04 10:40:29 +00:00
|
|
|
{
|
2019-05-24 15:01:38 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2023-01-09 20:20:04 +00:00
|
|
|
_PyInterpreterFrame *current_frame = _PyThreadState_GetFrame(tstate);
|
2019-05-24 15:01:38 +00:00
|
|
|
if (current_frame == NULL) {
|
2010-05-09 15:52:27 +00:00
|
|
|
return NULL;
|
2019-05-24 15:01:38 +00:00
|
|
|
}
|
2021-07-26 10:22:16 +00:00
|
|
|
return current_frame->f_globals;
|
1991-04-04 10:40:29 +00:00
|
|
|
}
|
|
|
|
|
2001-03-22 02:32:48 +00:00
|
|
|
int
|
2001-07-16 02:29:45 +00:00
|
|
|
PyEval_MergeCompilerFlags(PyCompilerFlags *cf)
|
2001-03-22 02:32:48 +00:00
|
|
|
{
|
2019-05-24 15:01:38 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2022-02-25 15:22:00 +00:00
|
|
|
_PyInterpreterFrame *current_frame = tstate->cframe->current_frame;
|
2010-05-09 15:52:27 +00:00
|
|
|
int result = cf->cf_flags != 0;
|
|
|
|
|
|
|
|
if (current_frame != NULL) {
|
2021-07-26 10:22:16 +00:00
|
|
|
const int codeflags = current_frame->f_code->co_flags;
|
2010-05-09 15:52:27 +00:00
|
|
|
const int compilerflags = codeflags & PyCF_MASK;
|
|
|
|
if (compilerflags) {
|
|
|
|
result = 1;
|
|
|
|
cf->cf_flags |= compilerflags;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
2001-03-22 02:32:48 +00:00
|
|
|
}
|
|
|
|
|
1991-04-04 10:40:29 +00:00
|
|
|
|
2005-12-10 18:50:16 +00:00
|
|
|
const char *
|
2001-08-02 04:15:00 +00:00
|
|
|
PyEval_GetFuncName(PyObject *func)
|
2001-04-11 13:52:29 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
if (PyMethod_Check(func))
|
|
|
|
return PyEval_GetFuncName(PyMethod_GET_FUNCTION(func));
|
|
|
|
else if (PyFunction_Check(func))
|
2016-11-20 07:13:07 +00:00
|
|
|
return PyUnicode_AsUTF8(((PyFunctionObject*)func)->func_name);
|
2010-05-09 15:52:27 +00:00
|
|
|
else if (PyCFunction_Check(func))
|
|
|
|
return ((PyCFunctionObject*)func)->m_ml->ml_name;
|
|
|
|
else
|
2020-02-07 01:24:48 +00:00
|
|
|
return Py_TYPE(func)->tp_name;
|
2001-04-11 13:52:29 +00:00
|
|
|
}
|
|
|
|
|
2005-12-10 18:50:16 +00:00
|
|
|
const char *
|
2001-08-02 04:15:00 +00:00
|
|
|
PyEval_GetFuncDesc(PyObject *func)
|
2001-04-11 13:52:29 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
if (PyMethod_Check(func))
|
|
|
|
return "()";
|
|
|
|
else if (PyFunction_Check(func))
|
|
|
|
return "()";
|
|
|
|
else if (PyCFunction_Check(func))
|
|
|
|
return "()";
|
|
|
|
else
|
|
|
|
return " object";
|
2001-04-11 13:52:29 +00:00
|
|
|
}
|
|
|
|
|
2015-02-17 08:14:30 +00:00
|
|
|
/* Extract a slice index from a PyLong or an object with the
|
2006-03-07 18:50:55 +00:00
|
|
|
nb_index slot defined, and store in *pi.
|
|
|
|
Silently reduce values larger than PY_SSIZE_T_MAX to PY_SSIZE_T_MAX,
|
2017-05-10 10:19:41 +00:00
|
|
|
and silently boost values less than PY_SSIZE_T_MIN to PY_SSIZE_T_MIN.
|
2006-02-17 15:57:41 +00:00
|
|
|
Return 0 on error, 1 on success.
|
2001-12-16 19:11:44 +00:00
|
|
|
*/
|
2000-05-08 14:06:50 +00:00
|
|
|
int
|
2006-02-15 17:27:45 +00:00
|
|
|
_PyEval_SliceIndex(PyObject *v, Py_ssize_t *pi)
|
1991-04-04 10:40:29 +00:00
|
|
|
{
|
2019-05-24 15:01:38 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2021-04-10 22:17:39 +00:00
|
|
|
if (!Py_IsNone(v)) {
|
2010-05-09 15:52:27 +00:00
|
|
|
Py_ssize_t x;
|
2020-04-08 00:01:56 +00:00
|
|
|
if (_PyIndex_Check(v)) {
|
2010-05-09 15:52:27 +00:00
|
|
|
x = PyNumber_AsSsize_t(v, NULL);
|
2019-05-24 15:01:38 +00:00
|
|
|
if (x == -1 && _PyErr_Occurred(tstate))
|
2010-05-09 15:52:27 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
"slice indices must be integers or "
|
|
|
|
"None or have an __index__ method");
|
2010-05-09 15:52:27 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
*pi = x;
|
|
|
|
}
|
|
|
|
return 1;
|
1991-04-04 10:40:29 +00:00
|
|
|
}
|
|
|
|
|
2017-03-19 17:37:40 +00:00
|
|
|
int
|
2017-03-30 15:29:23 +00:00
|
|
|
_PyEval_SliceIndexNotNone(PyObject *v, Py_ssize_t *pi)
|
2017-03-19 17:37:40 +00:00
|
|
|
{
|
2019-05-24 15:01:38 +00:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2017-03-30 15:29:23 +00:00
|
|
|
Py_ssize_t x;
|
2020-04-08 00:01:56 +00:00
|
|
|
if (_PyIndex_Check(v)) {
|
2017-03-30 15:29:23 +00:00
|
|
|
x = PyNumber_AsSsize_t(v, NULL);
|
2019-05-24 15:01:38 +00:00
|
|
|
if (x == -1 && _PyErr_Occurred(tstate))
|
2017-03-30 15:29:23 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
"slice indices must be integers or "
|
|
|
|
"have an __index__ method");
|
2017-03-30 15:29:23 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
*pi = x;
|
|
|
|
return 1;
|
2017-03-19 17:37:40 +00:00
|
|
|
}
|
|
|
|
|
2016-08-02 19:51:21 +00:00
|
|
|
static PyObject *
|
2022-02-25 15:22:00 +00:00
|
|
|
import_name(PyThreadState *tstate, _PyInterpreterFrame *frame,
|
2019-05-24 15:01:38 +00:00
|
|
|
PyObject *name, PyObject *fromlist, PyObject *level)
|
2016-08-02 19:51:21 +00:00
|
|
|
{
|
2016-08-19 22:44:42 +00:00
|
|
|
PyObject *import_func, *res;
|
|
|
|
PyObject* stack[5];
|
2016-08-02 19:51:21 +00:00
|
|
|
|
2022-02-08 20:39:07 +00:00
|
|
|
import_func = _PyDict_GetItemWithError(frame->f_builtins, &_Py_ID(__import__));
|
2016-08-02 19:51:21 +00:00
|
|
|
if (import_func == NULL) {
|
2019-05-24 15:01:38 +00:00
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_ImportError, "__import__ not found");
|
2019-02-25 15:59:46 +00:00
|
|
|
}
|
2016-08-02 19:51:21 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2021-07-26 10:22:16 +00:00
|
|
|
PyObject *locals = frame->f_locals;
|
2016-08-02 19:51:21 +00:00
|
|
|
/* Fast path for not overloaded __import__. */
|
2023-02-15 22:32:31 +00:00
|
|
|
if (_PyImport_IsDefaultImportFunc(tstate->interp, import_func)) {
|
2016-08-02 19:51:21 +00:00
|
|
|
int ilevel = _PyLong_AsInt(level);
|
2019-05-24 15:01:38 +00:00
|
|
|
if (ilevel == -1 && _PyErr_Occurred(tstate)) {
|
2016-08-02 19:51:21 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
res = PyImport_ImportModuleLevelObject(
|
|
|
|
name,
|
2021-07-26 10:22:16 +00:00
|
|
|
frame->f_globals,
|
2021-05-21 09:57:35 +00:00
|
|
|
locals == NULL ? Py_None :locals,
|
2016-08-02 19:51:21 +00:00
|
|
|
fromlist,
|
|
|
|
ilevel);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_INCREF(import_func);
|
2016-08-19 22:44:42 +00:00
|
|
|
|
|
|
|
stack[0] = name;
|
2021-07-26 10:22:16 +00:00
|
|
|
stack[1] = frame->f_globals;
|
2021-05-21 09:57:35 +00:00
|
|
|
stack[2] = locals == NULL ? Py_None : locals;
|
2016-08-19 22:44:42 +00:00
|
|
|
stack[3] = fromlist;
|
|
|
|
stack[4] = level;
|
2016-08-22 20:48:54 +00:00
|
|
|
res = _PyObject_FastCall(import_func, stack, 5);
|
2016-08-02 19:51:21 +00:00
|
|
|
Py_DECREF(import_func);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2000-08-17 22:55:00 +00:00
|
|
|
static PyObject *
|
2019-05-24 15:01:38 +00:00
|
|
|
import_from(PyThreadState *tstate, PyObject *v, PyObject *name)
|
1991-04-04 10:40:29 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
PyObject *x;
|
2017-03-21 03:13:42 +00:00
|
|
|
PyObject *fullmodname, *pkgname, *pkgpath, *pkgname_or_unknown, *errmsg;
|
2001-01-12 16:24:03 +00:00
|
|
|
|
2018-01-25 08:49:40 +00:00
|
|
|
if (_PyObject_LookupAttr(v, name, &x) != 0) {
|
2014-10-13 18:19:45 +00:00
|
|
|
return x;
|
2018-01-25 08:49:40 +00:00
|
|
|
}
|
2014-10-13 18:19:45 +00:00
|
|
|
/* Issue #17636: in case this failed because of a circular relative
|
|
|
|
import, try to fallback on reading the module directly from
|
|
|
|
sys.modules. */
|
2022-02-08 20:39:07 +00:00
|
|
|
pkgname = PyObject_GetAttr(v, &_Py_ID(__name__));
|
2015-08-12 01:01:31 +00:00
|
|
|
if (pkgname == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2017-09-19 11:23:01 +00:00
|
|
|
if (!PyUnicode_Check(pkgname)) {
|
|
|
|
Py_CLEAR(pkgname);
|
|
|
|
goto error;
|
|
|
|
}
|
2014-10-13 18:19:45 +00:00
|
|
|
fullmodname = PyUnicode_FromFormat("%U.%U", pkgname, name);
|
2015-08-12 01:01:31 +00:00
|
|
|
if (fullmodname == NULL) {
|
2017-03-21 03:13:42 +00:00
|
|
|
Py_DECREF(pkgname);
|
2014-10-13 18:19:45 +00:00
|
|
|
return NULL;
|
2015-08-12 01:01:31 +00:00
|
|
|
}
|
2017-09-15 22:35:20 +00:00
|
|
|
x = PyImport_GetModule(fullmodname);
|
2014-10-13 18:19:45 +00:00
|
|
|
Py_DECREF(fullmodname);
|
2019-05-24 15:01:38 +00:00
|
|
|
if (x == NULL && !_PyErr_Occurred(tstate)) {
|
2015-08-12 01:01:31 +00:00
|
|
|
goto error;
|
|
|
|
}
|
2017-02-22 15:06:50 +00:00
|
|
|
Py_DECREF(pkgname);
|
2010-05-09 15:52:27 +00:00
|
|
|
return x;
|
2015-08-12 01:01:31 +00:00
|
|
|
error:
|
2017-02-15 00:05:25 +00:00
|
|
|
pkgpath = PyModule_GetFilenameObject(v);
|
2017-02-22 15:06:50 +00:00
|
|
|
if (pkgname == NULL) {
|
|
|
|
pkgname_or_unknown = PyUnicode_FromString("<unknown module name>");
|
|
|
|
if (pkgname_or_unknown == NULL) {
|
|
|
|
Py_XDECREF(pkgpath);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
pkgname_or_unknown = pkgname;
|
|
|
|
}
|
2017-02-15 00:05:25 +00:00
|
|
|
|
|
|
|
if (pkgpath == NULL || !PyUnicode_Check(pkgpath)) {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Clear(tstate);
|
2017-03-21 03:13:42 +00:00
|
|
|
errmsg = PyUnicode_FromFormat(
|
|
|
|
"cannot import name %R from %R (unknown location)",
|
|
|
|
name, pkgname_or_unknown
|
|
|
|
);
|
2019-03-25 20:50:58 +00:00
|
|
|
/* NULL checks for errmsg and pkgname done by PyErr_SetImportError. */
|
2022-10-25 22:56:59 +00:00
|
|
|
_PyErr_SetImportErrorWithNameFrom(errmsg, pkgname, NULL, name);
|
2017-03-21 03:13:42 +00:00
|
|
|
}
|
|
|
|
else {
|
2022-02-08 20:39:07 +00:00
|
|
|
PyObject *spec = PyObject_GetAttr(v, &_Py_ID(__spec__));
|
2019-09-09 15:17:50 +00:00
|
|
|
const char *fmt =
|
|
|
|
_PyModuleSpec_IsInitializing(spec) ?
|
|
|
|
"cannot import name %R from partially initialized module %R "
|
|
|
|
"(most likely due to a circular import) (%S)" :
|
|
|
|
"cannot import name %R from %R (%S)";
|
|
|
|
Py_XDECREF(spec);
|
|
|
|
|
|
|
|
errmsg = PyUnicode_FromFormat(fmt, name, pkgname_or_unknown, pkgpath);
|
2019-03-25 20:50:58 +00:00
|
|
|
/* NULL checks for errmsg and pkgname done by PyErr_SetImportError. */
|
2022-10-25 22:56:59 +00:00
|
|
|
_PyErr_SetImportErrorWithNameFrom(errmsg, pkgname, pkgpath, name);
|
2017-02-15 00:05:25 +00:00
|
|
|
}
|
|
|
|
|
2017-03-21 03:13:42 +00:00
|
|
|
Py_XDECREF(errmsg);
|
2017-02-22 15:06:50 +00:00
|
|
|
Py_XDECREF(pkgname_or_unknown);
|
|
|
|
Py_XDECREF(pkgpath);
|
2015-08-12 01:01:31 +00:00
|
|
|
return NULL;
|
2000-08-17 22:55:00 +00:00
|
|
|
}
|
2001-01-17 15:42:30 +00:00
|
|
|
|
2021-11-22 16:56:23 +00:00
|
|
|
#define CANNOT_CATCH_MSG "catching classes that do not inherit from "\
|
|
|
|
"BaseException is not allowed"
|
|
|
|
|
2021-12-14 16:48:15 +00:00
|
|
|
#define CANNOT_EXCEPT_STAR_EG "catching ExceptionGroup with except* "\
|
|
|
|
"is not allowed. Use except instead."
|
|
|
|
|
2021-11-22 16:56:23 +00:00
|
|
|
static int
|
|
|
|
check_except_type_valid(PyThreadState *tstate, PyObject* right)
|
|
|
|
{
|
|
|
|
if (PyTuple_Check(right)) {
|
|
|
|
Py_ssize_t i, length;
|
|
|
|
length = PyTuple_GET_SIZE(right);
|
|
|
|
for (i = 0; i < length; i++) {
|
|
|
|
PyObject *exc = PyTuple_GET_ITEM(right, i);
|
|
|
|
if (!PyExceptionClass_Check(exc)) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
CANNOT_CATCH_MSG);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (!PyExceptionClass_Check(right)) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
CANNOT_CATCH_MSG);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
2021-12-14 16:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
check_except_star_type_valid(PyThreadState *tstate, PyObject* right)
|
|
|
|
{
|
|
|
|
if (check_except_type_valid(tstate, right) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* reject except *ExceptionGroup */
|
|
|
|
|
|
|
|
int is_subclass = 0;
|
|
|
|
if (PyTuple_Check(right)) {
|
|
|
|
Py_ssize_t length = PyTuple_GET_SIZE(right);
|
|
|
|
for (Py_ssize_t i = 0; i < length; i++) {
|
|
|
|
PyObject *exc = PyTuple_GET_ITEM(right, i);
|
|
|
|
is_subclass = PyObject_IsSubclass(exc, PyExc_BaseExceptionGroup);
|
|
|
|
if (is_subclass < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (is_subclass) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
is_subclass = PyObject_IsSubclass(right, PyExc_BaseExceptionGroup);
|
|
|
|
if (is_subclass < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (is_subclass) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
CANNOT_EXCEPT_STAR_EG);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2021-11-22 16:56:23 +00:00
|
|
|
}
|
|
|
|
|
2017-08-03 08:37:15 +00:00
|
|
|
static int
|
2019-05-24 15:01:38 +00:00
|
|
|
check_args_iterable(PyThreadState *tstate, PyObject *func, PyObject *args)
|
2017-08-03 08:37:15 +00:00
|
|
|
{
|
2020-02-07 01:24:48 +00:00
|
|
|
if (Py_TYPE(args)->tp_iter == NULL && !PySequence_Check(args)) {
|
2019-11-05 15:48:04 +00:00
|
|
|
/* check_args_iterable() may be called with a live exception:
|
|
|
|
* clear it to prevent calling _PyObject_FunctionStr() with an
|
|
|
|
* exception set. */
|
2020-01-28 02:37:45 +00:00
|
|
|
_PyErr_Clear(tstate);
|
2019-11-05 15:48:04 +00:00
|
|
|
PyObject *funcstr = _PyObject_FunctionStr(func);
|
|
|
|
if (funcstr != NULL) {
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"%U argument after * must be an iterable, not %.200s",
|
|
|
|
funcstr, Py_TYPE(args)->tp_name);
|
|
|
|
Py_DECREF(funcstr);
|
|
|
|
}
|
2017-08-03 08:37:15 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2019-05-24 15:01:38 +00:00
|
|
|
format_kwargs_error(PyThreadState *tstate, PyObject *func, PyObject *kwargs)
|
2017-08-03 08:37:15 +00:00
|
|
|
{
|
2019-01-12 08:12:24 +00:00
|
|
|
/* _PyDict_MergeEx raises attribute
|
|
|
|
* error (percolated from an attempt
|
|
|
|
* to get 'keys' attribute) instead of
|
|
|
|
* a type error if its second argument
|
|
|
|
* is not a mapping.
|
|
|
|
*/
|
2019-05-24 15:01:38 +00:00
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_AttributeError)) {
|
2020-01-28 02:37:45 +00:00
|
|
|
_PyErr_Clear(tstate);
|
2019-11-05 15:48:04 +00:00
|
|
|
PyObject *funcstr = _PyObject_FunctionStr(func);
|
|
|
|
if (funcstr != NULL) {
|
|
|
|
_PyErr_Format(
|
|
|
|
tstate, PyExc_TypeError,
|
|
|
|
"%U argument after ** must be a mapping, not %.200s",
|
|
|
|
funcstr, Py_TYPE(kwargs)->tp_name);
|
|
|
|
Py_DECREF(funcstr);
|
|
|
|
}
|
2019-05-24 15:01:38 +00:00
|
|
|
}
|
|
|
|
else if (_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
|
2023-02-08 09:31:12 +00:00
|
|
|
PyObject *exc = _PyErr_GetRaisedException(tstate);
|
|
|
|
PyObject *args = ((PyBaseExceptionObject *)exc)->args;
|
|
|
|
if (exc && PyTuple_Check(args) && PyTuple_GET_SIZE(args) == 1) {
|
2020-01-28 02:37:45 +00:00
|
|
|
_PyErr_Clear(tstate);
|
2019-11-05 15:48:04 +00:00
|
|
|
PyObject *funcstr = _PyObject_FunctionStr(func);
|
|
|
|
if (funcstr != NULL) {
|
2023-02-08 09:31:12 +00:00
|
|
|
PyObject *key = PyTuple_GET_ITEM(args, 0);
|
2019-11-05 15:48:04 +00:00
|
|
|
_PyErr_Format(
|
|
|
|
tstate, PyExc_TypeError,
|
|
|
|
"%U got multiple values for keyword argument '%S'",
|
|
|
|
funcstr, key);
|
|
|
|
Py_DECREF(funcstr);
|
|
|
|
}
|
2019-01-12 08:12:24 +00:00
|
|
|
Py_XDECREF(exc);
|
|
|
|
}
|
|
|
|
else {
|
2023-02-08 09:31:12 +00:00
|
|
|
_PyErr_SetRaisedException(tstate, exc);
|
2019-01-12 08:12:24 +00:00
|
|
|
}
|
|
|
|
}
|
2017-08-03 08:37:15 +00:00
|
|
|
}
|
|
|
|
|
2001-01-17 15:42:30 +00:00
|
|
|
static void
|
2019-05-24 15:01:38 +00:00
|
|
|
format_exc_check_arg(PyThreadState *tstate, PyObject *exc,
|
|
|
|
const char *format_str, PyObject *obj)
|
2000-08-30 20:25:01 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
const char *obj_str;
|
2000-08-30 20:25:01 +00:00
|
|
|
|
2010-05-09 15:52:27 +00:00
|
|
|
if (!obj)
|
|
|
|
return;
|
2000-08-30 20:25:01 +00:00
|
|
|
|
2016-11-20 07:13:07 +00:00
|
|
|
obj_str = PyUnicode_AsUTF8(obj);
|
2010-05-09 15:52:27 +00:00
|
|
|
if (!obj_str)
|
|
|
|
return;
|
2000-08-30 20:25:01 +00:00
|
|
|
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, exc, format_str, obj_str);
|
2021-04-14 14:10:33 +00:00
|
|
|
|
|
|
|
if (exc == PyExc_NameError) {
|
|
|
|
// Include the name in the NameError exceptions to offer suggestions later.
|
2023-02-28 11:50:52 +00:00
|
|
|
PyObject *exc = PyErr_GetRaisedException();
|
|
|
|
if (PyErr_GivenExceptionMatches(exc, PyExc_NameError)) {
|
|
|
|
if (((PyNameErrorObject*)exc)->name == NULL) {
|
2022-03-07 12:23:11 +00:00
|
|
|
// We do not care if this fails because we are going to restore the
|
|
|
|
// NameError anyway.
|
2023-02-28 11:50:52 +00:00
|
|
|
(void)PyObject_SetAttr(exc, &_Py_ID(name), obj);
|
2022-03-07 12:23:11 +00:00
|
|
|
}
|
2021-04-14 14:10:33 +00:00
|
|
|
}
|
2023-02-28 11:50:52 +00:00
|
|
|
PyErr_SetRaisedException(exc);
|
2021-04-14 14:10:33 +00:00
|
|
|
}
|
2000-08-30 20:25:01 +00:00
|
|
|
}
|
1997-01-24 13:49:28 +00:00
|
|
|
|
2010-09-10 21:39:53 +00:00
|
|
|
static void
|
2019-05-24 15:01:38 +00:00
|
|
|
format_exc_unbound(PyThreadState *tstate, PyCodeObject *co, int oparg)
|
2010-09-10 21:39:53 +00:00
|
|
|
{
|
|
|
|
PyObject *name;
|
|
|
|
/* Don't stomp existing exception */
|
2019-05-24 15:01:38 +00:00
|
|
|
if (_PyErr_Occurred(tstate))
|
2010-09-10 21:39:53 +00:00
|
|
|
return;
|
2021-06-07 18:22:26 +00:00
|
|
|
name = PyTuple_GET_ITEM(co->co_localsplusnames, oparg);
|
2023-01-04 15:41:39 +00:00
|
|
|
if (oparg < PyCode_GetFirstFree(co)) {
|
2021-06-07 18:22:26 +00:00
|
|
|
format_exc_check_arg(tstate, PyExc_UnboundLocalError,
|
|
|
|
UNBOUNDLOCAL_ERROR_MSG, name);
|
2010-09-10 21:39:53 +00:00
|
|
|
} else {
|
2019-05-24 15:01:38 +00:00
|
|
|
format_exc_check_arg(tstate, PyExc_NameError,
|
2010-09-10 21:39:53 +00:00
|
|
|
UNBOUNDFREE_ERROR_MSG, name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-02 22:41:38 +00:00
|
|
|
static void
|
2022-03-04 12:41:17 +00:00
|
|
|
format_awaitable_error(PyThreadState *tstate, PyTypeObject *type, int oparg)
|
2018-04-02 22:41:38 +00:00
|
|
|
{
|
|
|
|
if (type->tp_as_async == NULL || type->tp_as_async->am_await == NULL) {
|
2022-03-04 12:41:17 +00:00
|
|
|
if (oparg == 1) {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"'async with' received an object from __aenter__ "
|
|
|
|
"that does not implement __await__: %.100s",
|
|
|
|
type->tp_name);
|
2018-04-02 22:41:38 +00:00
|
|
|
}
|
2022-03-04 12:41:17 +00:00
|
|
|
else if (oparg == 2) {
|
2019-05-24 15:01:38 +00:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"'async with' received an object from __aexit__ "
|
|
|
|
"that does not implement __await__: %.100s",
|
|
|
|
type->tp_name);
|
2018-04-02 22:41:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-09-07 18:16:41 +00:00
|
|
|
|
|
|
|
Py_ssize_t
|
2023-02-28 08:31:01 +00:00
|
|
|
PyUnstable_Eval_RequestCodeExtraIndex(freefunc free)
|
2016-09-07 18:16:41 +00:00
|
|
|
{
|
2020-04-14 13:14:01 +00:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2016-09-07 18:16:41 +00:00
|
|
|
Py_ssize_t new_index;
|
|
|
|
|
2017-06-21 21:44:36 +00:00
|
|
|
if (interp->co_extra_user_count == MAX_CO_EXTRA_USERS - 1) {
|
2016-09-07 18:16:41 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2017-06-21 21:44:36 +00:00
|
|
|
new_index = interp->co_extra_user_count++;
|
|
|
|
interp->co_extra_freefuncs[new_index] = free;
|
2016-09-07 18:16:41 +00:00
|
|
|
return new_index;
|
|
|
|
}
|
2016-09-10 00:37:37 +00:00
|
|
|
|
2019-11-04 18:48:34 +00:00
|
|
|
/* Implement Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() as functions
|
|
|
|
for the limited API. */
|
|
|
|
|
|
|
|
int Py_EnterRecursiveCall(const char *where)
|
|
|
|
{
|
2022-05-04 11:30:23 +00:00
|
|
|
return _Py_EnterRecursiveCall(where);
|
2019-11-04 18:48:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void Py_LeaveRecursiveCall(void)
|
|
|
|
{
|
2022-05-04 11:30:23 +00:00
|
|
|
_Py_LeaveRecursiveCall();
|
2019-11-04 18:48:34 +00:00
|
|
|
}
|