1990-10-14 20:07:46 +08:00
|
|
|
/* Module definition and import implementation */
|
|
|
|
|
1997-04-30 04:08:16 +08:00
|
|
|
#include "Python.h"
|
2024-10-18 23:26:08 +08:00
|
|
|
#include "pycore_audit.h" // _PySys_Audit()
|
2024-05-07 11:07:23 +08:00
|
|
|
#include "pycore_ceval.h"
|
2023-07-29 04:39:08 +08:00
|
|
|
#include "pycore_hashtable.h" // _Py_hashtable_new_full()
|
2020-11-19 06:18:29 +08:00
|
|
|
#include "pycore_import.h" // _PyImport_BootstrapImp()
|
2021-10-15 21:21:21 +08:00
|
|
|
#include "pycore_initconfig.h" // _PyStatus_OK()
|
2023-02-16 06:32:31 +08:00
|
|
|
#include "pycore_interp.h" // struct _import_runtime_state
|
2024-08-02 18:12:19 +08:00
|
|
|
#include "pycore_magic_number.h" // PYC_MAGIC_NUMBER_TOKEN
|
2021-10-15 21:21:21 +08:00
|
|
|
#include "pycore_namespace.h" // _PyNamespace_Type
|
2023-07-29 04:39:08 +08:00
|
|
|
#include "pycore_object.h" // _Py_SetImmortal()
|
2021-10-15 21:21:21 +08:00
|
|
|
#include "pycore_pyerrors.h" // _PyErr_SetString()
|
|
|
|
#include "pycore_pyhash.h" // _Py_KeyedHash()
|
2018-11-12 23:53:38 +08:00
|
|
|
#include "pycore_pylifecycle.h"
|
2020-04-15 08:57:50 +08:00
|
|
|
#include "pycore_pymem.h" // _PyMem_SetDefaultAllocator()
|
2020-04-14 23:52:15 +08:00
|
|
|
#include "pycore_pystate.h" // _PyInterpreterState_GET()
|
2024-10-18 23:26:08 +08:00
|
|
|
#include "pycore_sysmodule.h" // _PySys_ClearAttrString()
|
2024-05-05 18:15:19 +08:00
|
|
|
#include "pycore_time.h" // _PyTime_AsMicroseconds()
|
2023-06-23 07:23:08 +08:00
|
|
|
#include "pycore_weakref.h" // _PyWeakref_GET_REF()
|
2023-08-23 02:17:25 +08:00
|
|
|
|
2021-10-15 21:21:21 +08:00
|
|
|
#include "marshal.h" // PyMarshal_ReadObjectFromString()
|
2023-10-05 06:50:29 +08:00
|
|
|
#include "pycore_importdl.h" // _PyImport_DynLoadFiletab
|
2021-10-15 21:21:21 +08:00
|
|
|
#include "pydtrace.h" // PyDTrace_IMPORT_FIND_LOAD_START_ENABLED()
|
|
|
|
#include <stdbool.h> // bool
|
1991-06-05 04:39:42 +09:00
|
|
|
|
2000-09-21 04:31:38 +08:00
|
|
|
#ifdef HAVE_FCNTL_H
|
|
|
|
#include <fcntl.h>
|
|
|
|
#endif
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
module _imp
|
|
|
|
[clinic start generated code]*/
|
|
|
|
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=9c332475d8686284]*/
|
|
|
|
|
|
|
|
#include "clinic/import.c.h"
|
|
|
|
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
#ifndef NDEBUG
|
|
|
|
static bool
|
|
|
|
is_interpreter_isolated(PyInterpreterState *interp)
|
|
|
|
{
|
|
|
|
return !_Py_IsMainInterpreter(interp)
|
|
|
|
&& !(interp->feature_flags & Py_RTFLAGS_USE_MAIN_OBMALLOC)
|
|
|
|
&& interp->ceval.own_gil;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/*******************************/
|
|
|
|
/* process-global import state */
|
|
|
|
/*******************************/
|
2019-06-19 08:54:39 +08:00
|
|
|
|
1997-11-01 02:37:24 +08:00
|
|
|
/* This table is defined in config.c: */
|
|
|
|
extern struct _inittab _PyImport_Inittab[];
|
|
|
|
|
2022-11-12 08:06:05 +08:00
|
|
|
// This is not used after Py_Initialize() is called.
|
|
|
|
// (See _PyRuntimeState.imports.inittab.)
|
1997-11-01 02:37:24 +08:00
|
|
|
struct _inittab *PyImport_Inittab = _PyImport_Inittab;
|
2022-11-12 08:06:05 +08:00
|
|
|
// When we dynamically allocate a larger table for PyImport_ExtendInittab(),
|
|
|
|
// we track the pointer here so we can deallocate it during finalization.
|
2017-12-07 01:12:59 +08:00
|
|
|
static struct _inittab *inittab_copy = NULL;
|
1994-08-29 20:54:38 +08:00
|
|
|
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/*******************************/
|
|
|
|
/* runtime-global import state */
|
|
|
|
/*******************************/
|
2012-04-15 02:10:13 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
#define INITTAB _PyRuntime.imports.inittab
|
|
|
|
#define LAST_MODULE_INDEX _PyRuntime.imports.last_module_index
|
|
|
|
#define EXTENSIONS _PyRuntime.imports.extensions
|
2012-04-15 02:10:13 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
#define PKGCONTEXT (_PyRuntime.imports.pkgcontext)
|
|
|
|
|
|
|
|
|
|
|
|
/*******************************/
|
|
|
|
/* interpreter import state */
|
|
|
|
/*******************************/
|
|
|
|
|
|
|
|
#define MODULES(interp) \
|
|
|
|
(interp)->imports.modules
|
|
|
|
#define MODULES_BY_INDEX(interp) \
|
|
|
|
(interp)->imports.modules_by_index
|
|
|
|
#define IMPORTLIB(interp) \
|
|
|
|
(interp)->imports.importlib
|
2023-02-16 09:16:00 +08:00
|
|
|
#define OVERRIDE_MULTI_INTERP_EXTENSIONS_CHECK(interp) \
|
|
|
|
(interp)->imports.override_multi_interp_extensions_check
|
2023-02-16 06:32:31 +08:00
|
|
|
#define OVERRIDE_FROZEN_MODULES(interp) \
|
|
|
|
(interp)->imports.override_frozen_modules
|
|
|
|
#ifdef HAVE_DLOPEN
|
|
|
|
# define DLOPENFLAGS(interp) \
|
|
|
|
(interp)->imports.dlopenflags
|
|
|
|
#endif
|
|
|
|
#define IMPORT_FUNC(interp) \
|
|
|
|
(interp)->imports.import_func
|
2012-04-15 02:10:13 +08:00
|
|
|
|
2023-03-10 00:46:21 +08:00
|
|
|
#define IMPORT_LOCK(interp) \
|
2024-06-07 01:40:58 +08:00
|
|
|
(interp)->imports.lock
|
2023-03-10 00:46:21 +08:00
|
|
|
|
|
|
|
#define FIND_AND_LOAD(interp) \
|
|
|
|
(interp)->imports.find_and_load
|
|
|
|
|
2012-04-15 02:10:13 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/*******************/
|
|
|
|
/* the import lock */
|
|
|
|
/*******************/
|
2002-12-31 06:08:05 +08:00
|
|
|
|
1998-03-04 06:26:50 +08:00
|
|
|
/* Locking primitives to prevent parallel imports of the same module
|
|
|
|
in different threads to return with a partially loaded module.
|
|
|
|
These calls are serialized by the global interpreter lock. */
|
|
|
|
|
Merged revisions 74841 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74841 | thomas.wouters | 2009-09-16 14:55:54 -0500 (Wed, 16 Sep 2009) | 23 lines
Fix issue #1590864, multiple threads and fork() can cause deadlocks, by
acquiring the import lock around fork() calls. This prevents other threads
from having that lock while the fork happens, and is the recommended way of
dealing with such issues. There are two other locks we care about, the GIL
and the Thread Local Storage lock. The GIL is obviously held when calling
Python functions like os.fork(), and the TLS lock is explicitly reallocated
instead, while also deleting now-orphaned TLS data.
This only fixes calls to os.fork(), not extension modules or embedding
programs calling C's fork() directly. Solving that requires a new set of API
functions, and possibly a rewrite of the Python/thread_*.c mess. Add a
warning explaining the problem to the documentation in the mean time.
This also changes behaviour a little on AIX. Before, AIX (but only AIX) was
getting the import lock reallocated, seemingly to avoid this very same
problem. This is not the right approach, because the import lock is a
re-entrant one, and reallocating would do the wrong thing when forking while
holding the import lock.
Will backport to 2.6, minus the tiny AIX behaviour change.
........
2009-10-05 04:32:25 +08:00
|
|
|
void
|
2023-03-10 00:46:21 +08:00
|
|
|
_PyImport_AcquireLock(PyInterpreterState *interp)
|
1998-03-04 06:26:50 +08:00
|
|
|
{
|
2024-06-07 01:40:58 +08:00
|
|
|
_PyRecursiveMutex_Lock(&IMPORT_LOCK(interp));
|
1998-03-04 06:26:50 +08:00
|
|
|
}
|
|
|
|
|
2024-06-07 01:40:58 +08:00
|
|
|
void
|
2023-03-10 00:46:21 +08:00
|
|
|
_PyImport_ReleaseLock(PyInterpreterState *interp)
|
1998-03-04 06:26:50 +08:00
|
|
|
{
|
2024-06-07 01:40:58 +08:00
|
|
|
_PyRecursiveMutex_Unlock(&IMPORT_LOCK(interp));
|
2005-09-15 02:09:42 +08:00
|
|
|
}
|
|
|
|
|
2024-11-13 04:53:58 +08:00
|
|
|
void
|
|
|
|
_PyImport_ReInitLock(PyInterpreterState *interp)
|
|
|
|
{
|
|
|
|
// gh-126688: Thread id may change after fork() on some operating systems.
|
|
|
|
IMPORT_LOCK(interp).thread = PyThread_get_thread_ident_ex();
|
|
|
|
}
|
|
|
|
|
2014-01-10 08:03:32 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/***************/
|
|
|
|
/* sys.modules */
|
|
|
|
/***************/
|
2014-01-10 08:03:32 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
PyObject *
|
|
|
|
_PyImport_InitModules(PyInterpreterState *interp)
|
2003-02-13 05:46:11 +08:00
|
|
|
{
|
2023-02-16 06:32:31 +08:00
|
|
|
assert(MODULES(interp) == NULL);
|
|
|
|
MODULES(interp) = PyDict_New();
|
|
|
|
if (MODULES(interp) == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
return MODULES(interp);
|
2022-11-12 08:06:05 +08:00
|
|
|
}
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
PyObject *
|
|
|
|
_PyImport_GetModules(PyInterpreterState *interp)
|
2011-10-31 02:13:55 +08:00
|
|
|
{
|
2023-02-16 06:32:31 +08:00
|
|
|
return MODULES(interp);
|
2011-10-31 02:13:55 +08:00
|
|
|
}
|
|
|
|
|
2017-12-07 01:12:59 +08:00
|
|
|
void
|
2023-02-16 06:32:31 +08:00
|
|
|
_PyImport_ClearModules(PyInterpreterState *interp)
|
2017-12-07 01:12:59 +08:00
|
|
|
{
|
2023-02-16 06:32:31 +08:00
|
|
|
Py_SETREF(MODULES(interp), NULL);
|
2017-12-07 01:12:59 +08:00
|
|
|
}
|
|
|
|
|
2024-04-24 23:55:48 +08:00
|
|
|
static inline PyObject *
|
|
|
|
get_modules_dict(PyThreadState *tstate, bool fatal)
|
|
|
|
{
|
|
|
|
/* Technically, it would make sense to incref the dict,
|
|
|
|
* since sys.modules could be swapped out and decref'ed to 0
|
|
|
|
* before the caller is done using it. However, that is highly
|
|
|
|
* unlikely, especially since we can rely on a global lock
|
|
|
|
* (i.e. the GIL) for thread-safety. */
|
|
|
|
PyObject *modules = MODULES(tstate->interp);
|
|
|
|
if (modules == NULL) {
|
|
|
|
if (fatal) {
|
|
|
|
Py_FatalError("interpreter has no modules dictionary");
|
|
|
|
}
|
|
|
|
_PyErr_SetString(tstate, PyExc_RuntimeError,
|
|
|
|
"unable to get sys.modules");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return modules;
|
|
|
|
}
|
|
|
|
|
1997-08-02 11:10:38 +08:00
|
|
|
PyObject *
|
2000-07-23 02:47:25 +08:00
|
|
|
PyImport_GetModuleDict(void)
|
1997-08-02 11:10:38 +08:00
|
|
|
{
|
2024-04-24 23:55:48 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
return get_modules_dict(tstate, true);
|
2017-09-15 02:18:12 +08:00
|
|
|
}
|
1991-12-16 21:06:34 +08:00
|
|
|
|
2017-09-16 06:35:20 +08:00
|
|
|
int
|
|
|
|
_PyImport_SetModule(PyObject *name, PyObject *m)
|
|
|
|
{
|
2024-04-24 23:55:48 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
PyObject *modules = get_modules_dict(tstate, true);
|
2017-09-16 06:35:20 +08:00
|
|
|
return PyObject_SetItem(modules, name, m);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
_PyImport_SetModuleString(const char *name, PyObject *m)
|
|
|
|
{
|
2024-04-24 23:55:48 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
PyObject *modules = get_modules_dict(tstate, true);
|
2017-09-16 06:35:20 +08:00
|
|
|
return PyMapping_SetItemString(modules, name, m);
|
|
|
|
}
|
|
|
|
|
2019-06-19 08:54:39 +08:00
|
|
|
static PyObject *
|
|
|
|
import_get_module(PyThreadState *tstate, PyObject *name)
|
2017-09-16 06:35:20 +08:00
|
|
|
{
|
2024-04-24 23:55:48 +08:00
|
|
|
PyObject *modules = get_modules_dict(tstate, false);
|
2017-09-16 06:35:20 +08:00
|
|
|
if (modules == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2019-06-19 08:54:39 +08:00
|
|
|
|
|
|
|
PyObject *m;
|
2017-09-16 06:35:20 +08:00
|
|
|
Py_INCREF(modules);
|
2023-07-12 04:04:12 +08:00
|
|
|
(void)PyMapping_GetOptionalItem(modules, name, &m);
|
2017-09-16 06:35:20 +08:00
|
|
|
Py_DECREF(modules);
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
2019-09-11 20:47:39 +08:00
|
|
|
static int
|
2021-02-19 22:10:45 +08:00
|
|
|
import_ensure_initialized(PyInterpreterState *interp, PyObject *mod, PyObject *name)
|
2019-06-19 08:54:39 +08:00
|
|
|
{
|
2019-09-11 20:47:39 +08:00
|
|
|
PyObject *spec;
|
|
|
|
|
|
|
|
/* Optimization: only call _bootstrap._lock_unlock_module() if
|
|
|
|
__spec__._initializing is true.
|
|
|
|
NOTE: because of this, initializing must be set *before*
|
|
|
|
stuffing the new module in sys.modules.
|
|
|
|
*/
|
2023-12-07 18:19:43 +08:00
|
|
|
int rc = PyObject_GetOptionalAttr(mod, &_Py_ID(__spec__), &spec);
|
|
|
|
if (rc > 0) {
|
|
|
|
rc = _PyModuleSpec_IsInitializing(spec);
|
|
|
|
Py_DECREF(spec);
|
|
|
|
}
|
|
|
|
if (rc <= 0) {
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
/* Wait until module is done importing. */
|
|
|
|
PyObject *value = PyObject_CallMethodOneArg(
|
|
|
|
IMPORTLIB(interp), &_Py_ID(_lock_unlock_module), name);
|
|
|
|
if (value == NULL) {
|
|
|
|
return -1;
|
2019-09-11 20:47:39 +08:00
|
|
|
}
|
2023-12-07 18:19:43 +08:00
|
|
|
Py_DECREF(value);
|
2019-09-11 20:47:39 +08:00
|
|
|
return 0;
|
2019-06-19 08:54:39 +08:00
|
|
|
}
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
static void remove_importlib_frames(PyThreadState *tstate);
|
2019-06-19 08:54:39 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
PyObject *
|
|
|
|
PyImport_GetModule(PyObject *name)
|
1994-09-14 21:31:04 +08:00
|
|
|
{
|
2023-02-16 06:32:31 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
PyObject *mod;
|
2015-05-03 09:15:18 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
mod = import_get_module(tstate, name);
|
|
|
|
if (mod != NULL && mod != Py_None) {
|
|
|
|
if (import_ensure_initialized(tstate->interp, mod, name) < 0) {
|
|
|
|
Py_DECREF(mod);
|
|
|
|
remove_importlib_frames(tstate);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return mod;
|
1994-09-14 21:31:04 +08:00
|
|
|
}
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/* Get the module object corresponding to a module name.
|
|
|
|
First check the modules dictionary if there's one there,
|
|
|
|
if not, create a new one and insert it in the modules dictionary. */
|
1990-10-14 20:07:46 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
static PyObject *
|
|
|
|
import_add_module(PyThreadState *tstate, PyObject *name)
|
2010-04-17 08:19:56 +08:00
|
|
|
{
|
2024-04-24 23:55:48 +08:00
|
|
|
PyObject *modules = get_modules_dict(tstate, false);
|
2023-02-16 06:32:31 +08:00
|
|
|
if (modules == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-04-17 08:19:56 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
PyObject *m;
|
2023-07-12 04:04:12 +08:00
|
|
|
if (PyMapping_GetOptionalItem(modules, name, &m) < 0) {
|
2023-02-16 06:32:31 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (m != NULL && PyModule_Check(m)) {
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
Py_XDECREF(m);
|
|
|
|
m = PyModule_NewObject(name);
|
|
|
|
if (m == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (PyObject_SetItem(modules, name, m) != 0) {
|
|
|
|
Py_DECREF(m);
|
|
|
|
return NULL;
|
|
|
|
}
|
2012-07-03 03:13:11 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
return m;
|
|
|
|
}
|
2023-02-15 05:26:03 +08:00
|
|
|
|
2023-06-20 14:48:14 +08:00
|
|
|
PyObject *
|
|
|
|
PyImport_AddModuleRef(const char *name)
|
|
|
|
{
|
|
|
|
PyObject *name_obj = PyUnicode_FromString(name);
|
|
|
|
if (name_obj == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
PyObject *module = import_add_module(tstate, name_obj);
|
|
|
|
Py_DECREF(name_obj);
|
|
|
|
return module;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
PyObject *
|
|
|
|
PyImport_AddModuleObject(PyObject *name)
|
|
|
|
{
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
PyObject *mod = import_add_module(tstate, name);
|
2023-06-20 14:48:14 +08:00
|
|
|
if (!mod) {
|
|
|
|
return NULL;
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
2023-06-20 14:48:14 +08:00
|
|
|
|
2023-06-23 07:23:08 +08:00
|
|
|
// gh-86160: PyImport_AddModuleObject() returns a borrowed reference.
|
|
|
|
// Create a weak reference to produce a borrowed reference, since it can
|
|
|
|
// become NULL. sys.modules type can be different than dict and it is not
|
|
|
|
// guaranteed that it keeps a strong reference to the module. It can be a
|
|
|
|
// custom mapping with __getitem__() which returns a new object or removes
|
|
|
|
// returned object, or __setitem__ which does nothing. There is so much
|
|
|
|
// unknown. With weakref we can be sure that we get either a reference to
|
|
|
|
// live object or NULL.
|
|
|
|
//
|
|
|
|
// Use PyImport_AddModuleRef() to avoid these issues.
|
2023-06-20 14:48:14 +08:00
|
|
|
PyObject *ref = PyWeakref_NewRef(mod, NULL);
|
|
|
|
Py_DECREF(mod);
|
|
|
|
if (ref == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2023-06-23 07:23:08 +08:00
|
|
|
mod = _PyWeakref_GET_REF(ref);
|
2023-06-20 14:48:14 +08:00
|
|
|
Py_DECREF(ref);
|
2023-06-23 07:23:08 +08:00
|
|
|
Py_XDECREF(mod);
|
|
|
|
|
|
|
|
if (mod == NULL && !PyErr_Occurred()) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"sys.modules does not hold a strong reference "
|
|
|
|
"to the module");
|
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
return mod; /* borrowed reference */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyImport_AddModule(const char *name)
|
|
|
|
{
|
|
|
|
PyObject *nameobj = PyUnicode_FromString(name);
|
|
|
|
if (nameobj == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyObject *module = PyImport_AddModuleObject(nameobj);
|
|
|
|
Py_DECREF(nameobj);
|
|
|
|
return module;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Remove name from sys.modules, if it's there.
|
|
|
|
* Can be called with an exception raised.
|
|
|
|
* If fail to remove name a new exception will be chained with the old
|
|
|
|
* exception, otherwise the old exception is preserved.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
remove_module(PyThreadState *tstate, PyObject *name)
|
|
|
|
{
|
2023-03-19 23:17:59 +08:00
|
|
|
PyObject *exc = _PyErr_GetRaisedException(tstate);
|
2023-02-16 06:32:31 +08:00
|
|
|
|
2024-04-24 23:55:48 +08:00
|
|
|
PyObject *modules = get_modules_dict(tstate, true);
|
2023-02-16 06:32:31 +08:00
|
|
|
if (PyDict_CheckExact(modules)) {
|
2023-11-14 20:51:00 +08:00
|
|
|
// Error is reported to the caller
|
|
|
|
(void)PyDict_Pop(modules, name, NULL);
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
else if (PyMapping_DelItem(modules, name) < 0) {
|
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
|
|
|
|
_PyErr_Clear(tstate);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-03-19 23:17:59 +08:00
|
|
|
_PyErr_ChainExceptions1(exc);
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/************************************/
|
|
|
|
/* per-interpreter modules-by-index */
|
|
|
|
/************************************/
|
|
|
|
|
|
|
|
Py_ssize_t
|
|
|
|
_PyImport_GetNextModuleIndex(void)
|
|
|
|
{
|
2023-12-08 03:33:40 +08:00
|
|
|
return _Py_atomic_add_ssize(&LAST_MODULE_INDEX, 1) + 1;
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
#ifndef NDEBUG
|
|
|
|
struct extensions_cache_value;
|
|
|
|
static struct extensions_cache_value * _find_cached_def(PyModuleDef *);
|
|
|
|
static Py_ssize_t _get_cached_module_index(struct extensions_cache_value *);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static Py_ssize_t
|
|
|
|
_get_module_index_from_def(PyModuleDef *def)
|
|
|
|
{
|
|
|
|
Py_ssize_t index = def->m_base.m_index;
|
|
|
|
#ifndef NDEBUG
|
|
|
|
struct extensions_cache_value *cached = _find_cached_def(def);
|
|
|
|
assert(cached == NULL || index == _get_cached_module_index(cached));
|
|
|
|
#endif
|
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_set_module_index(PyModuleDef *def, Py_ssize_t index)
|
|
|
|
{
|
|
|
|
assert(index > 0);
|
|
|
|
if (index == def->m_base.m_index) {
|
|
|
|
/* There's nothing to do. */
|
|
|
|
}
|
|
|
|
else if (def->m_base.m_index == 0) {
|
|
|
|
/* It should have been initialized by PyModuleDef_Init().
|
|
|
|
* We assert here to catch this in dev, but keep going otherwise. */
|
|
|
|
assert(def->m_base.m_index != 0);
|
|
|
|
def->m_base.m_index = index;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* It was already set for a different module.
|
|
|
|
* We replace the old value. */
|
|
|
|
assert(def->m_base.m_index > 0);
|
|
|
|
def->m_base.m_index = index;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
static const char *
|
|
|
|
_modules_by_index_check(PyInterpreterState *interp, Py_ssize_t index)
|
|
|
|
{
|
2024-05-26 03:30:48 +08:00
|
|
|
if (index <= 0) {
|
2023-02-16 06:32:31 +08:00
|
|
|
return "invalid module index";
|
|
|
|
}
|
|
|
|
if (MODULES_BY_INDEX(interp) == NULL) {
|
|
|
|
return "Interpreters module-list not accessible.";
|
|
|
|
}
|
2024-05-28 03:35:30 +08:00
|
|
|
if (index >= PyList_GET_SIZE(MODULES_BY_INDEX(interp))) {
|
2023-02-16 06:32:31 +08:00
|
|
|
return "Module index out of bounds.";
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2024-05-05 05:24:02 +08:00
|
|
|
_modules_by_index_get(PyInterpreterState *interp, Py_ssize_t index)
|
2023-02-16 06:32:31 +08:00
|
|
|
{
|
|
|
|
if (_modules_by_index_check(interp, index) != NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyObject *res = PyList_GET_ITEM(MODULES_BY_INDEX(interp), index);
|
|
|
|
return res==Py_None ? NULL : res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
_modules_by_index_set(PyInterpreterState *interp,
|
2024-05-05 05:24:02 +08:00
|
|
|
Py_ssize_t index, PyObject *module)
|
2023-02-16 06:32:31 +08:00
|
|
|
{
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(index > 0);
|
2023-02-16 06:32:31 +08:00
|
|
|
|
|
|
|
if (MODULES_BY_INDEX(interp) == NULL) {
|
|
|
|
MODULES_BY_INDEX(interp) = PyList_New(0);
|
|
|
|
if (MODULES_BY_INDEX(interp) == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (PyList_GET_SIZE(MODULES_BY_INDEX(interp)) <= index) {
|
|
|
|
if (PyList_Append(MODULES_BY_INDEX(interp), Py_None) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return PyList_SetItem(MODULES_BY_INDEX(interp), index, Py_NewRef(module));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2024-05-05 05:24:02 +08:00
|
|
|
_modules_by_index_clear_one(PyInterpreterState *interp, Py_ssize_t index)
|
2023-02-16 06:32:31 +08:00
|
|
|
{
|
|
|
|
const char *err = _modules_by_index_check(interp, index);
|
|
|
|
if (err != NULL) {
|
|
|
|
Py_FatalError(err);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return PyList_SetItem(MODULES_BY_INDEX(interp), index, Py_NewRef(Py_None));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PyObject*
|
|
|
|
PyState_FindModule(PyModuleDef* module)
|
|
|
|
{
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
if (module->m_slots) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2024-05-05 05:24:02 +08:00
|
|
|
Py_ssize_t index = _get_module_index_from_def(module);
|
|
|
|
return _modules_by_index_get(interp, index);
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
|
2023-02-17 05:05:31 +08:00
|
|
|
/* _PyState_AddModule() has been completely removed from the C-API
|
|
|
|
(and was removed from the limited API in 3.6). However, we're
|
|
|
|
playing it safe and keeping it around for any stable ABI extensions
|
|
|
|
built against 3.2-3.5. */
|
|
|
|
int
|
|
|
|
_PyState_AddModule(PyThreadState *tstate, PyObject* module, PyModuleDef* def)
|
|
|
|
{
|
|
|
|
if (!def) {
|
|
|
|
assert(_PyErr_Occurred(tstate));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (def->m_slots) {
|
|
|
|
_PyErr_SetString(tstate,
|
|
|
|
PyExc_SystemError,
|
|
|
|
"PyState_AddModule called on module with slots");
|
|
|
|
return -1;
|
|
|
|
}
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(def->m_slots == NULL);
|
|
|
|
Py_ssize_t index = _get_module_index_from_def(def);
|
|
|
|
return _modules_by_index_set(tstate->interp, index, module);
|
2023-02-17 05:05:31 +08:00
|
|
|
}
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
int
|
|
|
|
PyState_AddModule(PyObject* module, PyModuleDef* def)
|
|
|
|
{
|
|
|
|
if (!def) {
|
|
|
|
Py_FatalError("module definition is NULL");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
if (def->m_slots) {
|
|
|
|
_PyErr_SetString(tstate,
|
|
|
|
PyExc_SystemError,
|
|
|
|
"PyState_AddModule called on module with slots");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyInterpreterState *interp = tstate->interp;
|
2024-05-05 05:24:02 +08:00
|
|
|
Py_ssize_t index = _get_module_index_from_def(def);
|
2023-02-16 06:32:31 +08:00
|
|
|
if (MODULES_BY_INDEX(interp) &&
|
|
|
|
index < PyList_GET_SIZE(MODULES_BY_INDEX(interp)) &&
|
|
|
|
module == PyList_GET_ITEM(MODULES_BY_INDEX(interp), index))
|
|
|
|
{
|
|
|
|
_Py_FatalErrorFormat(__func__, "module %p already added", module);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(def->m_slots == NULL);
|
|
|
|
return _modules_by_index_set(interp, index, module);
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
PyState_RemoveModule(PyModuleDef* def)
|
|
|
|
{
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
if (def->m_slots) {
|
|
|
|
_PyErr_SetString(tstate,
|
|
|
|
PyExc_SystemError,
|
|
|
|
"PyState_RemoveModule called on module with slots");
|
|
|
|
return -1;
|
|
|
|
}
|
2024-05-05 05:24:02 +08:00
|
|
|
Py_ssize_t index = _get_module_index_from_def(def);
|
|
|
|
return _modules_by_index_clear_one(tstate->interp, index);
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Used by finalize_modules()
|
|
|
|
void
|
|
|
|
_PyImport_ClearModulesByIndex(PyInterpreterState *interp)
|
|
|
|
{
|
|
|
|
if (!MODULES_BY_INDEX(interp)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_ssize_t i;
|
|
|
|
for (i = 0; i < PyList_GET_SIZE(MODULES_BY_INDEX(interp)); i++) {
|
|
|
|
PyObject *m = PyList_GET_ITEM(MODULES_BY_INDEX(interp), i);
|
|
|
|
if (PyModule_Check(m)) {
|
|
|
|
/* cleanup the saved copy of module dicts */
|
|
|
|
PyModuleDef *md = PyModule_GetDef(m);
|
|
|
|
if (md) {
|
2024-05-05 05:24:02 +08:00
|
|
|
// XXX Do this more carefully. The dict might be owned
|
|
|
|
// by another interpreter.
|
2023-02-16 06:32:31 +08:00
|
|
|
Py_CLEAR(md->m_base.m_copy);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Setting modules_by_index to NULL could be dangerous, so we
|
|
|
|
clear the list instead. */
|
|
|
|
if (PyList_SetSlice(MODULES_BY_INDEX(interp),
|
|
|
|
0, PyList_GET_SIZE(MODULES_BY_INDEX(interp)),
|
|
|
|
NULL)) {
|
2023-11-02 17:16:34 +08:00
|
|
|
PyErr_FormatUnraisable("Exception ignored on clearing interpreters module list");
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*********************/
|
|
|
|
/* extension modules */
|
|
|
|
/*********************/
|
|
|
|
|
2023-02-28 00:21:18 +08:00
|
|
|
/*
|
|
|
|
It may help to have a big picture view of what happens
|
|
|
|
when an extension is loaded. This includes when it is imported
|
2023-04-29 07:17:58 +08:00
|
|
|
for the first time.
|
2023-02-28 00:21:18 +08:00
|
|
|
|
2023-07-31 20:07:17 +08:00
|
|
|
Here's a summary, using importlib._bootstrap._load() as a starting point.
|
2023-02-28 00:21:18 +08:00
|
|
|
|
2023-04-29 07:17:58 +08:00
|
|
|
1. importlib._bootstrap._load()
|
2023-02-28 00:21:18 +08:00
|
|
|
2. _load(): acquire import lock
|
|
|
|
3. _load() -> importlib._bootstrap._load_unlocked()
|
|
|
|
4. _load_unlocked() -> importlib._bootstrap.module_from_spec()
|
|
|
|
5. module_from_spec() -> ExtensionFileLoader.create_module()
|
|
|
|
6. create_module() -> _imp.create_dynamic()
|
|
|
|
(see below)
|
|
|
|
7. module_from_spec() -> importlib._bootstrap._init_module_attrs()
|
|
|
|
8. _load_unlocked(): sys.modules[name] = module
|
|
|
|
9. _load_unlocked() -> ExtensionFileLoader.exec_module()
|
|
|
|
10. exec_module() -> _imp.exec_dynamic()
|
|
|
|
(see below)
|
|
|
|
11. _load(): release import lock
|
|
|
|
|
|
|
|
|
|
|
|
...for single-phase init modules, where m_size == -1:
|
|
|
|
|
|
|
|
(6). first time (not found in _PyRuntime.imports.extensions):
|
2024-04-24 23:55:48 +08:00
|
|
|
A. _imp_create_dynamic_impl() -> import_find_extension()
|
2024-04-29 23:29:07 +08:00
|
|
|
B. _imp_create_dynamic_impl() -> _PyImport_GetModInitFunc()
|
|
|
|
C. _PyImport_GetModInitFunc(): load <module init func>
|
2024-04-30 02:53:04 +08:00
|
|
|
D. _imp_create_dynamic_impl() -> import_run_extension()
|
|
|
|
E. import_run_extension() -> _PyImport_RunModInitFunc()
|
|
|
|
F. _PyImport_RunModInitFunc(): call <module init func>
|
|
|
|
G. <module init func> -> PyModule_Create() -> PyModule_Create2()
|
|
|
|
-> PyModule_CreateInitialized()
|
|
|
|
H. PyModule_CreateInitialized() -> PyModule_New()
|
|
|
|
I. PyModule_CreateInitialized(): allocate mod->md_state
|
|
|
|
J. PyModule_CreateInitialized() -> PyModule_AddFunctions()
|
|
|
|
K. PyModule_CreateInitialized() -> PyModule_SetDocString()
|
|
|
|
L. PyModule_CreateInitialized(): set mod->md_def
|
|
|
|
M. <module init func>: initialize the module, etc.
|
2024-05-03 08:51:43 +08:00
|
|
|
N. import_run_extension()
|
2024-04-30 02:53:04 +08:00
|
|
|
-> _PyImport_CheckSubinterpIncompatibleExtensionAllowed()
|
2024-05-03 08:51:43 +08:00
|
|
|
O. import_run_extension(): set __file__
|
|
|
|
P. import_run_extension() -> update_global_state_for_extension()
|
|
|
|
Q. update_global_state_for_extension():
|
2024-04-30 02:53:04 +08:00
|
|
|
copy __dict__ into def->m_base.m_copy
|
2024-05-03 08:51:43 +08:00
|
|
|
R. update_global_state_for_extension():
|
2024-04-30 02:53:04 +08:00
|
|
|
add it to _PyRuntime.imports.extensions
|
2024-05-03 08:51:43 +08:00
|
|
|
S. import_run_extension() -> finish_singlephase_extension()
|
|
|
|
T. finish_singlephase_extension():
|
2024-04-30 02:53:04 +08:00
|
|
|
add it to interp->imports.modules_by_index
|
2024-05-03 08:51:43 +08:00
|
|
|
U. finish_singlephase_extension(): add it to sys.modules
|
2024-04-29 23:29:07 +08:00
|
|
|
|
|
|
|
Step (Q) is skipped for core modules (sys/builtins).
|
2023-02-28 00:21:18 +08:00
|
|
|
|
|
|
|
(6). subsequent times (found in _PyRuntime.imports.extensions):
|
2024-04-24 23:55:48 +08:00
|
|
|
A. _imp_create_dynamic_impl() -> import_find_extension()
|
2024-05-03 08:51:43 +08:00
|
|
|
B. import_find_extension() -> reload_singlephase_extension()
|
|
|
|
C. reload_singlephase_extension()
|
|
|
|
-> _PyImport_CheckSubinterpIncompatibleExtensionAllowed()
|
|
|
|
D. reload_singlephase_extension() -> import_add_module()
|
|
|
|
E. if name in sys.modules: use that module
|
|
|
|
F. else:
|
|
|
|
1. import_add_module() -> PyModule_NewObject()
|
|
|
|
2. import_add_module(): set it on sys.modules
|
|
|
|
G. reload_singlephase_extension(): copy the "m_copy" dict into __dict__
|
|
|
|
H. reload_singlephase_extension(): add to modules_by_index
|
2023-02-28 00:21:18 +08:00
|
|
|
|
|
|
|
(10). (every time):
|
2024-04-24 23:55:48 +08:00
|
|
|
A. noop
|
2023-02-28 00:21:18 +08:00
|
|
|
|
|
|
|
|
|
|
|
...for single-phase init modules, where m_size >= 0:
|
|
|
|
|
|
|
|
(6). not main interpreter and never loaded there - every time (not found in _PyRuntime.imports.extensions):
|
2024-04-30 02:53:04 +08:00
|
|
|
A-P. (same as for m_size == -1)
|
2024-05-03 08:51:43 +08:00
|
|
|
Q. _PyImport_RunModInitFunc(): set def->m_base.m_init
|
|
|
|
R. (skipped)
|
|
|
|
S-U. (same as for m_size == -1)
|
2023-02-28 00:21:18 +08:00
|
|
|
|
|
|
|
(6). main interpreter - first time (not found in _PyRuntime.imports.extensions):
|
2024-05-03 08:51:43 +08:00
|
|
|
A-P. (same as for m_size == -1)
|
|
|
|
Q. _PyImport_RunModInitFunc(): set def->m_base.m_init
|
|
|
|
R-U. (same as for m_size == -1)
|
2023-02-28 00:21:18 +08:00
|
|
|
|
2024-04-29 23:29:07 +08:00
|
|
|
(6). subsequent times (found in _PyRuntime.imports.extensions):
|
2024-04-24 23:55:48 +08:00
|
|
|
A. _imp_create_dynamic_impl() -> import_find_extension()
|
2024-05-03 08:51:43 +08:00
|
|
|
B. import_find_extension() -> reload_singlephase_extension()
|
|
|
|
C. reload_singlephase_extension()
|
|
|
|
-> _PyImport_CheckSubinterpIncompatibleExtensionAllowed()
|
|
|
|
D. reload_singlephase_extension(): call def->m_base.m_init (see above)
|
|
|
|
E. reload_singlephase_extension(): add the module to sys.modules
|
|
|
|
F. reload_singlephase_extension(): add to modules_by_index
|
2023-02-28 00:21:18 +08:00
|
|
|
|
|
|
|
(10). every time:
|
2024-04-24 23:55:48 +08:00
|
|
|
A. noop
|
2023-02-28 00:21:18 +08:00
|
|
|
|
|
|
|
|
|
|
|
...for multi-phase init modules:
|
|
|
|
|
|
|
|
(6). every time:
|
2024-04-30 02:53:04 +08:00
|
|
|
A. _imp_create_dynamic_impl() -> import_find_extension() (not found)
|
|
|
|
B. _imp_create_dynamic_impl() -> _PyImport_GetModInitFunc()
|
|
|
|
C. _PyImport_GetModInitFunc(): load <module init func>
|
|
|
|
D. _imp_create_dynamic_impl() -> import_run_extension()
|
|
|
|
E. import_run_extension() -> _PyImport_RunModInitFunc()
|
|
|
|
F. _PyImport_RunModInitFunc(): call <module init func>
|
|
|
|
G. import_run_extension() -> PyModule_FromDefAndSpec()
|
|
|
|
H. PyModule_FromDefAndSpec(): gather/check moduledef slots
|
|
|
|
I. if there's a Py_mod_create slot:
|
2023-02-28 00:21:18 +08:00
|
|
|
1. PyModule_FromDefAndSpec(): call its function
|
2024-04-30 02:53:04 +08:00
|
|
|
J. else:
|
2023-02-28 00:21:18 +08:00
|
|
|
1. PyModule_FromDefAndSpec() -> PyModule_NewObject()
|
2024-04-30 02:53:04 +08:00
|
|
|
K: PyModule_FromDefAndSpec(): set mod->md_def
|
|
|
|
L. PyModule_FromDefAndSpec() -> _add_methods_to_object()
|
|
|
|
M. PyModule_FromDefAndSpec() -> PyModule_SetDocString()
|
2023-02-28 00:21:18 +08:00
|
|
|
|
|
|
|
(10). every time:
|
2024-04-24 23:55:48 +08:00
|
|
|
A. _imp_exec_dynamic_impl() -> exec_builtin_or_dynamic()
|
|
|
|
B. if mod->md_state == NULL (including if m_size == 0):
|
2023-02-28 00:21:18 +08:00
|
|
|
1. exec_builtin_or_dynamic() -> PyModule_ExecDef()
|
|
|
|
2. PyModule_ExecDef(): allocate mod->md_state
|
|
|
|
3. if there's a Py_mod_exec slot:
|
|
|
|
1. PyModule_ExecDef(): call its function
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/* Make sure name is fully qualified.
|
|
|
|
|
|
|
|
This is a bit of a hack: when the shared library is loaded,
|
|
|
|
the module name is "package.module", but the module calls
|
|
|
|
PyModule_Create*() with just "module" for the name. The shared
|
|
|
|
library loader squirrels away the true name of the module in
|
|
|
|
_PyRuntime.imports.pkgcontext, and PyModule_Create*() will
|
|
|
|
substitute this (if the name actually matches).
|
|
|
|
*/
|
2023-06-14 08:58:23 +08:00
|
|
|
|
|
|
|
#ifdef HAVE_THREAD_LOCAL
|
|
|
|
_Py_thread_local const char *pkgcontext = NULL;
|
|
|
|
# undef PKGCONTEXT
|
|
|
|
# define PKGCONTEXT pkgcontext
|
|
|
|
#endif
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
const char *
|
|
|
|
_PyImport_ResolveNameWithPackageContext(const char *name)
|
|
|
|
{
|
2023-06-14 08:58:23 +08:00
|
|
|
#ifndef HAVE_THREAD_LOCAL
|
2023-04-25 11:09:35 +08:00
|
|
|
PyThread_acquire_lock(EXTENSIONS.mutex, WAIT_LOCK);
|
2023-06-14 08:58:23 +08:00
|
|
|
#endif
|
2023-02-16 06:32:31 +08:00
|
|
|
if (PKGCONTEXT != NULL) {
|
|
|
|
const char *p = strrchr(PKGCONTEXT, '.');
|
|
|
|
if (p != NULL && strcmp(name, p+1) == 0) {
|
|
|
|
name = PKGCONTEXT;
|
|
|
|
PKGCONTEXT = NULL;
|
|
|
|
}
|
|
|
|
}
|
2023-06-14 08:58:23 +08:00
|
|
|
#ifndef HAVE_THREAD_LOCAL
|
2023-04-25 11:09:35 +08:00
|
|
|
PyThread_release_lock(EXTENSIONS.mutex);
|
2023-06-14 08:58:23 +08:00
|
|
|
#endif
|
2023-02-16 06:32:31 +08:00
|
|
|
return name;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *
|
|
|
|
_PyImport_SwapPackageContext(const char *newcontext)
|
|
|
|
{
|
2023-06-14 08:58:23 +08:00
|
|
|
#ifndef HAVE_THREAD_LOCAL
|
2023-04-25 11:09:35 +08:00
|
|
|
PyThread_acquire_lock(EXTENSIONS.mutex, WAIT_LOCK);
|
2023-06-14 08:58:23 +08:00
|
|
|
#endif
|
2023-02-16 06:32:31 +08:00
|
|
|
const char *oldcontext = PKGCONTEXT;
|
|
|
|
PKGCONTEXT = newcontext;
|
2023-06-14 08:58:23 +08:00
|
|
|
#ifndef HAVE_THREAD_LOCAL
|
2023-04-25 11:09:35 +08:00
|
|
|
PyThread_release_lock(EXTENSIONS.mutex);
|
2023-06-14 08:58:23 +08:00
|
|
|
#endif
|
2023-02-16 06:32:31 +08:00
|
|
|
return oldcontext;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef HAVE_DLOPEN
|
|
|
|
int
|
|
|
|
_PyImport_GetDLOpenFlags(PyInterpreterState *interp)
|
|
|
|
{
|
|
|
|
return DLOPENFLAGS(interp);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_PyImport_SetDLOpenFlags(PyInterpreterState *interp, int new_val)
|
|
|
|
{
|
|
|
|
DLOPENFLAGS(interp) = new_val;
|
|
|
|
}
|
|
|
|
#endif // HAVE_DLOPEN
|
|
|
|
|
|
|
|
|
|
|
|
/* Common implementation for _imp.exec_dynamic and _imp.exec_builtin */
|
|
|
|
static int
|
|
|
|
exec_builtin_or_dynamic(PyObject *mod) {
|
|
|
|
PyModuleDef *def;
|
|
|
|
void *state;
|
|
|
|
|
|
|
|
if (!PyModule_Check(mod)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
def = PyModule_GetDef(mod);
|
|
|
|
if (def == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
state = PyModule_GetState(mod);
|
|
|
|
if (state) {
|
|
|
|
/* Already initialized; skip reload */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return PyModule_ExecDef(mod, def);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2023-02-16 07:05:07 +08:00
|
|
|
static int clear_singlephase_extension(PyInterpreterState *interp,
|
|
|
|
PyObject *name, PyObject *filename);
|
|
|
|
|
|
|
|
// Currently, this is only used for testing.
|
|
|
|
// (See _testinternalcapi.clear_extension().)
|
2024-09-20 16:27:34 +08:00
|
|
|
// If adding another use, be careful about modules that import themselves
|
|
|
|
// recursively (see gh-123880).
|
2023-02-16 07:05:07 +08:00
|
|
|
int
|
|
|
|
_PyImport_ClearExtension(PyObject *name, PyObject *filename)
|
|
|
|
{
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
|
|
|
|
/* Clearing a module's C globals is up to the module. */
|
|
|
|
if (clear_singlephase_extension(interp, name, filename) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// In the future we'll probably also make sure the extension's
|
|
|
|
// file handle (and DL handle) is closed (requires saving it).
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/*****************************/
|
|
|
|
/* single-phase init modules */
|
|
|
|
/*****************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
We support a number of kinds of single-phase init builtin/extension modules:
|
|
|
|
|
|
|
|
* "basic"
|
|
|
|
* no module state (PyModuleDef.m_size == -1)
|
|
|
|
* does not support repeated init (we use PyModuleDef.m_base.m_copy)
|
|
|
|
* may have process-global state
|
|
|
|
* the module's def is cached in _PyRuntime.imports.extensions,
|
|
|
|
by (name, filename)
|
2023-02-15 05:26:03 +08:00
|
|
|
* "reinit"
|
|
|
|
* no module state (PyModuleDef.m_size == 0)
|
|
|
|
* supports repeated init (m_copy is never used)
|
|
|
|
* should not have any process-global state
|
|
|
|
* its def is never cached in _PyRuntime.imports.extensions
|
|
|
|
(except, currently, under the main interpreter, for some reason)
|
|
|
|
* "with state" (almost the same as reinit)
|
|
|
|
* has module state (PyModuleDef.m_size > 0)
|
|
|
|
* supports repeated init (m_copy is never used)
|
|
|
|
* should not have any process-global state
|
|
|
|
* its def is never cached in _PyRuntime.imports.extensions
|
|
|
|
(except, currently, under the main interpreter, for some reason)
|
|
|
|
|
|
|
|
There are also variants within those classes:
|
|
|
|
|
|
|
|
* two or more modules share a PyModuleDef
|
|
|
|
* a module's init func uses another module's PyModuleDef
|
|
|
|
* a module's init func calls another's module's init func
|
|
|
|
* a module's init "func" is actually a variable statically initialized
|
|
|
|
to another module's init func
|
|
|
|
* two or modules share "methods"
|
|
|
|
* a module's init func copies another module's PyModuleDef
|
|
|
|
(with a different name)
|
|
|
|
* (basic-only) two or modules share process-global state
|
|
|
|
|
|
|
|
In the first case, where modules share a PyModuleDef, the following
|
|
|
|
notable weirdness happens:
|
|
|
|
|
|
|
|
* the module's __name__ matches the def, not the requested name
|
|
|
|
* the last module (with the same def) to be imported for the first time wins
|
|
|
|
* returned by PyState_Find_Module() (via interp->modules_by_index)
|
|
|
|
* (non-basic-only) its init func is used when re-loading any of them
|
|
|
|
(via the def's m_init)
|
|
|
|
* (basic-only) the copy of its __dict__ is used when re-loading any of them
|
|
|
|
(via the def's m_copy)
|
|
|
|
|
|
|
|
However, the following happens as expected:
|
|
|
|
|
|
|
|
* a new module object (with its own __dict__) is created for each request
|
|
|
|
* the module's __spec__ has the requested name
|
|
|
|
* the loaded module is cached in sys.modules under the requested name
|
|
|
|
* the m_index field of the shared def is not changed,
|
|
|
|
so at least PyState_FindModule() will always look in the same place
|
|
|
|
|
|
|
|
For "basic" modules there are other quirks:
|
|
|
|
|
|
|
|
* (whether sharing a def or not) when loaded the first time,
|
|
|
|
m_copy is set before _init_module_attrs() is called
|
|
|
|
in importlib._bootstrap.module_from_spec(),
|
|
|
|
so when the module is re-loaded, the previous value
|
|
|
|
for __wpec__ (and others) is reset, possibly unexpectedly.
|
|
|
|
|
|
|
|
Generally, when multiple interpreters are involved, some of the above
|
|
|
|
gets even messier.
|
|
|
|
*/
|
|
|
|
|
2023-03-30 07:15:43 +08:00
|
|
|
static inline void
|
|
|
|
extensions_lock_acquire(void)
|
|
|
|
{
|
2023-12-08 03:33:40 +08:00
|
|
|
PyMutex_Lock(&_PyRuntime.imports.extensions.mutex);
|
2023-03-30 07:15:43 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
extensions_lock_release(void)
|
|
|
|
{
|
2023-12-08 03:33:40 +08:00
|
|
|
PyMutex_Unlock(&_PyRuntime.imports.extensions.mutex);
|
2023-03-30 07:15:43 +08:00
|
|
|
}
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
|
1997-08-02 11:10:38 +08:00
|
|
|
/* Magic for extension modules (built-in as well as dynamically
|
|
|
|
loaded). To prevent initializing an extension module more than
|
2012-12-14 23:04:59 +08:00
|
|
|
once, we keep a static dictionary 'extensions' keyed by the tuple
|
|
|
|
(module name, module name) (for built-in modules) or by
|
|
|
|
(filename, module name) (for dynamically loaded modules), containing these
|
|
|
|
modules. A copy of the module's dictionary is stored by calling
|
2024-04-24 23:55:48 +08:00
|
|
|
fix_up_extension() immediately after the module initialization
|
2012-12-14 23:04:59 +08:00
|
|
|
function succeeds. A copy can be retrieved from there by calling
|
2021-01-12 22:43:32 +08:00
|
|
|
import_find_extension().
|
1990-10-14 20:07:46 +08:00
|
|
|
|
2010-06-18 02:38:20 +08:00
|
|
|
Modules which do support multiple initialization set their m_size
|
|
|
|
field to a non-negative number (indicating the size of the
|
|
|
|
module-specific state). They are still recorded in the extensions
|
|
|
|
dictionary, to avoid loading shared libraries twice.
|
2008-06-11 13:26:20 +08:00
|
|
|
*/
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
typedef struct cached_m_dict {
|
|
|
|
/* A shallow copy of the original module's __dict__. */
|
|
|
|
PyObject *copied;
|
|
|
|
/* The interpreter that owns the copy. */
|
|
|
|
int64_t interpid;
|
|
|
|
} *cached_m_dict_t;
|
|
|
|
|
|
|
|
struct extensions_cache_value {
|
|
|
|
PyModuleDef *def;
|
|
|
|
|
|
|
|
/* The function used to re-initialize the module.
|
|
|
|
This is only set for legacy (single-phase init) extension modules
|
|
|
|
and only used for those that support multiple initializations
|
|
|
|
(m_size >= 0).
|
|
|
|
It is set by update_global_state_for_extension(). */
|
|
|
|
PyModInitFunction m_init;
|
|
|
|
|
|
|
|
/* The module's index into its interpreter's modules_by_index cache.
|
|
|
|
This is set for all extension modules but only used for legacy ones.
|
|
|
|
(See PyInterpreterState.modules_by_index for more info.) */
|
|
|
|
Py_ssize_t m_index;
|
|
|
|
|
|
|
|
/* A copy of the module's __dict__ after the first time it was loaded.
|
|
|
|
This is only set/used for legacy modules that do not support
|
|
|
|
multiple initializations.
|
|
|
|
It is set exclusively by fixup_cached_def(). */
|
|
|
|
cached_m_dict_t m_dict;
|
|
|
|
struct cached_m_dict _m_dict;
|
|
|
|
|
|
|
|
_Py_ext_module_origin origin;
|
2024-05-07 11:07:23 +08:00
|
|
|
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
/* The module's md_gil slot, for legacy modules that are reinitialized from
|
|
|
|
m_dict rather than calling their initialization function again. */
|
|
|
|
void *md_gil;
|
|
|
|
#endif
|
2024-05-05 05:24:02 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct extensions_cache_value *
|
|
|
|
alloc_extensions_cache_value(void)
|
|
|
|
{
|
|
|
|
struct extensions_cache_value *value
|
|
|
|
= PyMem_RawMalloc(sizeof(struct extensions_cache_value));
|
|
|
|
if (value == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
*value = (struct extensions_cache_value){0};
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
free_extensions_cache_value(struct extensions_cache_value *value)
|
|
|
|
{
|
|
|
|
PyMem_RawFree(value);
|
|
|
|
}
|
|
|
|
|
|
|
|
static Py_ssize_t
|
|
|
|
_get_cached_module_index(struct extensions_cache_value *cached)
|
|
|
|
{
|
|
|
|
assert(cached->m_index > 0);
|
|
|
|
return cached->m_index;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
fixup_cached_def(struct extensions_cache_value *value)
|
|
|
|
{
|
|
|
|
/* For the moment, the values in the def's m_base may belong
|
|
|
|
* to another module, and we're replacing them here. This can
|
|
|
|
* cause problems later if the old module is reloaded.
|
|
|
|
*
|
|
|
|
* Also, we don't decref any old cached values first when we
|
|
|
|
* replace them here, in case we need to restore them in the
|
|
|
|
* near future. Instead, the caller is responsible for wrapping
|
|
|
|
* this up by calling cleanup_old_cached_def() or
|
|
|
|
* restore_old_cached_def() if there was an error. */
|
|
|
|
PyModuleDef *def = value->def;
|
|
|
|
assert(def != NULL);
|
|
|
|
|
|
|
|
/* We assume that all module defs are statically allocated
|
|
|
|
and will never be freed. Otherwise, we would incref here. */
|
|
|
|
_Py_SetImmortalUntracked((PyObject *)def);
|
|
|
|
|
|
|
|
def->m_base.m_init = value->m_init;
|
|
|
|
|
|
|
|
assert(value->m_index > 0);
|
|
|
|
_set_module_index(def, value->m_index);
|
|
|
|
|
|
|
|
/* Different modules can share the same def, so we can't just
|
|
|
|
* expect m_copy to be NULL. */
|
|
|
|
assert(def->m_base.m_copy == NULL
|
|
|
|
|| def->m_base.m_init == NULL
|
|
|
|
|| value->m_dict != NULL);
|
|
|
|
if (value->m_dict != NULL) {
|
|
|
|
assert(value->m_dict->copied != NULL);
|
|
|
|
/* As noted above, we don't first decref the old value, if any. */
|
|
|
|
def->m_base.m_copy = Py_NewRef(value->m_dict->copied);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
restore_old_cached_def(PyModuleDef *def, PyModuleDef_Base *oldbase)
|
|
|
|
{
|
|
|
|
def->m_base = *oldbase;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
cleanup_old_cached_def(PyModuleDef_Base *oldbase)
|
|
|
|
{
|
|
|
|
Py_XDECREF(oldbase->m_copy);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
del_cached_def(struct extensions_cache_value *value)
|
|
|
|
{
|
|
|
|
/* If we hadn't made the stored defs immortal, we would decref here.
|
|
|
|
However, this decref would be problematic if the module def were
|
|
|
|
dynamically allocated, it were the last ref, and this function
|
|
|
|
were called with an interpreter other than the def's owner. */
|
2024-10-11 01:19:08 +08:00
|
|
|
assert(value->def == NULL || _Py_IsImmortal(value->def));
|
2024-05-05 05:24:02 +08:00
|
|
|
|
|
|
|
Py_XDECREF(value->def->m_base.m_copy);
|
|
|
|
value->def->m_base.m_copy = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
init_cached_m_dict(struct extensions_cache_value *value, PyObject *m_dict)
|
|
|
|
{
|
|
|
|
assert(value != NULL);
|
|
|
|
/* This should only have been called without an m_dict already set. */
|
|
|
|
assert(value->m_dict == NULL);
|
|
|
|
if (m_dict == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
assert(PyDict_Check(m_dict));
|
|
|
|
assert(value->origin != _Py_ext_module_origin_CORE);
|
|
|
|
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
assert(!is_interpreter_isolated(interp));
|
|
|
|
|
|
|
|
/* XXX gh-88216: The copied dict is owned by the current
|
|
|
|
* interpreter. That's a problem if the interpreter has
|
|
|
|
* its own obmalloc state or if the module is successfully
|
|
|
|
* imported into such an interpreter. If the interpreter
|
|
|
|
* has its own GIL then there may be data races and
|
|
|
|
* PyImport_ClearModulesByIndex() can crash. Normally,
|
|
|
|
* a single-phase init module cannot be imported in an
|
|
|
|
* isolated interpreter, but there are ways around that.
|
|
|
|
* Hence, heere be dragons! Ideally we would instead do
|
|
|
|
* something like make a read-only, immortal copy of the
|
|
|
|
* dict using PyMem_RawMalloc() and store *that* in m_copy.
|
|
|
|
* Then we'd need to make sure to clear that when the
|
|
|
|
* runtime is finalized, rather than in
|
|
|
|
* PyImport_ClearModulesByIndex(). */
|
|
|
|
PyObject *copied = PyDict_Copy(m_dict);
|
|
|
|
if (copied == NULL) {
|
|
|
|
/* We expect this can only be "out of memory". */
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
// XXX We may want to make the copy immortal.
|
|
|
|
|
|
|
|
value->_m_dict = (struct cached_m_dict){
|
|
|
|
.copied=copied,
|
|
|
|
.interpid=PyInterpreterState_GetID(interp),
|
|
|
|
};
|
|
|
|
|
|
|
|
value->m_dict = &value->_m_dict;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
del_cached_m_dict(struct extensions_cache_value *value)
|
|
|
|
{
|
|
|
|
if (value->m_dict != NULL) {
|
|
|
|
assert(value->m_dict == &value->_m_dict);
|
|
|
|
assert(value->m_dict->copied != NULL);
|
|
|
|
/* In the future we can take advantage of m_dict->interpid
|
|
|
|
* to decref the dict using the owning interpreter. */
|
|
|
|
Py_XDECREF(value->m_dict->copied);
|
|
|
|
value->m_dict = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject * get_core_module_dict(
|
|
|
|
PyInterpreterState *interp, PyObject *name, PyObject *path);
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
get_cached_m_dict(struct extensions_cache_value *value,
|
|
|
|
PyObject *name, PyObject *path)
|
|
|
|
{
|
|
|
|
assert(value != NULL);
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
/* It might be a core module (e.g. sys & builtins),
|
|
|
|
for which we don't cache m_dict. */
|
|
|
|
if (value->origin == _Py_ext_module_origin_CORE) {
|
|
|
|
return get_core_module_dict(interp, name, path);
|
|
|
|
}
|
|
|
|
assert(value->def != NULL);
|
|
|
|
// XXX Switch to value->m_dict.
|
|
|
|
PyObject *m_dict = value->def->m_base.m_copy;
|
|
|
|
Py_XINCREF(m_dict);
|
|
|
|
return m_dict;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
del_extensions_cache_value(struct extensions_cache_value *value)
|
|
|
|
{
|
|
|
|
if (value != NULL) {
|
|
|
|
del_cached_m_dict(value);
|
|
|
|
del_cached_def(value);
|
|
|
|
free_extensions_cache_value(value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-29 04:39:08 +08:00
|
|
|
static void *
|
|
|
|
hashtable_key_from_2_strings(PyObject *str1, PyObject *str2, const char sep)
|
|
|
|
{
|
|
|
|
Py_ssize_t str1_len, str2_len;
|
|
|
|
const char *str1_data = PyUnicode_AsUTF8AndSize(str1, &str1_len);
|
|
|
|
const char *str2_data = PyUnicode_AsUTF8AndSize(str2, &str2_len);
|
|
|
|
if (str1_data == NULL || str2_data == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Make sure sep and the NULL byte won't cause an overflow. */
|
|
|
|
assert(SIZE_MAX - str1_len - str2_len > 2);
|
|
|
|
size_t size = str1_len + 1 + str2_len + 1;
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
// XXX Use a buffer if it's a temp value (every case but "set").
|
2023-07-29 04:39:08 +08:00
|
|
|
char *key = PyMem_RawMalloc(size);
|
|
|
|
if (key == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
strncpy(key, str1_data, str1_len);
|
|
|
|
key[str1_len] = sep;
|
|
|
|
strncpy(key + str1_len + 1, str2_data, str2_len + 1);
|
|
|
|
assert(strlen(key) == size - 1);
|
|
|
|
return key;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Py_uhash_t
|
|
|
|
hashtable_hash_str(const void *key)
|
|
|
|
{
|
2024-08-30 23:42:27 +08:00
|
|
|
return Py_HashBuffer(key, strlen((const char *)key));
|
2023-07-29 04:39:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
hashtable_compare_str(const void *key1, const void *key2)
|
|
|
|
{
|
|
|
|
return strcmp((const char *)key1, (const char *)key2) == 0;
|
|
|
|
}
|
|
|
|
|
2023-03-30 07:15:43 +08:00
|
|
|
static void
|
2023-07-29 04:39:08 +08:00
|
|
|
hashtable_destroy_str(void *ptr)
|
2023-03-30 07:15:43 +08:00
|
|
|
{
|
2023-07-29 04:39:08 +08:00
|
|
|
PyMem_RawFree(ptr);
|
2023-03-30 07:15:43 +08:00
|
|
|
}
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
#ifndef NDEBUG
|
|
|
|
struct hashtable_next_match_def_data {
|
|
|
|
PyModuleDef *def;
|
|
|
|
struct extensions_cache_value *matched;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
|
|
|
hashtable_next_match_def(_Py_hashtable_t *ht,
|
|
|
|
const void *key, const void *value, void *user_data)
|
|
|
|
{
|
|
|
|
if (value == NULL) {
|
|
|
|
/* It was previously deleted. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
struct hashtable_next_match_def_data *data
|
|
|
|
= (struct hashtable_next_match_def_data *)user_data;
|
|
|
|
struct extensions_cache_value *cur
|
|
|
|
= (struct extensions_cache_value *)value;
|
|
|
|
if (cur->def == data->def) {
|
|
|
|
data->matched = cur;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct extensions_cache_value *
|
|
|
|
_find_cached_def(PyModuleDef *def)
|
|
|
|
{
|
|
|
|
struct hashtable_next_match_def_data data = {0};
|
|
|
|
(void)_Py_hashtable_foreach(
|
|
|
|
EXTENSIONS.hashtable, hashtable_next_match_def, &data);
|
|
|
|
return data.matched;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2023-07-29 04:39:08 +08:00
|
|
|
#define HTSEP ':'
|
|
|
|
|
2024-05-03 08:51:43 +08:00
|
|
|
static int
|
|
|
|
_extensions_cache_init(void)
|
2022-11-12 05:16:28 +08:00
|
|
|
{
|
2024-05-03 08:51:43 +08:00
|
|
|
_Py_hashtable_allocator_t alloc = {PyMem_RawMalloc, PyMem_RawFree};
|
|
|
|
EXTENSIONS.hashtable = _Py_hashtable_new_full(
|
|
|
|
hashtable_hash_str,
|
|
|
|
hashtable_compare_str,
|
|
|
|
hashtable_destroy_str, // key
|
2024-05-05 05:24:02 +08:00
|
|
|
(_Py_hashtable_destroy_func)del_extensions_cache_value, // value
|
2024-05-03 08:51:43 +08:00
|
|
|
&alloc
|
|
|
|
);
|
2023-07-29 04:39:08 +08:00
|
|
|
if (EXTENSIONS.hashtable == NULL) {
|
2024-05-03 08:51:43 +08:00
|
|
|
PyErr_NoMemory();
|
|
|
|
return -1;
|
2023-03-30 07:15:43 +08:00
|
|
|
}
|
2024-05-03 08:51:43 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2023-03-30 07:15:43 +08:00
|
|
|
|
2024-05-03 08:51:43 +08:00
|
|
|
static _Py_hashtable_entry_t *
|
|
|
|
_extensions_cache_find_unlocked(PyObject *path, PyObject *name,
|
|
|
|
void **p_key)
|
|
|
|
{
|
|
|
|
if (EXTENSIONS.hashtable == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
void *key = hashtable_key_from_2_strings(path, name, HTSEP);
|
2023-07-29 04:39:08 +08:00
|
|
|
if (key == NULL) {
|
2024-05-03 08:51:43 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
_Py_hashtable_entry_t *entry =
|
|
|
|
_Py_hashtable_get_entry(EXTENSIONS.hashtable, key);
|
|
|
|
if (p_key != NULL) {
|
|
|
|
*p_key = key;
|
2023-07-29 04:39:08 +08:00
|
|
|
}
|
2024-05-03 08:51:43 +08:00
|
|
|
else {
|
|
|
|
hashtable_destroy_str(key);
|
|
|
|
}
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
/* This can only fail with "out of memory". */
|
|
|
|
static struct extensions_cache_value *
|
2024-05-03 08:51:43 +08:00
|
|
|
_extensions_cache_get(PyObject *path, PyObject *name)
|
|
|
|
{
|
2024-05-05 05:24:02 +08:00
|
|
|
struct extensions_cache_value *value = NULL;
|
2024-05-03 08:51:43 +08:00
|
|
|
extensions_lock_acquire();
|
|
|
|
|
|
|
|
_Py_hashtable_entry_t *entry =
|
|
|
|
_extensions_cache_find_unlocked(path, name, NULL);
|
2023-07-29 04:39:08 +08:00
|
|
|
if (entry == NULL) {
|
2024-05-03 08:51:43 +08:00
|
|
|
/* It was never added. */
|
2023-03-30 07:15:43 +08:00
|
|
|
goto finally;
|
2022-11-12 05:16:28 +08:00
|
|
|
}
|
2024-05-05 05:24:02 +08:00
|
|
|
value = (struct extensions_cache_value *)entry->value;
|
2023-03-30 07:15:43 +08:00
|
|
|
|
|
|
|
finally:
|
|
|
|
extensions_lock_release();
|
2024-05-05 05:24:02 +08:00
|
|
|
return value;
|
2022-11-12 05:16:28 +08:00
|
|
|
}
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
/* This can only fail with "out of memory". */
|
|
|
|
static struct extensions_cache_value *
|
|
|
|
_extensions_cache_set(PyObject *path, PyObject *name,
|
|
|
|
PyModuleDef *def, PyModInitFunction m_init,
|
|
|
|
Py_ssize_t m_index, PyObject *m_dict,
|
2024-05-07 11:07:23 +08:00
|
|
|
_Py_ext_module_origin origin, void *md_gil)
|
2022-11-12 05:16:28 +08:00
|
|
|
{
|
2024-05-05 05:24:02 +08:00
|
|
|
struct extensions_cache_value *value = NULL;
|
|
|
|
void *key = NULL;
|
|
|
|
struct extensions_cache_value *newvalue = NULL;
|
|
|
|
PyModuleDef_Base olddefbase = def->m_base;
|
|
|
|
|
2024-05-03 08:51:43 +08:00
|
|
|
assert(def != NULL);
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(m_init == NULL || m_dict == NULL);
|
|
|
|
/* We expect the same symbol to be used and the shared object file
|
|
|
|
* to have remained loaded, so it must be the same pointer. */
|
|
|
|
assert(def->m_base.m_init == NULL || def->m_base.m_init == m_init);
|
|
|
|
/* For now we don't worry about comparing value->m_copy. */
|
|
|
|
assert(def->m_base.m_copy == NULL || m_dict != NULL);
|
|
|
|
assert((origin == _Py_ext_module_origin_DYNAMIC) == (name != path));
|
|
|
|
assert(origin != _Py_ext_module_origin_CORE || m_dict == NULL);
|
|
|
|
|
2023-03-30 07:15:43 +08:00
|
|
|
extensions_lock_acquire();
|
|
|
|
|
2023-07-29 04:39:08 +08:00
|
|
|
if (EXTENSIONS.hashtable == NULL) {
|
2024-05-03 08:51:43 +08:00
|
|
|
if (_extensions_cache_init() < 0) {
|
2023-07-29 04:39:08 +08:00
|
|
|
goto finally;
|
|
|
|
}
|
2023-03-30 07:15:43 +08:00
|
|
|
}
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
/* Create a cached value to populate for the module. */
|
2024-05-03 08:51:43 +08:00
|
|
|
_Py_hashtable_entry_t *entry =
|
|
|
|
_extensions_cache_find_unlocked(path, name, &key);
|
2024-05-05 05:24:02 +08:00
|
|
|
value = entry == NULL
|
|
|
|
? NULL
|
|
|
|
: (struct extensions_cache_value *)entry->value;
|
|
|
|
if (value != NULL) {
|
2024-09-20 16:27:34 +08:00
|
|
|
/* gh-123880: If there's an existing cache value, it means a module is
|
|
|
|
* being imported recursively from its PyInit_* or Py_mod_* function.
|
|
|
|
* (That function presumably handles returning a partially
|
|
|
|
* constructed module in such a case.)
|
|
|
|
* We can reuse the existing cache value; it is owned by the cache.
|
|
|
|
* (Entries get removed from it in exceptional circumstances,
|
|
|
|
* after interpreter shutdown, and in runtime shutdown.)
|
|
|
|
*/
|
|
|
|
goto finally_oldvalue;
|
2024-05-05 05:24:02 +08:00
|
|
|
}
|
|
|
|
newvalue = alloc_extensions_cache_value();
|
|
|
|
if (newvalue == NULL) {
|
|
|
|
goto finally;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Populate the new cache value data. */
|
|
|
|
*newvalue = (struct extensions_cache_value){
|
|
|
|
.def=def,
|
|
|
|
.m_init=m_init,
|
|
|
|
.m_index=m_index,
|
|
|
|
/* m_dict is set by set_cached_m_dict(). */
|
|
|
|
.origin=origin,
|
2024-05-07 11:07:23 +08:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
.md_gil=md_gil,
|
|
|
|
#endif
|
2024-05-05 05:24:02 +08:00
|
|
|
};
|
2024-05-07 11:07:23 +08:00
|
|
|
#ifndef Py_GIL_DISABLED
|
|
|
|
(void)md_gil;
|
|
|
|
#endif
|
2024-05-05 05:24:02 +08:00
|
|
|
if (init_cached_m_dict(newvalue, m_dict) < 0) {
|
|
|
|
goto finally;
|
|
|
|
}
|
|
|
|
fixup_cached_def(newvalue);
|
|
|
|
|
2023-07-29 04:39:08 +08:00
|
|
|
if (entry == NULL) {
|
2024-05-03 08:51:43 +08:00
|
|
|
/* It was never added. */
|
2024-05-05 05:24:02 +08:00
|
|
|
if (_Py_hashtable_set(EXTENSIONS.hashtable, key, newvalue) < 0) {
|
2023-07-29 04:39:08 +08:00
|
|
|
PyErr_NoMemory();
|
2023-03-30 07:15:43 +08:00
|
|
|
goto finally;
|
2022-11-12 05:16:28 +08:00
|
|
|
}
|
2024-05-03 08:51:43 +08:00
|
|
|
/* The hashtable owns the key now. */
|
|
|
|
key = NULL;
|
|
|
|
}
|
2024-05-05 05:24:02 +08:00
|
|
|
else if (value == NULL) {
|
2024-05-03 08:51:43 +08:00
|
|
|
/* It was previously deleted. */
|
2024-05-05 05:24:02 +08:00
|
|
|
entry->value = newvalue;
|
2022-11-12 05:16:28 +08:00
|
|
|
}
|
2023-07-29 04:39:08 +08:00
|
|
|
else {
|
2024-05-05 05:24:02 +08:00
|
|
|
/* We are updating the entry for an existing module. */
|
|
|
|
/* We expect def to be static, so it must be the same pointer. */
|
|
|
|
assert(value->def == def);
|
|
|
|
/* We expect the same symbol to be used and the shared object file
|
|
|
|
* to have remained loaded, so it must be the same pointer. */
|
|
|
|
assert(value->m_init == m_init);
|
|
|
|
/* The same module can't switch between caching __dict__ and not. */
|
|
|
|
assert((value->m_dict == NULL) == (m_dict == NULL));
|
|
|
|
/* This shouldn't ever happen. */
|
|
|
|
Py_UNREACHABLE();
|
2023-03-30 07:15:43 +08:00
|
|
|
}
|
2024-05-03 08:51:43 +08:00
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
value = newvalue;
|
2023-03-30 07:15:43 +08:00
|
|
|
|
|
|
|
finally:
|
2024-05-05 05:24:02 +08:00
|
|
|
if (value == NULL) {
|
|
|
|
restore_old_cached_def(def, &olddefbase);
|
|
|
|
if (newvalue != NULL) {
|
|
|
|
del_extensions_cache_value(newvalue);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
cleanup_old_cached_def(&olddefbase);
|
|
|
|
}
|
|
|
|
|
2024-09-20 16:27:34 +08:00
|
|
|
finally_oldvalue:
|
2023-03-30 07:15:43 +08:00
|
|
|
extensions_lock_release();
|
2024-05-03 08:51:43 +08:00
|
|
|
if (key != NULL) {
|
|
|
|
hashtable_destroy_str(key);
|
|
|
|
}
|
2024-05-05 05:24:02 +08:00
|
|
|
|
|
|
|
return value;
|
2022-11-12 05:16:28 +08:00
|
|
|
}
|
|
|
|
|
2023-07-29 04:39:08 +08:00
|
|
|
static void
|
2024-05-03 08:51:43 +08:00
|
|
|
_extensions_cache_delete(PyObject *path, PyObject *name)
|
2023-02-16 07:05:07 +08:00
|
|
|
{
|
2023-03-30 07:15:43 +08:00
|
|
|
extensions_lock_acquire();
|
|
|
|
|
2023-07-29 04:39:08 +08:00
|
|
|
if (EXTENSIONS.hashtable == NULL) {
|
|
|
|
/* It was never added. */
|
2023-03-30 07:15:43 +08:00
|
|
|
goto finally;
|
|
|
|
}
|
|
|
|
|
2024-05-03 08:51:43 +08:00
|
|
|
_Py_hashtable_entry_t *entry =
|
|
|
|
_extensions_cache_find_unlocked(path, name, NULL);
|
2023-07-29 04:39:08 +08:00
|
|
|
if (entry == NULL) {
|
|
|
|
/* It was never added. */
|
2023-03-30 07:15:43 +08:00
|
|
|
goto finally;
|
|
|
|
}
|
2023-07-29 04:39:08 +08:00
|
|
|
if (entry->value == NULL) {
|
|
|
|
/* It was already removed. */
|
2023-03-30 07:15:43 +08:00
|
|
|
goto finally;
|
|
|
|
}
|
2024-05-05 05:24:02 +08:00
|
|
|
struct extensions_cache_value *value = entry->value;
|
2023-07-29 04:39:08 +08:00
|
|
|
entry->value = NULL;
|
2023-03-30 07:15:43 +08:00
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
del_extensions_cache_value(value);
|
|
|
|
|
2023-03-30 07:15:43 +08:00
|
|
|
finally:
|
|
|
|
extensions_lock_release();
|
2023-02-16 07:05:07 +08:00
|
|
|
}
|
|
|
|
|
2022-11-12 05:16:28 +08:00
|
|
|
static void
|
2023-02-16 07:05:07 +08:00
|
|
|
_extensions_cache_clear_all(void)
|
2022-11-12 05:16:28 +08:00
|
|
|
{
|
2023-03-30 07:15:43 +08:00
|
|
|
/* The runtime (i.e. main interpreter) must be finalizing,
|
|
|
|
so we don't need to worry about the lock. */
|
2023-07-29 04:39:08 +08:00
|
|
|
_Py_hashtable_destroy(EXTENSIONS.hashtable);
|
|
|
|
EXTENSIONS.hashtable = NULL;
|
2022-11-12 05:16:28 +08:00
|
|
|
}
|
|
|
|
|
2023-07-29 04:39:08 +08:00
|
|
|
#undef HTSEP
|
|
|
|
|
2023-02-16 09:16:00 +08:00
|
|
|
|
|
|
|
static bool
|
|
|
|
check_multi_interp_extensions(PyInterpreterState *interp)
|
|
|
|
{
|
|
|
|
int override = OVERRIDE_MULTI_INTERP_EXTENSIONS_CHECK(interp);
|
|
|
|
if (override < 0) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else if (override > 0) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else if (_PyInterpreterState_HasFeature(
|
|
|
|
interp, Py_RTFLAGS_MULTI_INTERP_EXTENSIONS)) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
_PyImport_CheckSubinterpIncompatibleExtensionAllowed(const char *name)
|
|
|
|
{
|
2023-07-02 07:44:07 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2023-02-16 09:16:00 +08:00
|
|
|
if (check_multi_interp_extensions(interp)) {
|
|
|
|
assert(!_Py_IsMainInterpreter(interp));
|
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"module %s does not support loading in subinterpreters",
|
|
|
|
name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2024-05-07 11:07:23 +08:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
int
|
|
|
|
_PyImport_CheckGILForModule(PyObject* module, PyObject *module_name)
|
|
|
|
{
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
if (module == NULL) {
|
|
|
|
_PyEval_DisableGIL(tstate);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!PyModule_Check(module) ||
|
|
|
|
((PyModuleObject *)module)->md_gil == Py_MOD_GIL_USED) {
|
|
|
|
if (_PyEval_EnableGILPermanent(tstate)) {
|
|
|
|
int warn_result = PyErr_WarnFormat(
|
|
|
|
PyExc_RuntimeWarning,
|
|
|
|
1,
|
|
|
|
"The global interpreter lock (GIL) has been enabled to load "
|
|
|
|
"module '%U', which has not declared that it can run safely "
|
|
|
|
"without the GIL. To override this behavior and keep the GIL "
|
|
|
|
"disabled (at your own risk), run with PYTHON_GIL=0 or -Xgil=0.",
|
|
|
|
module_name
|
|
|
|
);
|
|
|
|
if (warn_result < 0) {
|
|
|
|
return warn_result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const PyConfig *config = _PyInterpreterState_GetConfig(tstate->interp);
|
|
|
|
if (config->enable_gil == _PyConfig_GIL_DEFAULT && config->verbose) {
|
|
|
|
PySys_FormatStderr("# loading module '%U', which requires the GIL\n",
|
|
|
|
module_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
_PyEval_DisableGIL(tstate);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2024-05-07 12:21:51 +08:00
|
|
|
static PyThreadState *
|
|
|
|
switch_to_main_interpreter(PyThreadState *tstate)
|
|
|
|
{
|
|
|
|
if (_Py_IsMainInterpreter(tstate->interp)) {
|
|
|
|
return tstate;
|
|
|
|
}
|
2024-06-26 04:35:12 +08:00
|
|
|
PyThreadState *main_tstate = _PyThreadState_NewBound(
|
|
|
|
_PyInterpreterState_Main(), _PyThreadState_WHENCE_EXEC);
|
2024-05-07 12:21:51 +08:00
|
|
|
if (main_tstate == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#ifndef NDEBUG
|
|
|
|
PyThreadState *old_tstate = PyThreadState_Swap(main_tstate);
|
|
|
|
assert(old_tstate == tstate);
|
|
|
|
#else
|
|
|
|
(void)PyThreadState_Swap(main_tstate);
|
|
|
|
#endif
|
|
|
|
return main_tstate;
|
|
|
|
}
|
|
|
|
|
2024-07-09 05:10:00 +08:00
|
|
|
static void
|
|
|
|
switch_back_from_main_interpreter(PyThreadState *tstate,
|
|
|
|
PyThreadState *main_tstate,
|
|
|
|
PyObject *tempobj)
|
|
|
|
{
|
|
|
|
assert(main_tstate == PyThreadState_GET());
|
|
|
|
assert(_Py_IsMainInterpreter(main_tstate->interp));
|
|
|
|
assert(tstate->interp != main_tstate->interp);
|
|
|
|
|
|
|
|
/* Handle any exceptions, which we cannot propagate directly
|
|
|
|
* to the subinterpreter. */
|
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
|
|
|
|
/* We trust it will be caught again soon. */
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Printing the exception should be sufficient. */
|
|
|
|
PyErr_PrintEx(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_XDECREF(tempobj);
|
|
|
|
|
|
|
|
PyThreadState_Clear(main_tstate);
|
|
|
|
(void)PyThreadState_Swap(tstate);
|
|
|
|
PyThreadState_Delete(main_tstate);
|
|
|
|
}
|
|
|
|
|
2023-03-16 08:43:54 +08:00
|
|
|
static PyObject *
|
|
|
|
get_core_module_dict(PyInterpreterState *interp,
|
2024-04-23 22:25:50 +08:00
|
|
|
PyObject *name, PyObject *path)
|
2023-03-15 04:01:35 +08:00
|
|
|
{
|
2023-03-16 08:43:54 +08:00
|
|
|
/* Only builtin modules are core. */
|
2024-04-23 22:25:50 +08:00
|
|
|
if (path == name) {
|
2023-03-16 08:43:54 +08:00
|
|
|
assert(!PyErr_Occurred());
|
|
|
|
if (PyUnicode_CompareWithASCIIString(name, "sys") == 0) {
|
2024-05-05 05:24:02 +08:00
|
|
|
return Py_NewRef(interp->sysdict_copy);
|
2023-03-16 08:43:54 +08:00
|
|
|
}
|
|
|
|
assert(!PyErr_Occurred());
|
|
|
|
if (PyUnicode_CompareWithASCIIString(name, "builtins") == 0) {
|
2024-05-05 05:24:02 +08:00
|
|
|
return Py_NewRef(interp->builtins_copy);
|
2023-03-16 08:43:54 +08:00
|
|
|
}
|
|
|
|
assert(!PyErr_Occurred());
|
2023-03-15 04:01:35 +08:00
|
|
|
}
|
2023-03-16 08:43:54 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2024-06-19 15:46:04 +08:00
|
|
|
#ifndef NDEBUG
|
2023-03-16 08:43:54 +08:00
|
|
|
static inline int
|
2024-04-23 22:25:50 +08:00
|
|
|
is_core_module(PyInterpreterState *interp, PyObject *name, PyObject *path)
|
2023-03-16 08:43:54 +08:00
|
|
|
{
|
2023-04-05 07:03:40 +08:00
|
|
|
/* This might be called before the core dict copies are in place,
|
|
|
|
so we can't rely on get_core_module_dict() here. */
|
2024-04-23 22:25:50 +08:00
|
|
|
if (path == name) {
|
2023-04-05 07:03:40 +08:00
|
|
|
if (PyUnicode_CompareWithASCIIString(name, "sys") == 0) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (PyUnicode_CompareWithASCIIString(name, "builtins") == 0) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
2023-03-15 04:01:35 +08:00
|
|
|
}
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
|
2024-05-02 07:40:28 +08:00
|
|
|
static _Py_ext_module_kind
|
|
|
|
_get_extension_kind(PyModuleDef *def, bool check_size)
|
2024-04-25 00:28:35 +08:00
|
|
|
{
|
2024-05-02 07:40:28 +08:00
|
|
|
_Py_ext_module_kind kind;
|
2024-04-25 00:28:35 +08:00
|
|
|
if (def == NULL) {
|
|
|
|
/* It must be a module created by reload_singlephase_extension()
|
|
|
|
* from m_copy. Ideally we'd do away with this case. */
|
2024-05-02 07:40:28 +08:00
|
|
|
kind = _Py_ext_module_kind_SINGLEPHASE;
|
2024-04-25 00:28:35 +08:00
|
|
|
}
|
2024-05-02 07:40:28 +08:00
|
|
|
else if (def->m_slots != NULL) {
|
|
|
|
kind = _Py_ext_module_kind_MULTIPHASE;
|
2024-04-25 00:28:35 +08:00
|
|
|
}
|
2024-05-02 07:40:28 +08:00
|
|
|
else if (check_size && def->m_size == -1) {
|
|
|
|
kind = _Py_ext_module_kind_SINGLEPHASE;
|
2024-04-25 00:28:35 +08:00
|
|
|
}
|
2024-05-02 07:40:28 +08:00
|
|
|
else if (def->m_base.m_init != NULL) {
|
|
|
|
kind = _Py_ext_module_kind_SINGLEPHASE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// This is probably single-phase init, but a multi-phase
|
|
|
|
// module *can* have NULL m_slots.
|
|
|
|
kind = _Py_ext_module_kind_UNKNOWN;
|
|
|
|
}
|
|
|
|
return kind;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The module might not be fully initialized yet
|
|
|
|
* and PyModule_FromDefAndSpec() checks m_size
|
|
|
|
* so we skip m_size. */
|
|
|
|
#define assert_multiphase_def(def) \
|
|
|
|
do { \
|
|
|
|
_Py_ext_module_kind kind = _get_extension_kind(def, false); \
|
|
|
|
assert(kind == _Py_ext_module_kind_MULTIPHASE \
|
|
|
|
/* m_slots can be NULL. */ \
|
|
|
|
|| kind == _Py_ext_module_kind_UNKNOWN); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#define assert_singlephase_def(def) \
|
|
|
|
do { \
|
|
|
|
_Py_ext_module_kind kind = _get_extension_kind(def, true); \
|
|
|
|
assert(kind == _Py_ext_module_kind_SINGLEPHASE \
|
|
|
|
|| kind == _Py_ext_module_kind_UNKNOWN); \
|
|
|
|
} while (0)
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
#define assert_singlephase(cached) \
|
|
|
|
do { \
|
|
|
|
_Py_ext_module_kind kind = _get_extension_kind(cached->def, true); \
|
|
|
|
assert(kind == _Py_ext_module_kind_SINGLEPHASE); \
|
|
|
|
} while (0)
|
2024-05-02 07:40:28 +08:00
|
|
|
|
|
|
|
#else /* defined(NDEBUG) */
|
|
|
|
#define assert_multiphase_def(def)
|
|
|
|
#define assert_singlephase_def(def)
|
2024-05-05 05:24:02 +08:00
|
|
|
#define assert_singlephase(cached)
|
2024-04-25 00:28:35 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
struct singlephase_global_update {
|
2024-05-02 07:40:28 +08:00
|
|
|
PyModInitFunction m_init;
|
2024-05-05 05:24:02 +08:00
|
|
|
Py_ssize_t m_index;
|
|
|
|
PyObject *m_dict;
|
|
|
|
_Py_ext_module_origin origin;
|
2024-05-07 11:07:23 +08:00
|
|
|
void *md_gil;
|
2024-04-25 00:28:35 +08:00
|
|
|
};
|
2024-04-24 23:55:48 +08:00
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
static struct extensions_cache_value *
|
2024-04-24 23:55:48 +08:00
|
|
|
update_global_state_for_extension(PyThreadState *tstate,
|
2024-04-25 00:28:35 +08:00
|
|
|
PyObject *path, PyObject *name,
|
|
|
|
PyModuleDef *def,
|
|
|
|
struct singlephase_global_update *singlephase)
|
1997-08-02 11:10:38 +08:00
|
|
|
{
|
2024-05-05 05:24:02 +08:00
|
|
|
struct extensions_cache_value *cached = NULL;
|
|
|
|
PyModInitFunction m_init = NULL;
|
|
|
|
PyObject *m_dict = NULL;
|
|
|
|
|
|
|
|
/* Set up for _extensions_cache_set(). */
|
2024-04-25 00:28:35 +08:00
|
|
|
if (singlephase == NULL) {
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(def->m_base.m_init == NULL);
|
2024-04-25 00:28:35 +08:00
|
|
|
assert(def->m_base.m_copy == NULL);
|
|
|
|
}
|
|
|
|
else {
|
2024-05-02 07:40:28 +08:00
|
|
|
if (singlephase->m_init != NULL) {
|
|
|
|
assert(singlephase->m_dict == NULL);
|
|
|
|
assert(def->m_base.m_copy == NULL);
|
|
|
|
assert(def->m_size >= 0);
|
|
|
|
/* Remember pointer to module init function. */
|
|
|
|
// XXX If two modules share a def then def->m_base will
|
|
|
|
// reflect the last one added (here) to the global cache.
|
|
|
|
// We should prevent this somehow. The simplest solution
|
|
|
|
// is probably to store m_copy/m_init in the cache along
|
|
|
|
// with the def, rather than within the def.
|
2024-05-05 05:24:02 +08:00
|
|
|
m_init = singlephase->m_init;
|
2024-05-02 07:40:28 +08:00
|
|
|
}
|
|
|
|
else if (singlephase->m_dict == NULL) {
|
|
|
|
/* It must be a core builtin module. */
|
|
|
|
assert(is_core_module(tstate->interp, name, path));
|
|
|
|
assert(def->m_size == -1);
|
2024-04-25 00:28:35 +08:00
|
|
|
assert(def->m_base.m_copy == NULL);
|
2024-05-02 07:40:28 +08:00
|
|
|
assert(def->m_base.m_init == NULL);
|
2024-04-25 00:28:35 +08:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
assert(PyDict_Check(singlephase->m_dict));
|
|
|
|
// gh-88216: Extensions and def->m_base.m_copy can be updated
|
|
|
|
// when the extension module doesn't support sub-interpreters.
|
|
|
|
assert(def->m_size == -1);
|
|
|
|
assert(!is_core_module(tstate->interp, name, path));
|
2023-04-05 07:03:40 +08:00
|
|
|
assert(PyUnicode_CompareWithASCIIString(name, "sys") != 0);
|
|
|
|
assert(PyUnicode_CompareWithASCIIString(name, "builtins") != 0);
|
2024-05-05 05:24:02 +08:00
|
|
|
m_dict = singlephase->m_dict;
|
2019-11-23 01:52:27 +08:00
|
|
|
}
|
2023-03-16 08:43:54 +08:00
|
|
|
}
|
2019-11-23 01:52:27 +08:00
|
|
|
|
2024-04-25 00:28:35 +08:00
|
|
|
/* Add the module's def to the global cache. */
|
2023-03-16 08:43:54 +08:00
|
|
|
// XXX Why special-case the main interpreter?
|
|
|
|
if (_Py_IsMainInterpreter(tstate->interp) || def->m_size == -1) {
|
2024-04-24 23:55:48 +08:00
|
|
|
#ifndef NDEBUG
|
2024-05-05 05:24:02 +08:00
|
|
|
cached = _extensions_cache_get(path, name);
|
|
|
|
assert(cached == NULL || cached->def == def);
|
2024-04-24 23:55:48 +08:00
|
|
|
#endif
|
2024-05-05 05:24:02 +08:00
|
|
|
cached = _extensions_cache_set(
|
|
|
|
path, name, def, m_init, singlephase->m_index, m_dict,
|
2024-05-07 11:07:23 +08:00
|
|
|
singlephase->origin, singlephase->md_gil);
|
2024-05-05 05:24:02 +08:00
|
|
|
if (cached == NULL) {
|
|
|
|
// XXX Ignore this error? Doing so would effectively
|
|
|
|
// mark the module as not loadable.
|
|
|
|
return NULL;
|
2019-11-23 01:52:27 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2019-11-23 01:52:27 +08:00
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
return cached;
|
1997-08-02 11:10:38 +08:00
|
|
|
}
|
|
|
|
|
2024-04-24 23:55:48 +08:00
|
|
|
/* For multi-phase init modules, the module is finished
|
|
|
|
* by PyModule_FromDefAndSpec(). */
|
|
|
|
static int
|
2024-05-05 05:24:02 +08:00
|
|
|
finish_singlephase_extension(PyThreadState *tstate, PyObject *mod,
|
|
|
|
struct extensions_cache_value *cached,
|
2024-04-24 23:55:48 +08:00
|
|
|
PyObject *name, PyObject *modules)
|
|
|
|
{
|
|
|
|
assert(mod != NULL && PyModule_Check(mod));
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(cached->def == _PyModule_GetDef(mod));
|
2024-04-24 23:55:48 +08:00
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
Py_ssize_t index = _get_cached_module_index(cached);
|
|
|
|
if (_modules_by_index_set(tstate->interp, index, mod) < 0) {
|
2024-04-24 23:55:48 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (modules != NULL) {
|
|
|
|
if (PyObject_SetItem(modules, name, mod) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-10-17 09:24:53 +08:00
|
|
|
|
2019-06-19 08:54:39 +08:00
|
|
|
static PyObject *
|
2024-05-05 05:24:02 +08:00
|
|
|
reload_singlephase_extension(PyThreadState *tstate,
|
|
|
|
struct extensions_cache_value *cached,
|
2024-05-03 08:51:43 +08:00
|
|
|
struct _Py_ext_module_loader_info *info)
|
1990-12-20 23:06:42 +08:00
|
|
|
{
|
2024-05-05 05:24:02 +08:00
|
|
|
PyModuleDef *def = cached->def;
|
|
|
|
assert(def != NULL);
|
|
|
|
assert_singlephase(cached);
|
2024-05-03 08:51:43 +08:00
|
|
|
PyObject *mod = NULL;
|
2019-06-19 08:54:39 +08:00
|
|
|
|
2023-07-28 05:08:38 +08:00
|
|
|
/* It may have been successfully imported previously
|
|
|
|
in an interpreter that allows legacy modules
|
|
|
|
but is not allowed in the current interpreter. */
|
2024-04-25 01:42:01 +08:00
|
|
|
const char *name_buf = PyUnicode_AsUTF8(info->name);
|
2023-07-28 05:08:38 +08:00
|
|
|
assert(name_buf != NULL);
|
|
|
|
if (_PyImport_CheckSubinterpIncompatibleExtensionAllowed(name_buf) < 0) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2024-04-24 23:55:48 +08:00
|
|
|
PyObject *modules = get_modules_dict(tstate, true);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (def->m_size == -1) {
|
|
|
|
/* Module does not support repeated initialization */
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(cached->m_init == NULL);
|
|
|
|
assert(def->m_base.m_init == NULL);
|
|
|
|
// XXX Copying the cached dict may break interpreter isolation.
|
|
|
|
// We could solve this by temporarily acquiring the original
|
|
|
|
// interpreter's GIL.
|
|
|
|
PyObject *m_copy = get_cached_m_dict(cached, info->name, info->path);
|
2023-03-15 04:01:35 +08:00
|
|
|
if (m_copy == NULL) {
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(!PyErr_Occurred());
|
|
|
|
return NULL;
|
2023-03-15 04:01:35 +08:00
|
|
|
}
|
2024-04-25 01:42:01 +08:00
|
|
|
mod = import_add_module(tstate, info->name);
|
2023-03-15 04:01:35 +08:00
|
|
|
if (mod == NULL) {
|
2024-05-05 05:24:02 +08:00
|
|
|
Py_DECREF(m_copy);
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2023-03-15 04:01:35 +08:00
|
|
|
}
|
2024-05-03 08:51:43 +08:00
|
|
|
PyObject *mdict = PyModule_GetDict(mod);
|
2021-01-12 22:43:32 +08:00
|
|
|
if (mdict == NULL) {
|
2024-05-05 05:24:02 +08:00
|
|
|
Py_DECREF(m_copy);
|
2021-01-12 22:43:32 +08:00
|
|
|
Py_DECREF(mod);
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2021-01-12 22:43:32 +08:00
|
|
|
}
|
2024-05-05 05:24:02 +08:00
|
|
|
int rc = PyDict_Update(mdict, m_copy);
|
|
|
|
Py_DECREF(m_copy);
|
|
|
|
if (rc < 0) {
|
2021-01-12 22:43:32 +08:00
|
|
|
Py_DECREF(mod);
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2021-01-12 22:43:32 +08:00
|
|
|
}
|
2024-05-07 11:07:23 +08:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
if (def->m_base.m_copy != NULL) {
|
|
|
|
// For non-core modules, fetch the GIL slot that was stored by
|
|
|
|
// import_run_extension().
|
|
|
|
((PyModuleObject *)mod)->md_gil = cached->md_gil;
|
|
|
|
}
|
|
|
|
#endif
|
2024-04-30 02:53:04 +08:00
|
|
|
/* We can't set mod->md_def if it's missing,
|
|
|
|
* because _PyImport_ClearModulesByIndex() might break
|
2024-05-05 05:24:02 +08:00
|
|
|
* due to violating interpreter isolation.
|
|
|
|
* See the note in set_cached_m_dict().
|
|
|
|
* Until that is solved, we leave md_def set to NULL. */
|
2024-04-30 02:53:04 +08:00
|
|
|
assert(_PyModule_GetDef(mod) == NULL
|
|
|
|
|| _PyModule_GetDef(mod) == def);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
else {
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(cached->m_dict == NULL);
|
|
|
|
assert(def->m_base.m_copy == NULL);
|
|
|
|
// XXX Use cached->m_init.
|
|
|
|
PyModInitFunction p0 = def->m_base.m_init;
|
|
|
|
if (p0 == NULL) {
|
2024-05-03 08:51:43 +08:00
|
|
|
assert(!PyErr_Occurred());
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2024-04-30 02:53:04 +08:00
|
|
|
}
|
|
|
|
struct _Py_ext_module_loader_result res;
|
2024-05-05 05:24:02 +08:00
|
|
|
if (_PyImport_RunModInitFunc(p0, info, &res) < 0) {
|
2024-05-02 07:40:28 +08:00
|
|
|
_Py_ext_module_loader_result_apply_error(&res, name_buf);
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2024-04-25 01:42:01 +08:00
|
|
|
}
|
2024-04-30 02:53:04 +08:00
|
|
|
assert(!PyErr_Occurred());
|
2024-05-02 07:40:28 +08:00
|
|
|
assert(res.err == NULL);
|
|
|
|
assert(res.kind == _Py_ext_module_kind_SINGLEPHASE);
|
2024-04-30 02:53:04 +08:00
|
|
|
mod = res.module;
|
2024-05-02 07:40:28 +08:00
|
|
|
/* Tchnically, the init function could return a different module def.
|
|
|
|
* Then we would probably need to update the global cache.
|
|
|
|
* However, we don't expect anyone to change the def. */
|
|
|
|
assert(res.def == def);
|
|
|
|
_Py_ext_module_loader_result_clear(&res);
|
|
|
|
|
|
|
|
/* Remember the filename as the __file__ attribute */
|
|
|
|
if (info->filename != NULL) {
|
|
|
|
if (PyModule_AddObjectRef(mod, "__file__", info->filename) < 0) {
|
|
|
|
PyErr_Clear(); /* Not important enough to report */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-04-25 01:42:01 +08:00
|
|
|
if (PyObject_SetItem(modules, info->name, mod) == -1) {
|
2013-07-20 20:51:53 +08:00
|
|
|
Py_DECREF(mod);
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2024-05-03 08:51:43 +08:00
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
Py_ssize_t index = _get_cached_module_index(cached);
|
|
|
|
if (_modules_by_index_set(tstate->interp, index, mod) < 0) {
|
2024-04-25 01:42:01 +08:00
|
|
|
PyMapping_DelItem(modules, info->name);
|
2021-01-12 22:43:32 +08:00
|
|
|
Py_DECREF(mod);
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2019-06-19 08:54:39 +08:00
|
|
|
|
2024-05-03 08:51:43 +08:00
|
|
|
return mod;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
import_find_extension(PyThreadState *tstate,
|
2024-05-05 05:24:02 +08:00
|
|
|
struct _Py_ext_module_loader_info *info,
|
|
|
|
struct extensions_cache_value **p_cached)
|
2024-05-03 08:51:43 +08:00
|
|
|
{
|
|
|
|
/* Only single-phase init modules will be in the cache. */
|
2024-05-05 05:24:02 +08:00
|
|
|
struct extensions_cache_value *cached
|
|
|
|
= _extensions_cache_get(info->path, info->name);
|
|
|
|
if (cached == NULL) {
|
2024-05-03 08:51:43 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(cached->def != NULL);
|
|
|
|
assert_singlephase(cached);
|
|
|
|
*p_cached = cached;
|
2024-05-03 08:51:43 +08:00
|
|
|
|
|
|
|
/* It may have been successfully imported previously
|
|
|
|
in an interpreter that allows legacy modules
|
|
|
|
but is not allowed in the current interpreter. */
|
|
|
|
const char *name_buf = PyUnicode_AsUTF8(info->name);
|
|
|
|
assert(name_buf != NULL);
|
|
|
|
if (_PyImport_CheckSubinterpIncompatibleExtensionAllowed(name_buf) < 0) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
PyObject *mod = reload_singlephase_extension(tstate, cached, info);
|
2024-05-03 08:51:43 +08:00
|
|
|
if (mod == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-04-13 09:04:28 +08:00
|
|
|
int verbose = _PyInterpreterState_GetConfig(tstate->interp)->verbose;
|
2019-05-13 23:12:45 +08:00
|
|
|
if (verbose) {
|
2011-03-08 01:20:56 +08:00
|
|
|
PySys_FormatStderr("import %U # previously loaded (%R)\n",
|
2024-04-25 01:42:01 +08:00
|
|
|
info->name, info->path);
|
2019-05-13 23:12:45 +08:00
|
|
|
}
|
2024-05-05 05:24:02 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
return mod;
|
2019-06-19 08:54:39 +08:00
|
|
|
}
|
2010-03-01 10:09:17 +08:00
|
|
|
|
2024-04-30 02:53:04 +08:00
|
|
|
static PyObject *
|
|
|
|
import_run_extension(PyThreadState *tstate, PyModInitFunction p0,
|
|
|
|
struct _Py_ext_module_loader_info *info,
|
|
|
|
PyObject *spec, PyObject *modules)
|
|
|
|
{
|
2024-05-02 07:40:28 +08:00
|
|
|
/* Core modules go through _PyImport_FixupBuiltin(). */
|
|
|
|
assert(!is_core_module(tstate->interp, info->name, info->path));
|
|
|
|
|
2024-04-30 02:53:04 +08:00
|
|
|
PyObject *mod = NULL;
|
|
|
|
PyModuleDef *def = NULL;
|
2024-05-05 05:24:02 +08:00
|
|
|
struct extensions_cache_value *cached = NULL;
|
2024-05-02 07:40:28 +08:00
|
|
|
const char *name_buf = PyBytes_AS_STRING(info->name_encoded);
|
2024-04-30 02:53:04 +08:00
|
|
|
|
2024-05-07 12:21:51 +08:00
|
|
|
/* We cannot know if the module is single-phase init or
|
|
|
|
* multi-phase init until after we call its init function. Even
|
|
|
|
* in isolated interpreters (that do not support single-phase init),
|
|
|
|
* the init function will run without restriction. For multi-phase
|
|
|
|
* init modules that isn't a problem because the init function only
|
|
|
|
* runs PyModuleDef_Init() on the module's def and then returns it.
|
|
|
|
*
|
|
|
|
* However, for single-phase init the module's init function will
|
|
|
|
* create the module, create other objects (and allocate other
|
2024-06-04 18:22:22 +08:00
|
|
|
* memory), populate it and its module state, and initialize static
|
2024-05-07 12:21:51 +08:00
|
|
|
* types. Some modules store other objects and data in global C
|
|
|
|
* variables and register callbacks with the runtime/stdlib or
|
|
|
|
* even external libraries (which is part of why we can't just
|
|
|
|
* dlclose() the module in the error case). That's a problem
|
|
|
|
* for isolated interpreters since all of the above happens
|
|
|
|
* and only then * will the import fail. Memory will leak,
|
|
|
|
* callbacks will still get used, and sometimes there
|
|
|
|
* will be crashes (memory access violations
|
|
|
|
* and use-after-free).
|
|
|
|
*
|
|
|
|
* To put it another way, if the module is single-phase init
|
|
|
|
* then the import will probably break interpreter isolation
|
|
|
|
* and should fail ASAP. However, the module's init function
|
|
|
|
* will still get run. That means it may still store state
|
|
|
|
* in the shared-object/DLL address space (which never gets
|
|
|
|
* closed/cleared), including objects (e.g. static types).
|
|
|
|
* This is a problem for isolated subinterpreters since each
|
|
|
|
* has its own object allocator. If the loaded shared-object
|
|
|
|
* still holds a reference to an object after the corresponding
|
|
|
|
* interpreter has finalized then either we must let it leak
|
|
|
|
* or else any later use of that object by another interpreter
|
|
|
|
* (or across multiple init-fini cycles) will crash the process.
|
|
|
|
*
|
|
|
|
* To avoid all of that, we make sure the module's init function
|
|
|
|
* is always run first with the main interpreter active. If it was
|
|
|
|
* already the main interpreter then we can continue loading the
|
|
|
|
* module like normal. Otherwise, right after the init function,
|
|
|
|
* we take care of some import state bookkeeping, switch back
|
|
|
|
* to the subinterpreter, check for single-phase init,
|
|
|
|
* and then continue loading like normal. */
|
|
|
|
|
|
|
|
bool switched = false;
|
|
|
|
/* We *could* leave in place a legacy interpreter here
|
|
|
|
* (one that shares obmalloc/GIL with main interp),
|
|
|
|
* but there isn't a big advantage, we anticipate
|
|
|
|
* such interpreters will be increasingly uncommon,
|
|
|
|
* and the code is a bit simpler if we always switch
|
|
|
|
* to the main interpreter. */
|
|
|
|
PyThreadState *main_tstate = switch_to_main_interpreter(tstate);
|
|
|
|
if (main_tstate == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
else if (main_tstate != tstate) {
|
|
|
|
switched = true;
|
|
|
|
/* In the switched case, we could play it safe
|
|
|
|
* by getting the main interpreter's import lock here.
|
|
|
|
* It's unlikely to matter though. */
|
|
|
|
}
|
|
|
|
|
2024-04-30 02:53:04 +08:00
|
|
|
struct _Py_ext_module_loader_result res;
|
2024-05-07 12:21:51 +08:00
|
|
|
int rc = _PyImport_RunModInitFunc(p0, info, &res);
|
|
|
|
if (rc < 0) {
|
2024-04-30 02:53:04 +08:00
|
|
|
/* We discard res.def. */
|
|
|
|
assert(res.module == NULL);
|
|
|
|
}
|
2024-05-07 12:21:51 +08:00
|
|
|
else {
|
|
|
|
assert(!PyErr_Occurred());
|
|
|
|
assert(res.err == NULL);
|
2024-04-30 02:53:04 +08:00
|
|
|
|
2024-05-07 12:21:51 +08:00
|
|
|
mod = res.module;
|
|
|
|
res.module = NULL;
|
|
|
|
def = res.def;
|
|
|
|
assert(def != NULL);
|
|
|
|
|
|
|
|
/* Do anything else that should be done
|
|
|
|
* while still using the main interpreter. */
|
|
|
|
if (res.kind == _Py_ext_module_kind_SINGLEPHASE) {
|
|
|
|
/* Remember the filename as the __file__ attribute */
|
|
|
|
if (info->filename != NULL) {
|
2024-06-17 23:57:22 +08:00
|
|
|
PyObject *filename = NULL;
|
|
|
|
if (switched) {
|
|
|
|
// The original filename may be allocated by subinterpreter's
|
|
|
|
// obmalloc, so we create a copy here.
|
|
|
|
filename = _PyUnicode_Copy(info->filename);
|
|
|
|
if (filename == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
filename = Py_NewRef(info->filename);
|
|
|
|
}
|
2024-06-21 23:19:31 +08:00
|
|
|
// XXX There's a refleak somewhere with the filename.
|
|
|
|
// Until we can track it down, we immortalize it.
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
_PyUnicode_InternImmortal(interp, &filename);
|
|
|
|
|
2024-05-07 12:21:51 +08:00
|
|
|
if (PyModule_AddObjectRef(mod, "__file__", filename) < 0) {
|
|
|
|
PyErr_Clear(); /* Not important enough to report */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update global import state. */
|
|
|
|
assert(def->m_base.m_index != 0);
|
|
|
|
struct singlephase_global_update singlephase = {
|
|
|
|
// XXX Modules that share a def should each get their own index,
|
|
|
|
// whereas currently they share (which means the per-interpreter
|
|
|
|
// cache is less reliable than it should be).
|
|
|
|
.m_index=def->m_base.m_index,
|
|
|
|
.origin=info->origin,
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
.md_gil=((PyModuleObject *)mod)->md_gil,
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
// gh-88216: Extensions and def->m_base.m_copy can be updated
|
|
|
|
// when the extension module doesn't support sub-interpreters.
|
|
|
|
if (def->m_size == -1) {
|
|
|
|
/* We will reload from m_copy. */
|
|
|
|
assert(def->m_base.m_init == NULL);
|
|
|
|
singlephase.m_dict = PyModule_GetDict(mod);
|
|
|
|
assert(singlephase.m_dict != NULL);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* We will reload via the init function. */
|
|
|
|
assert(def->m_size >= 0);
|
|
|
|
assert(def->m_base.m_copy == NULL);
|
|
|
|
singlephase.m_init = p0;
|
|
|
|
}
|
|
|
|
cached = update_global_state_for_extension(
|
2024-09-20 00:05:20 +08:00
|
|
|
main_tstate, info->path, info->name, def, &singlephase);
|
2024-05-07 12:21:51 +08:00
|
|
|
if (cached == NULL) {
|
|
|
|
assert(PyErr_Occurred());
|
|
|
|
goto main_finally;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
main_finally:
|
|
|
|
/* Switch back to the subinterpreter. */
|
|
|
|
if (switched) {
|
|
|
|
assert(main_tstate != tstate);
|
2024-07-09 05:10:00 +08:00
|
|
|
switch_back_from_main_interpreter(tstate, main_tstate, mod);
|
2024-05-07 12:21:51 +08:00
|
|
|
/* Any module we got from the init function will have to be
|
|
|
|
* reloaded in the subinterpreter. */
|
2024-07-09 05:10:00 +08:00
|
|
|
mod = NULL;
|
2024-05-07 12:21:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************/
|
|
|
|
/* At this point we are back to the interpreter we started with. */
|
|
|
|
/*****************************************************************/
|
|
|
|
|
|
|
|
/* Finally we handle the error return from _PyImport_RunModInitFunc(). */
|
|
|
|
if (rc < 0) {
|
|
|
|
_Py_ext_module_loader_result_apply_error(&res, name_buf);
|
|
|
|
goto error;
|
|
|
|
}
|
2024-04-30 02:53:04 +08:00
|
|
|
|
2024-05-02 07:40:28 +08:00
|
|
|
if (res.kind == _Py_ext_module_kind_MULTIPHASE) {
|
|
|
|
assert_multiphase_def(def);
|
2024-04-30 02:53:04 +08:00
|
|
|
assert(mod == NULL);
|
2024-05-07 12:21:51 +08:00
|
|
|
/* Note that we cheat a little by not repeating the calls
|
|
|
|
* to _PyImport_GetModInitFunc() and _PyImport_RunModInitFunc(). */
|
2024-04-30 02:53:04 +08:00
|
|
|
mod = PyModule_FromDefAndSpec(def, spec);
|
|
|
|
if (mod == NULL) {
|
2024-05-02 07:40:28 +08:00
|
|
|
goto error;
|
2024-04-30 02:53:04 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2024-05-02 07:40:28 +08:00
|
|
|
assert(res.kind == _Py_ext_module_kind_SINGLEPHASE);
|
|
|
|
assert_singlephase_def(def);
|
2024-04-30 02:53:04 +08:00
|
|
|
|
|
|
|
if (_PyImport_CheckSubinterpIncompatibleExtensionAllowed(name_buf) < 0) {
|
2024-05-02 07:40:28 +08:00
|
|
|
goto error;
|
2024-04-30 02:53:04 +08:00
|
|
|
}
|
2024-05-07 12:21:51 +08:00
|
|
|
assert(!PyErr_Occurred());
|
2024-04-30 02:53:04 +08:00
|
|
|
|
2024-05-07 12:21:51 +08:00
|
|
|
if (switched) {
|
|
|
|
/* We switched to the main interpreter to run the init
|
|
|
|
* function, so now we will "reload" the module from the
|
|
|
|
* cached data using the original subinterpreter. */
|
|
|
|
assert(mod == NULL);
|
|
|
|
mod = reload_singlephase_extension(tstate, cached, info);
|
|
|
|
if (mod == NULL) {
|
|
|
|
goto error;
|
2024-04-30 02:53:04 +08:00
|
|
|
}
|
2024-05-07 12:21:51 +08:00
|
|
|
assert(!PyErr_Occurred());
|
|
|
|
assert(PyModule_Check(mod));
|
2024-04-30 02:53:04 +08:00
|
|
|
}
|
2024-05-02 07:40:28 +08:00
|
|
|
else {
|
2024-05-07 12:21:51 +08:00
|
|
|
assert(mod != NULL);
|
|
|
|
assert(PyModule_Check(mod));
|
|
|
|
|
|
|
|
/* Update per-interpreter import state. */
|
|
|
|
PyObject *modules = get_modules_dict(tstate, true);
|
|
|
|
if (finish_singlephase_extension(
|
|
|
|
tstate, mod, cached, info->name, modules) < 0)
|
|
|
|
{
|
|
|
|
goto error;
|
|
|
|
}
|
2024-04-30 02:53:04 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-05-02 07:40:28 +08:00
|
|
|
_Py_ext_module_loader_result_clear(&res);
|
2024-04-30 02:53:04 +08:00
|
|
|
return mod;
|
2024-05-02 07:40:28 +08:00
|
|
|
|
|
|
|
error:
|
|
|
|
Py_XDECREF(mod);
|
|
|
|
_Py_ext_module_loader_result_clear(&res);
|
|
|
|
return NULL;
|
2024-04-30 02:53:04 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2024-09-20 16:27:34 +08:00
|
|
|
// Used in _PyImport_ClearExtension; see notes there.
|
2023-02-16 07:05:07 +08:00
|
|
|
static int
|
|
|
|
clear_singlephase_extension(PyInterpreterState *interp,
|
2024-04-23 22:25:50 +08:00
|
|
|
PyObject *name, PyObject *path)
|
2023-02-16 07:05:07 +08:00
|
|
|
{
|
2024-05-05 05:24:02 +08:00
|
|
|
struct extensions_cache_value *cached = _extensions_cache_get(path, name);
|
|
|
|
if (cached == NULL) {
|
2023-02-16 07:05:07 +08:00
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2024-05-05 05:24:02 +08:00
|
|
|
PyModuleDef *def = cached->def;
|
2023-02-16 07:05:07 +08:00
|
|
|
|
|
|
|
/* Clear data set when the module was initially loaded. */
|
|
|
|
def->m_base.m_init = NULL;
|
|
|
|
Py_CLEAR(def->m_base.m_copy);
|
2024-05-28 03:35:30 +08:00
|
|
|
def->m_base.m_index = 0;
|
2023-02-16 07:05:07 +08:00
|
|
|
|
|
|
|
/* Clear the PyState_*Module() cache entry. */
|
2024-05-05 05:24:02 +08:00
|
|
|
Py_ssize_t index = _get_cached_module_index(cached);
|
|
|
|
if (_modules_by_index_check(interp, index) == NULL) {
|
|
|
|
if (_modules_by_index_clear_one(interp, index) < 0) {
|
2023-02-16 07:05:07 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-07-09 05:10:00 +08:00
|
|
|
/* We must use the main interpreter to clean up the cache.
|
|
|
|
* See the note in import_run_extension(). */
|
|
|
|
PyThreadState *tstate = PyThreadState_GET();
|
|
|
|
PyThreadState *main_tstate = switch_to_main_interpreter(tstate);
|
|
|
|
if (main_tstate == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2023-02-16 07:05:07 +08:00
|
|
|
/* Clear the cached module def. */
|
2024-04-23 22:25:50 +08:00
|
|
|
_extensions_cache_delete(path, name);
|
2023-02-28 00:21:18 +08:00
|
|
|
|
2024-07-09 05:10:00 +08:00
|
|
|
if (main_tstate != tstate) {
|
|
|
|
switch_back_from_main_interpreter(tstate, main_tstate, NULL);
|
|
|
|
}
|
|
|
|
|
2023-02-28 00:21:18 +08:00
|
|
|
return 0;
|
2023-02-16 07:05:07 +08:00
|
|
|
}
|
|
|
|
|
1995-01-03 03:04:15 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/*******************/
|
|
|
|
/* builtin modules */
|
|
|
|
/*******************/
|
1995-01-03 03:04:15 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
int
|
2024-04-24 23:55:48 +08:00
|
|
|
_PyImport_FixupBuiltin(PyThreadState *tstate, PyObject *mod, const char *name,
|
|
|
|
PyObject *modules)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2023-02-16 06:32:31 +08:00
|
|
|
int res = -1;
|
2024-04-23 22:25:50 +08:00
|
|
|
assert(mod != NULL && PyModule_Check(mod));
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
PyObject *nameobj;
|
|
|
|
nameobj = PyUnicode_InternFromString(name);
|
|
|
|
if (nameobj == NULL) {
|
|
|
|
return -1;
|
2019-06-19 08:54:39 +08:00
|
|
|
}
|
2024-04-23 22:25:50 +08:00
|
|
|
|
|
|
|
PyModuleDef *def = PyModule_GetDef(mod);
|
|
|
|
if (def == NULL) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
goto finally;
|
|
|
|
}
|
|
|
|
|
2024-04-25 00:28:35 +08:00
|
|
|
/* We only use _PyImport_FixupBuiltin() for the core builtin modules
|
|
|
|
* (sys and builtins). These modules are single-phase init with no
|
|
|
|
* module state, but we also don't populate def->m_base.m_copy
|
|
|
|
* for them. */
|
|
|
|
assert(is_core_module(tstate->interp, nameobj, nameobj));
|
2024-05-02 07:40:28 +08:00
|
|
|
assert_singlephase_def(def);
|
2024-04-25 00:28:35 +08:00
|
|
|
assert(def->m_size == -1);
|
|
|
|
assert(def->m_base.m_copy == NULL);
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(def->m_base.m_index >= 0);
|
|
|
|
|
|
|
|
/* We aren't using import_find_extension() for core modules,
|
|
|
|
* so we have to do the extra check to make sure the module
|
|
|
|
* isn't already in the global cache before calling
|
|
|
|
* update_global_state_for_extension(). */
|
|
|
|
struct extensions_cache_value *cached
|
|
|
|
= _extensions_cache_get(nameobj, nameobj);
|
|
|
|
if (cached == NULL) {
|
|
|
|
struct singlephase_global_update singlephase = {
|
|
|
|
.m_index=def->m_base.m_index,
|
|
|
|
/* We don't want def->m_base.m_copy populated. */
|
|
|
|
.m_dict=NULL,
|
|
|
|
.origin=_Py_ext_module_origin_CORE,
|
2024-05-07 11:07:23 +08:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
/* Unused when m_dict == NULL. */
|
|
|
|
.md_gil=NULL,
|
|
|
|
#endif
|
2024-05-05 05:24:02 +08:00
|
|
|
};
|
|
|
|
cached = update_global_state_for_extension(
|
|
|
|
tstate, nameobj, nameobj, def, &singlephase);
|
|
|
|
if (cached == NULL) {
|
|
|
|
goto finally;
|
|
|
|
}
|
2017-09-16 06:35:20 +08:00
|
|
|
}
|
2024-04-25 00:28:35 +08:00
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
if (finish_singlephase_extension(tstate, mod, cached, nameobj, modules) < 0) {
|
2023-02-16 06:32:31 +08:00
|
|
|
goto finally;
|
2016-02-10 16:31:20 +08:00
|
|
|
}
|
2024-04-23 22:25:50 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
res = 0;
|
|
|
|
|
|
|
|
finally:
|
|
|
|
Py_DECREF(nameobj);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Helper to test for built-in module */
|
|
|
|
|
|
|
|
static int
|
|
|
|
is_builtin(PyObject *name)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct _inittab *inittab = INITTAB;
|
|
|
|
for (i = 0; inittab[i].name != NULL; i++) {
|
|
|
|
if (_PyUnicode_EqualToASCIIString(name, inittab[i].name)) {
|
|
|
|
if (inittab[i].initfunc == NULL)
|
|
|
|
return -1;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
2016-02-10 16:31:20 +08:00
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject*
|
|
|
|
create_builtin(PyThreadState *tstate, PyObject *name, PyObject *spec)
|
|
|
|
{
|
2024-04-25 01:42:01 +08:00
|
|
|
struct _Py_ext_module_loader_info info;
|
2024-04-30 02:53:04 +08:00
|
|
|
if (_Py_ext_module_loader_info_init_for_builtin(&info, name) < 0) {
|
2024-04-25 01:42:01 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
struct extensions_cache_value *cached = NULL;
|
|
|
|
PyObject *mod = import_find_extension(tstate, &info, &cached);
|
2024-04-29 23:29:07 +08:00
|
|
|
if (mod != NULL) {
|
|
|
|
assert(!_PyErr_Occurred(tstate));
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(cached != NULL);
|
|
|
|
/* The module might not have md_def set in certain reload cases. */
|
|
|
|
assert(_PyModule_GetDef(mod) == NULL
|
|
|
|
|| cached->def == _PyModule_GetDef(mod));
|
|
|
|
assert_singlephase(cached);
|
2024-04-29 23:29:07 +08:00
|
|
|
goto finally;
|
|
|
|
}
|
|
|
|
else if (_PyErr_Occurred(tstate)) {
|
2024-04-25 01:42:01 +08:00
|
|
|
goto finally;
|
2017-09-16 06:35:20 +08:00
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
/* If the module was added to the global cache
|
|
|
|
* but def->m_base.m_copy was cleared (e.g. subinterp fini)
|
|
|
|
* then we have to do a little dance here. */
|
|
|
|
if (cached != NULL) {
|
|
|
|
assert(cached->def->m_base.m_copy == NULL);
|
|
|
|
/* For now we clear the cache and move on. */
|
|
|
|
_extensions_cache_delete(info.path, info.name);
|
|
|
|
}
|
|
|
|
|
2024-04-23 22:25:50 +08:00
|
|
|
struct _inittab *found = NULL;
|
2023-02-16 06:32:31 +08:00
|
|
|
for (struct _inittab *p = INITTAB; p->name != NULL; p++) {
|
2024-04-25 01:42:01 +08:00
|
|
|
if (_PyUnicode_EqualToASCIIString(info.name, p->name)) {
|
2024-04-23 22:25:50 +08:00
|
|
|
found = p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (found == NULL) {
|
|
|
|
// not found
|
2024-04-25 01:42:01 +08:00
|
|
|
mod = Py_NewRef(Py_None);
|
|
|
|
goto finally;
|
2024-04-23 22:25:50 +08:00
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
|
2024-04-23 22:25:50 +08:00
|
|
|
PyModInitFunction p0 = (PyModInitFunction)found->initfunc;
|
|
|
|
if (p0 == NULL) {
|
|
|
|
/* Cannot re-init internal module ("sys" or "builtins") */
|
2024-04-25 01:42:01 +08:00
|
|
|
assert(is_core_module(tstate->interp, info.name, info.path));
|
|
|
|
mod = import_add_module(tstate, info.name);
|
|
|
|
goto finally;
|
2024-04-23 22:25:50 +08:00
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
|
2024-05-07 11:07:23 +08:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
// This call (and the corresponding call to _PyImport_CheckGILForModule())
|
|
|
|
// would ideally be inside import_run_extension(). They are kept in the
|
|
|
|
// callers for now because that would complicate the control flow inside
|
|
|
|
// import_run_extension(). It should be possible to restructure
|
|
|
|
// import_run_extension() to address this.
|
|
|
|
_PyEval_EnableGILTransient(tstate);
|
|
|
|
#endif
|
2024-04-30 02:53:04 +08:00
|
|
|
/* Now load it. */
|
|
|
|
mod = import_run_extension(
|
|
|
|
tstate, p0, &info, spec, get_modules_dict(tstate, true));
|
2024-05-07 11:07:23 +08:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
if (_PyImport_CheckGILForModule(mod, info.name) < 0) {
|
|
|
|
Py_CLEAR(mod);
|
|
|
|
goto finally;
|
|
|
|
}
|
|
|
|
#endif
|
2024-04-25 01:42:01 +08:00
|
|
|
|
|
|
|
finally:
|
|
|
|
_Py_ext_module_loader_info_clear(&info);
|
|
|
|
return mod;
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
|
|
|
|
/*****************************/
|
|
|
|
/* the builtin modules table */
|
|
|
|
/*****************************/
|
|
|
|
|
|
|
|
/* API for embedding applications that want to add their own entries
|
|
|
|
to the table of built-in modules. This should normally be called
|
|
|
|
*before* Py_Initialize(). When the table resize fails, -1 is
|
|
|
|
returned and the existing table is unchanged.
|
|
|
|
|
|
|
|
After a similar function by Just van Rossum. */
|
|
|
|
|
|
|
|
int
|
|
|
|
PyImport_ExtendInittab(struct _inittab *newtab)
|
2019-06-19 08:54:39 +08:00
|
|
|
{
|
2023-02-16 06:32:31 +08:00
|
|
|
struct _inittab *p;
|
|
|
|
size_t i, n;
|
|
|
|
int res = 0;
|
|
|
|
|
|
|
|
if (INITTAB != NULL) {
|
|
|
|
Py_FatalError("PyImport_ExtendInittab() may not be called after Py_Initialize()");
|
2021-01-12 22:43:32 +08:00
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
|
|
|
|
/* Count the number of entries in both tables */
|
|
|
|
for (n = 0; newtab[n].name != NULL; n++)
|
|
|
|
;
|
|
|
|
if (n == 0)
|
|
|
|
return 0; /* Nothing to do */
|
|
|
|
for (i = 0; PyImport_Inittab[i].name != NULL; i++)
|
|
|
|
;
|
|
|
|
|
|
|
|
/* Force default raw memory allocator to get a known allocator to be able
|
|
|
|
to release the memory in _PyImport_Fini2() */
|
|
|
|
PyMemAllocatorEx old_alloc;
|
|
|
|
_PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
|
|
|
|
|
|
|
|
/* Allocate new memory for the combined table */
|
|
|
|
p = NULL;
|
|
|
|
if (i + n <= SIZE_MAX / sizeof(struct _inittab) - 1) {
|
|
|
|
size_t size = sizeof(struct _inittab) * (i + n + 1);
|
|
|
|
p = PyMem_RawRealloc(inittab_copy, size);
|
|
|
|
}
|
|
|
|
if (p == NULL) {
|
|
|
|
res = -1;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy the tables into the new memory at the first call
|
|
|
|
to PyImport_ExtendInittab(). */
|
|
|
|
if (inittab_copy != PyImport_Inittab) {
|
|
|
|
memcpy(p, PyImport_Inittab, (i+1) * sizeof(struct _inittab));
|
|
|
|
}
|
|
|
|
memcpy(p + i, newtab, (n + 1) * sizeof(struct _inittab));
|
|
|
|
PyImport_Inittab = inittab_copy = p;
|
|
|
|
|
|
|
|
done:
|
|
|
|
PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
|
|
|
|
return res;
|
2019-06-19 08:54:39 +08:00
|
|
|
}
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/* Shorthand to add a single entry given a name and a function */
|
2019-06-19 08:54:39 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
int
|
|
|
|
PyImport_AppendInittab(const char *name, PyObject* (*initfunc)(void))
|
2011-03-04 20:57:09 +08:00
|
|
|
{
|
2023-02-16 06:32:31 +08:00
|
|
|
struct _inittab newtab[2];
|
|
|
|
|
|
|
|
if (INITTAB != NULL) {
|
|
|
|
Py_FatalError("PyImport_AppendInittab() may not be called after Py_Initialize()");
|
2019-06-19 08:54:39 +08:00
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
|
|
|
|
memset(newtab, '\0', sizeof newtab);
|
|
|
|
|
|
|
|
newtab[0].name = name;
|
|
|
|
newtab[0].initfunc = initfunc;
|
|
|
|
|
|
|
|
return PyImport_ExtendInittab(newtab);
|
2011-03-04 20:57:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/* the internal table */
|
|
|
|
|
|
|
|
static int
|
|
|
|
init_builtin_modules_table(void)
|
|
|
|
{
|
|
|
|
size_t size;
|
|
|
|
for (size = 0; PyImport_Inittab[size].name != NULL; size++)
|
|
|
|
;
|
|
|
|
size++;
|
|
|
|
|
|
|
|
/* Make the copy. */
|
|
|
|
struct _inittab *copied = PyMem_RawMalloc(size * sizeof(struct _inittab));
|
|
|
|
if (copied == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
memcpy(copied, PyImport_Inittab, size * sizeof(struct _inittab));
|
|
|
|
INITTAB = copied;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-08-02 11:52:12 +08:00
|
|
|
static void
|
2023-02-16 06:32:31 +08:00
|
|
|
fini_builtin_modules_table(void)
|
2004-08-02 11:52:12 +08:00
|
|
|
{
|
2023-02-16 06:32:31 +08:00
|
|
|
struct _inittab *inittab = INITTAB;
|
|
|
|
INITTAB = NULL;
|
|
|
|
PyMem_RawFree(inittab);
|
|
|
|
}
|
2019-06-19 08:54:39 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
PyObject *
|
|
|
|
_PyImport_GetBuiltinModuleNames(void)
|
|
|
|
{
|
|
|
|
PyObject *list = PyList_New(0);
|
|
|
|
if (list == NULL) {
|
|
|
|
return NULL;
|
2019-05-09 00:31:23 +08:00
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
struct _inittab *inittab = INITTAB;
|
|
|
|
for (Py_ssize_t i = 0; inittab[i].name != NULL; i++) {
|
|
|
|
PyObject *name = PyUnicode_FromString(inittab[i].name);
|
|
|
|
if (name == NULL) {
|
|
|
|
Py_DECREF(list);
|
|
|
|
return NULL;
|
2020-10-11 21:51:07 +08:00
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
if (PyList_Append(list, name) < 0) {
|
|
|
|
Py_DECREF(name);
|
|
|
|
Py_DECREF(list);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
Py_DECREF(name);
|
2017-09-16 06:35:20 +08:00
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
return list;
|
|
|
|
}
|
2019-06-19 08:54:39 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
|
|
|
|
/********************/
|
|
|
|
/* the magic number */
|
|
|
|
/********************/
|
|
|
|
|
|
|
|
/* Helper for pythonrun.c -- return magic number and tag. */
|
|
|
|
|
|
|
|
long
|
|
|
|
PyImport_GetMagicNumber(void)
|
|
|
|
{
|
2024-07-31 03:31:05 +08:00
|
|
|
return PYC_MAGIC_NUMBER_TOKEN;
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
extern const char * _PySys_ImplCacheTag;
|
|
|
|
|
|
|
|
const char *
|
|
|
|
PyImport_GetMagicTag(void)
|
|
|
|
{
|
|
|
|
return _PySys_ImplCacheTag;
|
2004-08-02 11:52:12 +08:00
|
|
|
}
|
1992-01-20 00:28:21 +08:00
|
|
|
|
2008-01-08 04:12:44 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/*********************************/
|
|
|
|
/* a Python module's code object */
|
|
|
|
/*********************************/
|
|
|
|
|
1995-01-21 00:53:12 +08:00
|
|
|
/* Execute a code object in a module and return the module object
|
2004-08-02 11:52:12 +08:00
|
|
|
* WITH INCREMENTED REFERENCE COUNT. If an error occurs, name is
|
|
|
|
* removed from sys.modules, to avoid leaving damaged module objects
|
|
|
|
* in sys.modules. The caller may wish to restore the original
|
|
|
|
* module object (if any) in this case; PyImport_ReloadModule is an
|
|
|
|
* example.
|
2010-04-17 08:19:56 +08:00
|
|
|
*
|
|
|
|
* Note that PyImport_ExecCodeModuleWithPathnames() is the preferred, richer
|
|
|
|
* interface. The other two exist primarily for backward compatibility.
|
2004-08-02 11:52:12 +08:00
|
|
|
*/
|
1997-04-30 04:08:16 +08:00
|
|
|
PyObject *
|
2013-10-20 02:03:34 +08:00
|
|
|
PyImport_ExecCodeModule(const char *name, PyObject *co)
|
1998-02-11 13:53:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyImport_ExecCodeModuleWithPathnames(
|
|
|
|
name, co, (char *)NULL, (char *)NULL);
|
1998-02-11 13:53:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2013-10-20 02:03:34 +08:00
|
|
|
PyImport_ExecCodeModuleEx(const char *name, PyObject *co, const char *pathname)
|
2010-04-17 08:19:56 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyImport_ExecCodeModuleWithPathnames(
|
|
|
|
name, co, pathname, (char *)NULL);
|
2010-04-17 08:19:56 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2013-10-20 02:03:34 +08:00
|
|
|
PyImport_ExecCodeModuleWithPathnames(const char *name, PyObject *co,
|
|
|
|
const char *pathname,
|
|
|
|
const char *cpathname)
|
2011-03-04 20:57:09 +08:00
|
|
|
{
|
|
|
|
PyObject *m = NULL;
|
2015-05-03 09:15:18 +08:00
|
|
|
PyObject *nameobj, *pathobj = NULL, *cpathobj = NULL, *external= NULL;
|
2011-03-04 20:57:09 +08:00
|
|
|
|
|
|
|
nameobj = PyUnicode_FromString(name);
|
|
|
|
if (nameobj == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (cpathname != NULL) {
|
|
|
|
cpathobj = PyUnicode_DecodeFSDefault(cpathname);
|
|
|
|
if (cpathobj == NULL)
|
|
|
|
goto error;
|
2012-07-14 01:57:03 +08:00
|
|
|
}
|
|
|
|
else
|
2011-03-04 20:57:09 +08:00
|
|
|
cpathobj = NULL;
|
2012-07-14 01:57:03 +08:00
|
|
|
|
|
|
|
if (pathname != NULL) {
|
|
|
|
pathobj = PyUnicode_DecodeFSDefault(pathname);
|
|
|
|
if (pathobj == NULL)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else if (cpathobj != NULL) {
|
2020-04-14 21:14:01 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2012-07-14 01:57:03 +08:00
|
|
|
|
|
|
|
if (interp == NULL) {
|
2020-03-26 02:27:36 +08:00
|
|
|
Py_FatalError("no current interpreter");
|
2012-07-14 01:57:03 +08:00
|
|
|
}
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
external= PyObject_GetAttrString(IMPORTLIB(interp),
|
2015-05-03 09:15:18 +08:00
|
|
|
"_bootstrap_external");
|
|
|
|
if (external != NULL) {
|
2023-06-26 14:08:12 +08:00
|
|
|
pathobj = PyObject_CallMethodOneArg(
|
2022-02-09 04:39:07 +08:00
|
|
|
external, &_Py_ID(_get_sourcefile), cpathobj);
|
2015-05-03 09:15:18 +08:00
|
|
|
Py_DECREF(external);
|
|
|
|
}
|
2012-07-14 01:57:03 +08:00
|
|
|
if (pathobj == NULL)
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
pathobj = NULL;
|
|
|
|
|
2011-03-04 20:57:09 +08:00
|
|
|
m = PyImport_ExecCodeModuleObject(nameobj, co, pathobj, cpathobj);
|
|
|
|
error:
|
|
|
|
Py_DECREF(nameobj);
|
|
|
|
Py_XDECREF(pathobj);
|
|
|
|
Py_XDECREF(cpathobj);
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
2014-04-04 22:01:46 +08:00
|
|
|
static PyObject *
|
2019-06-19 08:54:39 +08:00
|
|
|
module_dict_for_exec(PyThreadState *tstate, PyObject *name)
|
2010-05-09 23:52:27 +08:00
|
|
|
{
|
2021-01-12 22:43:32 +08:00
|
|
|
PyObject *m, *d;
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2019-06-19 08:54:39 +08:00
|
|
|
m = import_add_module(tstate, name);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (m == NULL)
|
|
|
|
return NULL;
|
|
|
|
/* If the module is being reloaded, we get the old module back
|
|
|
|
and re-use its dict to exec the new code. */
|
|
|
|
d = PyModule_GetDict(m);
|
2022-02-09 04:39:07 +08:00
|
|
|
int r = PyDict_Contains(d, &_Py_ID(__builtins__));
|
2020-10-26 18:47:57 +08:00
|
|
|
if (r == 0) {
|
2022-02-09 04:39:07 +08:00
|
|
|
r = PyDict_SetItem(d, &_Py_ID(__builtins__), PyEval_GetBuiltins());
|
2020-10-26 18:47:57 +08:00
|
|
|
}
|
|
|
|
if (r < 0) {
|
|
|
|
remove_module(tstate, name);
|
2021-01-12 22:43:32 +08:00
|
|
|
Py_DECREF(m);
|
2020-10-26 18:47:57 +08:00
|
|
|
return NULL;
|
2014-04-04 22:01:46 +08:00
|
|
|
}
|
|
|
|
|
2021-01-12 22:43:32 +08:00
|
|
|
Py_INCREF(d);
|
|
|
|
Py_DECREF(m);
|
|
|
|
return d;
|
2014-04-04 22:01:46 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2019-06-19 08:54:39 +08:00
|
|
|
exec_code_in_module(PyThreadState *tstate, PyObject *name,
|
|
|
|
PyObject *module_dict, PyObject *code_object)
|
2014-04-04 22:01:46 +08:00
|
|
|
{
|
|
|
|
PyObject *v, *m;
|
|
|
|
|
|
|
|
v = PyEval_EvalCode(code_object, module_dict, module_dict);
|
|
|
|
if (v == NULL) {
|
2019-06-19 08:54:39 +08:00
|
|
|
remove_module(tstate, name);
|
2014-04-04 22:01:46 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
Py_DECREF(v);
|
|
|
|
|
2019-06-19 08:54:39 +08:00
|
|
|
m = import_get_module(tstate, name);
|
|
|
|
if (m == NULL && !_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_Format(tstate, PyExc_ImportError,
|
|
|
|
"Loaded module %R not found in sys.modules",
|
|
|
|
name);
|
2014-04-04 22:01:46 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject*
|
|
|
|
PyImport_ExecCodeModuleObject(PyObject *name, PyObject *co, PyObject *pathname,
|
|
|
|
PyObject *cpathname)
|
|
|
|
{
|
2019-06-19 08:54:39 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2015-05-03 09:15:18 +08:00
|
|
|
PyObject *d, *external, *res;
|
2014-04-04 22:01:46 +08:00
|
|
|
|
2019-06-19 08:54:39 +08:00
|
|
|
d = module_dict_for_exec(tstate, name);
|
2014-04-04 22:01:46 +08:00
|
|
|
if (d == NULL) {
|
|
|
|
return NULL;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2014-04-04 22:01:46 +08:00
|
|
|
|
2014-05-13 07:54:55 +08:00
|
|
|
if (pathname == NULL) {
|
|
|
|
pathname = ((PyCodeObject *)co)->co_filename;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
external = PyObject_GetAttrString(IMPORTLIB(tstate->interp),
|
2019-06-19 08:54:39 +08:00
|
|
|
"_bootstrap_external");
|
2021-01-12 22:43:32 +08:00
|
|
|
if (external == NULL) {
|
|
|
|
Py_DECREF(d);
|
2015-05-03 09:15:18 +08:00
|
|
|
return NULL;
|
2021-01-12 22:43:32 +08:00
|
|
|
}
|
2022-02-09 04:39:07 +08:00
|
|
|
res = PyObject_CallMethodObjArgs(external, &_Py_ID(_fix_up_module),
|
|
|
|
d, name, pathname, cpathname, NULL);
|
2015-05-03 09:15:18 +08:00
|
|
|
Py_DECREF(external);
|
2014-05-13 07:54:55 +08:00
|
|
|
if (res != NULL) {
|
2014-05-30 02:31:39 +08:00
|
|
|
Py_DECREF(res);
|
2019-06-19 08:54:39 +08:00
|
|
|
res = exec_code_in_module(tstate, name, d, co);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2021-01-12 22:43:32 +08:00
|
|
|
Py_DECREF(d);
|
2014-05-13 07:54:55 +08:00
|
|
|
return res;
|
1995-01-03 03:04:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-01-07 03:02:24 +08:00
|
|
|
static void
|
|
|
|
update_code_filenames(PyCodeObject *co, PyObject *oldname, PyObject *newname)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *constants, *tmp;
|
|
|
|
Py_ssize_t i, n;
|
2009-01-07 03:02:24 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PyUnicode_Compare(co->co_filename, oldname))
|
|
|
|
return;
|
2009-01-07 03:02:24 +08:00
|
|
|
|
2022-11-10 18:23:36 +08:00
|
|
|
Py_XSETREF(co->co_filename, Py_NewRef(newname));
|
2009-01-07 03:02:24 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
constants = co->co_consts;
|
|
|
|
n = PyTuple_GET_SIZE(constants);
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
tmp = PyTuple_GET_ITEM(constants, i);
|
|
|
|
if (PyCode_Check(tmp))
|
|
|
|
update_code_filenames((PyCodeObject *)tmp,
|
|
|
|
oldname, newname);
|
|
|
|
}
|
2009-01-07 03:02:24 +08:00
|
|
|
}
|
|
|
|
|
2011-03-20 07:41:24 +08:00
|
|
|
static void
|
|
|
|
update_compiled_module(PyCodeObject *co, PyObject *newname)
|
2009-01-07 03:02:24 +08:00
|
|
|
{
|
2011-03-20 07:41:24 +08:00
|
|
|
PyObject *oldname;
|
2009-01-07 03:02:24 +08:00
|
|
|
|
2011-03-20 07:41:24 +08:00
|
|
|
if (PyUnicode_Compare(co->co_filename, newname) == 0)
|
|
|
|
return;
|
2009-03-04 09:52:10 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
oldname = co->co_filename;
|
|
|
|
Py_INCREF(oldname);
|
|
|
|
update_code_filenames(co, oldname, newname);
|
|
|
|
Py_DECREF(oldname);
|
2009-01-07 03:02:24 +08:00
|
|
|
}
|
1995-01-03 03:04:15 +08:00
|
|
|
|
2020-11-19 06:18:29 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/******************/
|
|
|
|
/* frozen modules */
|
|
|
|
/******************/
|
2020-11-19 06:18:29 +08:00
|
|
|
|
2021-10-06 01:26:37 +08:00
|
|
|
/* Return true if the name is an alias. In that case, "alias" is set
|
|
|
|
to the original module name. If it is an alias but the original
|
|
|
|
module isn't known then "alias" is set to NULL while true is returned. */
|
|
|
|
static bool
|
|
|
|
resolve_module_alias(const char *name, const struct _module_alias *aliases,
|
|
|
|
const char **alias)
|
|
|
|
{
|
|
|
|
const struct _module_alias *entry;
|
|
|
|
for (entry = aliases; ; entry++) {
|
|
|
|
if (entry->name == NULL) {
|
|
|
|
/* It isn't an alias. */
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (strcmp(name, entry->name) == 0) {
|
|
|
|
if (alias != NULL) {
|
|
|
|
*alias = entry->orig;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-15 07:31:45 +08:00
|
|
|
static bool
|
|
|
|
use_frozen(void)
|
|
|
|
{
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2023-02-16 06:32:31 +08:00
|
|
|
int override = OVERRIDE_FROZEN_MODULES(interp);
|
2021-09-15 07:31:45 +08:00
|
|
|
if (override > 0) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else if (override < 0) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return interp->config.use_frozen_modules;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-14 06:18:37 +08:00
|
|
|
static PyObject *
|
2021-11-25 03:01:39 +08:00
|
|
|
list_frozen_module_names(void)
|
2021-09-14 06:18:37 +08:00
|
|
|
{
|
|
|
|
PyObject *names = PyList_New(0);
|
|
|
|
if (names == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2021-09-15 07:31:45 +08:00
|
|
|
bool enabled = use_frozen();
|
2021-10-29 05:04:33 +08:00
|
|
|
const struct _frozen *p;
|
|
|
|
#define ADD_MODULE(name) \
|
|
|
|
do { \
|
|
|
|
PyObject *nameobj = PyUnicode_FromString(name); \
|
|
|
|
if (nameobj == NULL) { \
|
|
|
|
goto error; \
|
|
|
|
} \
|
|
|
|
int res = PyList_Append(names, nameobj); \
|
|
|
|
Py_DECREF(nameobj); \
|
|
|
|
if (res != 0) { \
|
|
|
|
goto error; \
|
|
|
|
} \
|
|
|
|
} while(0)
|
|
|
|
// We always use the bootstrap modules.
|
|
|
|
for (p = _PyImport_FrozenBootstrap; ; p++) {
|
2021-09-14 06:18:37 +08:00
|
|
|
if (p->name == NULL) {
|
|
|
|
break;
|
|
|
|
}
|
2021-10-29 05:04:33 +08:00
|
|
|
ADD_MODULE(p->name);
|
|
|
|
}
|
|
|
|
// Frozen stdlib modules may be disabled.
|
|
|
|
for (p = _PyImport_FrozenStdlib; ; p++) {
|
|
|
|
if (p->name == NULL) {
|
|
|
|
break;
|
2021-09-15 07:31:45 +08:00
|
|
|
}
|
2021-10-29 05:04:33 +08:00
|
|
|
if (enabled) {
|
|
|
|
ADD_MODULE(p->name);
|
2021-09-14 06:18:37 +08:00
|
|
|
}
|
2021-10-29 05:04:33 +08:00
|
|
|
}
|
|
|
|
for (p = _PyImport_FrozenTest; ; p++) {
|
|
|
|
if (p->name == NULL) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (enabled) {
|
|
|
|
ADD_MODULE(p->name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#undef ADD_MODULE
|
|
|
|
// Add any custom modules.
|
|
|
|
if (PyImport_FrozenModules != NULL) {
|
|
|
|
for (p = PyImport_FrozenModules; ; p++) {
|
|
|
|
if (p->name == NULL) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
PyObject *nameobj = PyUnicode_FromString(p->name);
|
|
|
|
if (nameobj == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
int found = PySequence_Contains(names, nameobj);
|
|
|
|
if (found < 0) {
|
|
|
|
Py_DECREF(nameobj);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else if (found) {
|
|
|
|
Py_DECREF(nameobj);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
int res = PyList_Append(names, nameobj);
|
|
|
|
Py_DECREF(nameobj);
|
|
|
|
if (res != 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
2021-09-14 06:18:37 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return names;
|
2021-10-29 05:04:33 +08:00
|
|
|
|
|
|
|
error:
|
|
|
|
Py_DECREF(names);
|
|
|
|
return NULL;
|
2021-09-14 06:18:37 +08:00
|
|
|
}
|
|
|
|
|
2021-10-06 00:01:27 +08:00
|
|
|
typedef enum {
|
|
|
|
FROZEN_OKAY,
|
|
|
|
FROZEN_BAD_NAME, // The given module name wasn't valid.
|
|
|
|
FROZEN_NOT_FOUND, // It wasn't in PyImport_FrozenModules.
|
|
|
|
FROZEN_DISABLED, // -X frozen_modules=off (and not essential)
|
2021-10-30 04:55:14 +08:00
|
|
|
FROZEN_EXCLUDED, /* The PyImport_FrozenModules entry has NULL "code"
|
|
|
|
(module is present but marked as unimportable, stops search). */
|
|
|
|
FROZEN_INVALID, /* The PyImport_FrozenModules entry is bogus
|
|
|
|
(eg. does not contain executable code). */
|
2021-10-06 00:01:27 +08:00
|
|
|
} frozen_status;
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
set_frozen_error(frozen_status status, PyObject *modname)
|
|
|
|
{
|
|
|
|
const char *err = NULL;
|
|
|
|
switch (status) {
|
|
|
|
case FROZEN_BAD_NAME:
|
|
|
|
case FROZEN_NOT_FOUND:
|
|
|
|
err = "No such frozen object named %R";
|
|
|
|
break;
|
2021-10-29 04:20:07 +08:00
|
|
|
case FROZEN_DISABLED:
|
|
|
|
err = "Frozen modules are disabled and the frozen object named %R is not essential";
|
|
|
|
break;
|
2021-10-06 00:01:27 +08:00
|
|
|
case FROZEN_EXCLUDED:
|
|
|
|
err = "Excluded frozen object named %R";
|
|
|
|
break;
|
|
|
|
case FROZEN_INVALID:
|
|
|
|
err = "Frozen object named %R is invalid";
|
|
|
|
break;
|
|
|
|
case FROZEN_OKAY:
|
|
|
|
// There was no error.
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
Py_UNREACHABLE();
|
|
|
|
}
|
|
|
|
if (err != NULL) {
|
|
|
|
PyObject *msg = PyUnicode_FromFormat(err, modname);
|
|
|
|
if (msg == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
PyErr_SetImportError(msg, modname, NULL);
|
|
|
|
Py_XDECREF(msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-29 05:04:33 +08:00
|
|
|
static const struct _frozen *
|
|
|
|
look_up_frozen(const char *name)
|
|
|
|
{
|
|
|
|
const struct _frozen *p;
|
|
|
|
// We always use the bootstrap modules.
|
|
|
|
for (p = _PyImport_FrozenBootstrap; ; p++) {
|
|
|
|
if (p->name == NULL) {
|
|
|
|
// We hit the end-of-list sentinel value.
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (strcmp(name, p->name) == 0) {
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Prefer custom modules, if any. Frozen stdlib modules can be
|
|
|
|
// disabled here by setting "code" to NULL in the array entry.
|
|
|
|
if (PyImport_FrozenModules != NULL) {
|
|
|
|
for (p = PyImport_FrozenModules; ; p++) {
|
|
|
|
if (p->name == NULL) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (strcmp(name, p->name) == 0) {
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Frozen stdlib modules may be disabled.
|
|
|
|
if (use_frozen()) {
|
|
|
|
for (p = _PyImport_FrozenStdlib; ; p++) {
|
|
|
|
if (p->name == NULL) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (strcmp(name, p->name) == 0) {
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (p = _PyImport_FrozenTest; ; p++) {
|
|
|
|
if (p->name == NULL) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (strcmp(name, p->name) == 0) {
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2021-10-06 00:01:27 +08:00
|
|
|
struct frozen_info {
|
|
|
|
PyObject *nameobj;
|
|
|
|
const char *data;
|
|
|
|
Py_ssize_t size;
|
|
|
|
bool is_package;
|
2021-10-06 01:26:37 +08:00
|
|
|
bool is_alias;
|
|
|
|
const char *origname;
|
2021-10-06 00:01:27 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static frozen_status
|
|
|
|
find_frozen(PyObject *nameobj, struct frozen_info *info)
|
1990-12-20 23:06:42 +08:00
|
|
|
{
|
2021-10-06 00:01:27 +08:00
|
|
|
if (info != NULL) {
|
2021-10-06 01:26:37 +08:00
|
|
|
memset(info, 0, sizeof(*info));
|
2021-10-06 00:01:27 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (nameobj == NULL || nameobj == Py_None) {
|
|
|
|
return FROZEN_BAD_NAME;
|
2021-09-15 07:31:45 +08:00
|
|
|
}
|
2021-10-06 00:01:27 +08:00
|
|
|
const char *name = PyUnicode_AsUTF8(nameobj);
|
2021-09-15 07:31:45 +08:00
|
|
|
if (name == NULL) {
|
2021-10-06 00:01:27 +08:00
|
|
|
// Note that this function previously used
|
|
|
|
// _PyUnicode_EqualToASCIIString(). We clear the error here
|
|
|
|
// (instead of propagating it) to match the earlier behavior
|
|
|
|
// more closely.
|
2021-09-15 07:31:45 +08:00
|
|
|
PyErr_Clear();
|
2021-10-06 00:01:27 +08:00
|
|
|
return FROZEN_BAD_NAME;
|
2021-09-15 07:31:45 +08:00
|
|
|
}
|
2021-10-06 00:01:27 +08:00
|
|
|
|
2021-10-29 05:04:33 +08:00
|
|
|
const struct _frozen *p = look_up_frozen(name);
|
|
|
|
if (p == NULL) {
|
|
|
|
return FROZEN_NOT_FOUND;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2021-10-06 00:01:27 +08:00
|
|
|
if (info != NULL) {
|
|
|
|
info->nameobj = nameobj; // borrowed
|
|
|
|
info->data = (const char *)p->code;
|
2022-02-05 01:57:03 +08:00
|
|
|
info->size = p->size;
|
|
|
|
info->is_package = p->is_package;
|
|
|
|
if (p->size < 0) {
|
|
|
|
// backward compatibility with negative size values
|
|
|
|
info->size = -(p->size);
|
|
|
|
info->is_package = true;
|
|
|
|
}
|
2021-10-06 01:26:37 +08:00
|
|
|
info->origname = name;
|
|
|
|
info->is_alias = resolve_module_alias(name, _PyImport_FrozenAliases,
|
|
|
|
&info->origname);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
if (p->code == NULL) {
|
2021-10-06 00:01:27 +08:00
|
|
|
/* It is frozen but marked as un-importable. */
|
|
|
|
return FROZEN_EXCLUDED;
|
|
|
|
}
|
|
|
|
if (p->code[0] == '\0' || p->size == 0) {
|
2021-10-30 04:55:14 +08:00
|
|
|
/* Does not contain executable code. */
|
2021-10-06 00:01:27 +08:00
|
|
|
return FROZEN_INVALID;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2021-10-06 00:01:27 +08:00
|
|
|
return FROZEN_OKAY;
|
1995-08-04 12:08:57 +08:00
|
|
|
}
|
|
|
|
|
2009-03-15 10:20:16 +08:00
|
|
|
static PyObject *
|
2023-04-25 05:48:05 +08:00
|
|
|
unmarshal_frozen_code(PyInterpreterState *interp, struct frozen_info *info)
|
2009-03-15 10:20:16 +08:00
|
|
|
{
|
2021-10-06 00:01:27 +08:00
|
|
|
PyObject *co = PyMarshal_ReadObjectFromString(info->data, info->size);
|
|
|
|
if (co == NULL) {
|
2021-10-30 04:55:14 +08:00
|
|
|
/* Does not contain executable code. */
|
2023-06-23 05:30:19 +08:00
|
|
|
PyErr_Clear();
|
2021-10-06 00:01:27 +08:00
|
|
|
set_frozen_error(FROZEN_INVALID, info->nameobj);
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2021-10-06 00:01:27 +08:00
|
|
|
if (!PyCode_Check(co)) {
|
|
|
|
// We stick with TypeError for backward compatibility.
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"frozen object %R is not a code object",
|
|
|
|
info->nameobj);
|
|
|
|
Py_DECREF(co);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return co;
|
2009-03-15 10:20:16 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1995-08-04 12:08:57 +08:00
|
|
|
/* Initialize a frozen module.
|
2009-03-09 04:49:47 +08:00
|
|
|
Return 1 for success, 0 if the module is not found, and -1 with
|
1995-08-04 12:08:57 +08:00
|
|
|
an exception set if the initialization failed.
|
|
|
|
This function is also used from frozenmain.c */
|
|
|
|
|
|
|
|
int
|
2011-03-20 08:50:21 +08:00
|
|
|
PyImport_ImportFrozenModuleObject(PyObject *name)
|
1995-08-04 12:08:57 +08:00
|
|
|
{
|
2019-06-19 08:54:39 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2021-10-06 01:26:37 +08:00
|
|
|
PyObject *co, *m, *d = NULL;
|
|
|
|
int err;
|
2011-03-20 08:50:21 +08:00
|
|
|
|
2021-10-06 00:01:27 +08:00
|
|
|
struct frozen_info info;
|
|
|
|
frozen_status status = find_frozen(name, &info);
|
|
|
|
if (status == FROZEN_NOT_FOUND || status == FROZEN_DISABLED) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return 0;
|
2021-10-06 00:01:27 +08:00
|
|
|
}
|
|
|
|
else if (status == FROZEN_BAD_NAME) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else if (status != FROZEN_OKAY) {
|
|
|
|
set_frozen_error(status, name);
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
|
|
|
}
|
2023-04-25 05:48:05 +08:00
|
|
|
co = unmarshal_frozen_code(tstate->interp, &info);
|
2021-10-06 00:01:27 +08:00
|
|
|
if (co == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
|
|
|
}
|
2021-10-06 00:01:27 +08:00
|
|
|
if (info.is_package) {
|
2013-06-01 11:18:39 +08:00
|
|
|
/* Set __path__ to the empty list */
|
2014-04-04 22:01:46 +08:00
|
|
|
PyObject *l;
|
2019-06-19 08:54:39 +08:00
|
|
|
m = import_add_module(tstate, name);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (m == NULL)
|
|
|
|
goto err_return;
|
|
|
|
d = PyModule_GetDict(m);
|
2013-06-01 11:18:39 +08:00
|
|
|
l = PyList_New(0);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (l == NULL) {
|
2021-01-12 22:43:32 +08:00
|
|
|
Py_DECREF(m);
|
2010-05-09 23:52:27 +08:00
|
|
|
goto err_return;
|
|
|
|
}
|
|
|
|
err = PyDict_SetItemString(d, "__path__", l);
|
|
|
|
Py_DECREF(l);
|
2021-01-12 22:43:32 +08:00
|
|
|
Py_DECREF(m);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (err != 0)
|
|
|
|
goto err_return;
|
|
|
|
}
|
2019-06-19 08:54:39 +08:00
|
|
|
d = module_dict_for_exec(tstate, name);
|
2014-04-04 22:01:46 +08:00
|
|
|
if (d == NULL) {
|
2011-03-20 08:50:21 +08:00
|
|
|
goto err_return;
|
2014-04-04 22:01:46 +08:00
|
|
|
}
|
2019-06-19 08:54:39 +08:00
|
|
|
m = exec_code_in_module(tstate, name, d, co);
|
|
|
|
if (m == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
goto err_return;
|
2019-06-19 08:54:39 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(m);
|
2021-10-06 01:26:37 +08:00
|
|
|
/* Set __origname__ (consumed in FrozenImporter._setup_module()). */
|
|
|
|
PyObject *origname;
|
|
|
|
if (info.origname) {
|
|
|
|
origname = PyUnicode_FromString(info.origname);
|
|
|
|
if (origname == NULL) {
|
|
|
|
goto err_return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2022-11-10 18:23:36 +08:00
|
|
|
origname = Py_NewRef(Py_None);
|
2021-10-06 01:26:37 +08:00
|
|
|
}
|
|
|
|
err = PyDict_SetItemString(d, "__origname__", origname);
|
|
|
|
Py_DECREF(origname);
|
|
|
|
if (err != 0) {
|
|
|
|
goto err_return;
|
|
|
|
}
|
|
|
|
Py_DECREF(d);
|
|
|
|
Py_DECREF(co);
|
2010-05-09 23:52:27 +08:00
|
|
|
return 1;
|
2019-06-19 08:54:39 +08: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 22:57:12 +08:00
|
|
|
err_return:
|
2021-10-06 01:26:37 +08:00
|
|
|
Py_XDECREF(d);
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(co);
|
|
|
|
return -1;
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
|
|
|
|
2011-03-20 08:50:21 +08:00
|
|
|
int
|
2013-10-20 02:03:34 +08:00
|
|
|
PyImport_ImportFrozenModule(const char *name)
|
2011-03-20 08:50:21 +08:00
|
|
|
{
|
|
|
|
PyObject *nameobj;
|
|
|
|
int ret;
|
|
|
|
nameobj = PyUnicode_InternFromString(name);
|
|
|
|
if (nameobj == NULL)
|
|
|
|
return -1;
|
|
|
|
ret = PyImport_ImportFrozenModuleObject(nameobj);
|
|
|
|
Py_DECREF(nameobj);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
1995-01-03 03:04:15 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/*************/
|
|
|
|
/* importlib */
|
|
|
|
/*************/
|
1995-01-03 03:04:15 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/* Import the _imp extension by calling manually _imp.create_builtin() and
|
|
|
|
_imp.exec_builtin() since importlib is not initialized yet. Initializing
|
|
|
|
importlib requires the _imp module: this function fix the bootstrap issue.
|
|
|
|
*/
|
|
|
|
static PyObject*
|
|
|
|
bootstrap_imp(PyThreadState *tstate)
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 15:33:22 +08:00
|
|
|
{
|
2023-02-16 06:32:31 +08:00
|
|
|
PyObject *name = PyUnicode_FromString("_imp");
|
|
|
|
if (name == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 15:33:22 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
// Mock a ModuleSpec object just good enough for PyModule_FromDefAndSpec():
|
|
|
|
// an object with just a name attribute.
|
|
|
|
//
|
|
|
|
// _imp.__spec__ is overridden by importlib._bootstrap._instal() anyway.
|
|
|
|
PyObject *attrs = Py_BuildValue("{sO}", "name", name);
|
|
|
|
if (attrs == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
PyObject *spec = _PyNamespace_New(attrs);
|
|
|
|
Py_DECREF(attrs);
|
|
|
|
if (spec == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2019-09-11 20:47:39 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
// Create the _imp module from its definition.
|
|
|
|
PyObject *mod = create_builtin(tstate, name, spec);
|
|
|
|
Py_CLEAR(name);
|
|
|
|
Py_DECREF(spec);
|
|
|
|
if (mod == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
assert(mod != Py_None); // not found
|
|
|
|
|
|
|
|
// Execute the _imp module: call imp_module_exec().
|
|
|
|
if (exec_builtin_or_dynamic(mod) < 0) {
|
|
|
|
Py_DECREF(mod);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
return mod;
|
|
|
|
|
|
|
|
error:
|
|
|
|
Py_XDECREF(name);
|
|
|
|
return NULL;
|
Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
Made vs9to8 Unix compatible
........
r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
Patch #1696. Don't attempt to close None in dry-run mode.
........
r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
documentation. The only significant difference is that round(x) returns a float
to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
Regular Expression inline flags not handled correctly for some unicode
characters. (Forward port from 2.5.2.)
........
r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
Added math.isinf() and math.isnan()
........
r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
Added copysign(x, y) function to the math module
........
2008-01-04 07:01:04 +08:00
|
|
|
}
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/* Global initializations. Can be undone by Py_FinalizeEx(). Don't
|
|
|
|
call this twice without an intervening Py_FinalizeEx() call. When
|
|
|
|
initializations fail, a fatal error is issued and the function does
|
|
|
|
not return. On return, the first thread and interpreter state have
|
|
|
|
been created.
|
1997-09-07 02:52:03 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
Locking: you must hold the interpreter lock while calling this.
|
|
|
|
(If the lock has not yet been initialized, that's equivalent to
|
|
|
|
having the lock, but you cannot use multiple threads.)
|
|
|
|
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
init_importlib(PyThreadState *tstate, PyObject *sysmod)
|
2012-07-08 18:01:27 +08:00
|
|
|
{
|
2023-02-16 06:32:31 +08:00
|
|
|
assert(!_PyErr_Occurred(tstate));
|
2012-07-08 18:01:27 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
PyInterpreterState *interp = tstate->interp;
|
|
|
|
int verbose = _PyInterpreterState_GetConfig(interp)->verbose;
|
|
|
|
|
|
|
|
// Import _importlib through its frozen version, _frozen_importlib.
|
|
|
|
if (verbose) {
|
|
|
|
PySys_FormatStderr("import _frozen_importlib # frozen\n");
|
|
|
|
}
|
|
|
|
if (PyImport_ImportFrozenModule("_frozen_importlib") <= 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2023-06-20 14:48:14 +08:00
|
|
|
|
|
|
|
PyObject *importlib = PyImport_AddModuleRef("_frozen_importlib");
|
2023-02-16 06:32:31 +08:00
|
|
|
if (importlib == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
2023-06-20 14:48:14 +08:00
|
|
|
IMPORTLIB(interp) = importlib;
|
2023-02-16 06:32:31 +08:00
|
|
|
|
|
|
|
// Import the _imp module
|
|
|
|
if (verbose) {
|
|
|
|
PySys_FormatStderr("import _imp # builtin\n");
|
|
|
|
}
|
|
|
|
PyObject *imp_mod = bootstrap_imp(tstate);
|
|
|
|
if (imp_mod == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (_PyImport_SetModuleString("_imp", imp_mod) < 0) {
|
|
|
|
Py_DECREF(imp_mod);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Install importlib as the implementation of import
|
|
|
|
PyObject *value = PyObject_CallMethod(importlib, "_install",
|
|
|
|
"OO", sysmod, imp_mod);
|
|
|
|
Py_DECREF(imp_mod);
|
|
|
|
if (value == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
Py_DECREF(value);
|
|
|
|
|
|
|
|
assert(!_PyErr_Occurred(tstate));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
init_importlib_external(PyInterpreterState *interp)
|
|
|
|
{
|
|
|
|
PyObject *value;
|
|
|
|
value = PyObject_CallMethod(IMPORTLIB(interp),
|
|
|
|
"_install_external_importers", "");
|
|
|
|
if (value == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
Py_DECREF(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
_PyImport_GetImportlibLoader(PyInterpreterState *interp,
|
|
|
|
const char *loader_name)
|
|
|
|
{
|
|
|
|
return PyObject_GetAttrString(IMPORTLIB(interp), loader_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
_PyImport_GetImportlibExternalLoader(PyInterpreterState *interp,
|
|
|
|
const char *loader_name)
|
|
|
|
{
|
|
|
|
PyObject *bootstrap = PyObject_GetAttrString(IMPORTLIB(interp),
|
|
|
|
"_bootstrap_external");
|
|
|
|
if (bootstrap == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *loader_type = PyObject_GetAttrString(bootstrap, loader_name);
|
|
|
|
Py_DECREF(bootstrap);
|
|
|
|
return loader_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
_PyImport_BlessMyLoader(PyInterpreterState *interp, PyObject *module_globals)
|
|
|
|
{
|
|
|
|
PyObject *external = PyObject_GetAttrString(IMPORTLIB(interp),
|
|
|
|
"_bootstrap_external");
|
|
|
|
if (external == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *loader = PyObject_CallMethod(external, "_bless_my_loader",
|
|
|
|
"O", module_globals, NULL);
|
|
|
|
Py_DECREF(external);
|
|
|
|
return loader;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
_PyImport_ImportlibModuleRepr(PyInterpreterState *interp, PyObject *m)
|
|
|
|
{
|
|
|
|
return PyObject_CallMethod(IMPORTLIB(interp), "_module_repr", "O", m);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*******************/
|
|
|
|
|
|
|
|
/* Return a finder object for a sys.path/pkg.__path__ item 'p',
|
|
|
|
possibly by fetching it from the path_importer_cache dict. If it
|
|
|
|
wasn't yet cached, traverse path_hooks until a hook is found
|
|
|
|
that can handle the path item. Return None if no hook could;
|
|
|
|
this tells our caller that the path based finder could not find
|
|
|
|
a finder for this path item. Cache the result in
|
|
|
|
path_importer_cache. */
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
get_path_importer(PyThreadState *tstate, PyObject *path_importer_cache,
|
|
|
|
PyObject *path_hooks, PyObject *p)
|
|
|
|
{
|
|
|
|
PyObject *importer;
|
|
|
|
Py_ssize_t j, nhooks;
|
|
|
|
|
2023-09-23 14:39:24 +08:00
|
|
|
if (!PyList_Check(path_hooks)) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError, "sys.path_hooks is not a list");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (!PyDict_Check(path_importer_cache)) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError, "sys.path_importer_cache is not a dict");
|
|
|
|
return NULL;
|
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
|
|
|
|
nhooks = PyList_Size(path_hooks);
|
|
|
|
if (nhooks < 0)
|
|
|
|
return NULL; /* Shouldn't happen */
|
|
|
|
|
2023-11-14 17:29:20 +08:00
|
|
|
if (PyDict_GetItemRef(path_importer_cache, p, &importer) != 0) {
|
|
|
|
// found or error
|
|
|
|
return importer;
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
2023-11-14 17:29:20 +08:00
|
|
|
// not found
|
2023-02-16 06:32:31 +08:00
|
|
|
/* set path_importer_cache[p] to None to avoid recursion */
|
|
|
|
if (PyDict_SetItem(path_importer_cache, p, Py_None) != 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (j = 0; j < nhooks; j++) {
|
|
|
|
PyObject *hook = PyList_GetItem(path_hooks, j);
|
|
|
|
if (hook == NULL)
|
|
|
|
return NULL;
|
|
|
|
importer = PyObject_CallOneArg(hook, p);
|
|
|
|
if (importer != NULL)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (!_PyErr_ExceptionMatches(tstate, PyExc_ImportError)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
_PyErr_Clear(tstate);
|
|
|
|
}
|
|
|
|
if (importer == NULL) {
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
if (PyDict_SetItem(path_importer_cache, p, importer) < 0) {
|
|
|
|
Py_DECREF(importer);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return importer;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyImport_GetImporter(PyObject *path)
|
|
|
|
{
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
PyObject *path_importer_cache = PySys_GetObject("path_importer_cache");
|
2023-09-23 14:39:24 +08:00
|
|
|
if (path_importer_cache == NULL) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError, "lost sys.path_importer_cache");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
Py_INCREF(path_importer_cache);
|
2023-02-16 06:32:31 +08:00
|
|
|
PyObject *path_hooks = PySys_GetObject("path_hooks");
|
2023-09-23 14:39:24 +08:00
|
|
|
if (path_hooks == NULL) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError, "lost sys.path_hooks");
|
|
|
|
Py_DECREF(path_importer_cache);
|
2023-02-16 06:32:31 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2023-09-23 14:39:24 +08:00
|
|
|
Py_INCREF(path_hooks);
|
|
|
|
PyObject *importer = get_path_importer(tstate, path_importer_cache, path_hooks, path);
|
|
|
|
Py_DECREF(path_hooks);
|
|
|
|
Py_DECREF(path_importer_cache);
|
|
|
|
return importer;
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*********************/
|
|
|
|
/* importing modules */
|
|
|
|
/*********************/
|
|
|
|
|
|
|
|
int
|
|
|
|
_PyImport_InitDefaultImportFunc(PyInterpreterState *interp)
|
|
|
|
{
|
|
|
|
// Get the __import__ function
|
2023-08-24 04:59:00 +08:00
|
|
|
PyObject *import_func;
|
|
|
|
if (PyDict_GetItemStringRef(interp->builtins, "__import__", &import_func) <= 0) {
|
2023-02-16 06:32:31 +08:00
|
|
|
return -1;
|
|
|
|
}
|
2023-08-24 04:59:00 +08:00
|
|
|
IMPORT_FUNC(interp) = import_func;
|
2023-02-16 06:32:31 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
_PyImport_IsDefaultImportFunc(PyInterpreterState *interp, PyObject *func)
|
|
|
|
{
|
|
|
|
return func == IMPORT_FUNC(interp);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Import a module, either built-in, frozen, or external, and return
|
|
|
|
its module object WITH INCREMENTED REFERENCE COUNT */
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyImport_ImportModule(const char *name)
|
|
|
|
{
|
|
|
|
PyObject *pname;
|
|
|
|
PyObject *result;
|
|
|
|
|
|
|
|
pname = PyUnicode_FromString(name);
|
|
|
|
if (pname == NULL)
|
|
|
|
return NULL;
|
|
|
|
result = PyImport_Import(pname);
|
|
|
|
Py_DECREF(pname);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Import a module without blocking
|
|
|
|
*
|
|
|
|
* At first it tries to fetch the module from sys.modules. If the module was
|
|
|
|
* never loaded before it loads it with PyImport_ImportModule() unless another
|
|
|
|
* thread holds the import lock. In the latter case the function raises an
|
|
|
|
* ImportError instead of blocking.
|
|
|
|
*
|
|
|
|
* Returns the module object with incremented ref count.
|
|
|
|
*/
|
|
|
|
PyObject *
|
|
|
|
PyImport_ImportModuleNoBlock(const char *name)
|
|
|
|
{
|
2023-06-09 16:30:57 +08:00
|
|
|
if (PyErr_WarnEx(PyExc_DeprecationWarning,
|
|
|
|
"PyImport_ImportModuleNoBlock() is deprecated and scheduled for "
|
|
|
|
"removal in Python 3.15. Use PyImport_ImportModule() instead.", 1))
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
2023-02-16 06:32:31 +08:00
|
|
|
return PyImport_ImportModule(name);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Remove importlib frames from the traceback,
|
|
|
|
* except in Verbose mode. */
|
|
|
|
static void
|
|
|
|
remove_importlib_frames(PyThreadState *tstate)
|
|
|
|
{
|
|
|
|
const char *importlib_filename = "<frozen importlib._bootstrap>";
|
|
|
|
const char *external_filename = "<frozen importlib._bootstrap_external>";
|
|
|
|
const char *remove_frames = "_call_with_frames_removed";
|
|
|
|
int always_trim = 0;
|
|
|
|
int in_importlib = 0;
|
|
|
|
PyObject **prev_link, **outer_link = NULL;
|
2023-03-19 23:17:59 +08:00
|
|
|
PyObject *base_tb = NULL;
|
2023-02-16 06:32:31 +08:00
|
|
|
|
|
|
|
/* Synopsis: if it's an ImportError, we trim all importlib chunks
|
2012-07-31 19:14:18 +08:00
|
|
|
from the traceback. We always trim chunks
|
|
|
|
which end with a call to "_call_with_frames_removed". */
|
2012-07-08 18:01:27 +08:00
|
|
|
|
2023-03-19 23:17:59 +08:00
|
|
|
PyObject *exc = _PyErr_GetRaisedException(tstate);
|
|
|
|
if (exc == NULL || _PyInterpreterState_GetConfig(tstate->interp)->verbose) {
|
2012-07-08 18:01:27 +08:00
|
|
|
goto done;
|
2019-05-13 23:12:45 +08:00
|
|
|
}
|
|
|
|
|
2023-03-19 23:17:59 +08:00
|
|
|
if (PyType_IsSubtype(Py_TYPE(exc), (PyTypeObject *) PyExc_ImportError)) {
|
2012-07-08 18:01:27 +08:00
|
|
|
always_trim = 1;
|
2023-03-19 23:17:59 +08:00
|
|
|
}
|
2012-07-08 18:01:27 +08:00
|
|
|
|
2023-03-19 23:17:59 +08:00
|
|
|
assert(PyExceptionInstance_Check(exc));
|
|
|
|
base_tb = PyException_GetTraceback(exc);
|
2012-07-08 18:01:27 +08:00
|
|
|
prev_link = &base_tb;
|
2023-03-19 23:17:59 +08:00
|
|
|
PyObject *tb = base_tb;
|
2012-07-08 18:01:27 +08:00
|
|
|
while (tb != NULL) {
|
2023-03-19 23:17:59 +08:00
|
|
|
assert(PyTraceBack_Check(tb));
|
2012-07-08 18:01:27 +08:00
|
|
|
PyTracebackObject *traceback = (PyTracebackObject *)tb;
|
|
|
|
PyObject *next = (PyObject *) traceback->tb_next;
|
|
|
|
PyFrameObject *frame = traceback->tb_frame;
|
2020-04-29 01:01:31 +08:00
|
|
|
PyCodeObject *code = PyFrame_GetCode(frame);
|
2012-07-08 18:01:27 +08:00
|
|
|
int now_in_importlib;
|
|
|
|
|
2016-11-16 16:17:58 +08:00
|
|
|
now_in_importlib = _PyUnicode_EqualToASCIIString(code->co_filename, importlib_filename) ||
|
|
|
|
_PyUnicode_EqualToASCIIString(code->co_filename, external_filename);
|
2012-07-08 18:01:27 +08:00
|
|
|
if (now_in_importlib && !in_importlib) {
|
|
|
|
/* This is the link to this chunk of importlib tracebacks */
|
|
|
|
outer_link = prev_link;
|
|
|
|
}
|
|
|
|
in_importlib = now_in_importlib;
|
|
|
|
|
|
|
|
if (in_importlib &&
|
|
|
|
(always_trim ||
|
2016-11-16 16:17:58 +08:00
|
|
|
_PyUnicode_EqualToASCIIString(code->co_name, remove_frames))) {
|
2022-11-10 18:23:36 +08:00
|
|
|
Py_XSETREF(*outer_link, Py_XNewRef(next));
|
2012-07-08 18:01:27 +08:00
|
|
|
prev_link = outer_link;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
prev_link = (PyObject **) &traceback->tb_next;
|
|
|
|
}
|
2020-04-29 07:28:13 +08:00
|
|
|
Py_DECREF(code);
|
2012-07-08 18:01:27 +08:00
|
|
|
tb = next;
|
|
|
|
}
|
2023-02-08 17:31:12 +08:00
|
|
|
if (base_tb == NULL) {
|
|
|
|
base_tb = Py_None;
|
|
|
|
Py_INCREF(Py_None);
|
|
|
|
}
|
2023-03-19 23:17:59 +08:00
|
|
|
PyException_SetTraceback(exc, base_tb);
|
2012-07-08 18:01:27 +08:00
|
|
|
done:
|
2023-03-19 23:17:59 +08:00
|
|
|
Py_XDECREF(base_tb);
|
|
|
|
_PyErr_SetRaisedException(tstate, exc);
|
2012-07-08 18:01:27 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-08-03 03:51:21 +08:00
|
|
|
static PyObject *
|
2019-06-19 08:54:39 +08:00
|
|
|
resolve_name(PyThreadState *tstate, PyObject *name, PyObject *globals, int level)
|
1997-09-07 02:52:03 +08:00
|
|
|
{
|
2016-08-03 03:51:21 +08:00
|
|
|
PyObject *abs_name;
|
2012-04-15 02:10:13 +08:00
|
|
|
PyObject *package = NULL;
|
2023-11-14 17:29:20 +08:00
|
|
|
PyObject *spec = NULL;
|
2016-08-03 03:51:21 +08:00
|
|
|
Py_ssize_t last_dot;
|
|
|
|
PyObject *base;
|
|
|
|
int level_up;
|
|
|
|
|
|
|
|
if (globals == NULL) {
|
2019-06-19 08:54:39 +08:00
|
|
|
_PyErr_SetString(tstate, PyExc_KeyError, "'__name__' not in globals");
|
2016-08-03 03:51:21 +08:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (!PyDict_Check(globals)) {
|
2019-06-19 08:54:39 +08:00
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError, "globals must be a dict");
|
2016-08-03 03:51:21 +08:00
|
|
|
goto error;
|
|
|
|
}
|
2023-11-14 17:29:20 +08:00
|
|
|
if (PyDict_GetItemRef(globals, &_Py_ID(__package__), &package) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
2016-08-03 03:51:21 +08:00
|
|
|
if (package == Py_None) {
|
2023-11-14 17:29:20 +08:00
|
|
|
Py_DECREF(package);
|
2016-08-03 03:51:21 +08:00
|
|
|
package = NULL;
|
|
|
|
}
|
2023-11-14 17:29:20 +08:00
|
|
|
if (PyDict_GetItemRef(globals, &_Py_ID(__spec__), &spec) < 0) {
|
2019-02-25 23:59:46 +08:00
|
|
|
goto error;
|
|
|
|
}
|
2016-08-03 03:51:21 +08:00
|
|
|
|
|
|
|
if (package != NULL) {
|
|
|
|
if (!PyUnicode_Check(package)) {
|
2019-06-19 08:54:39 +08:00
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
"package must be a string");
|
2016-08-03 03:51:21 +08:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else if (spec != NULL && spec != Py_None) {
|
|
|
|
int equal;
|
2022-02-09 04:39:07 +08:00
|
|
|
PyObject *parent = PyObject_GetAttr(spec, &_Py_ID(parent));
|
2016-08-03 03:51:21 +08:00
|
|
|
if (parent == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2011-03-15 16:33:57 +08:00
|
|
|
|
2016-08-03 03:51:21 +08:00
|
|
|
equal = PyObject_RichCompareBool(package, parent, Py_EQ);
|
|
|
|
Py_DECREF(parent);
|
|
|
|
if (equal < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else if (equal == 0) {
|
2022-10-06 06:00:45 +08:00
|
|
|
if (PyErr_WarnEx(PyExc_DeprecationWarning,
|
2016-08-03 03:51:21 +08:00
|
|
|
"__package__ != __spec__.parent", 1) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (spec != NULL && spec != Py_None) {
|
2022-02-09 04:39:07 +08:00
|
|
|
package = PyObject_GetAttr(spec, &_Py_ID(parent));
|
2016-08-03 03:51:21 +08:00
|
|
|
if (package == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else if (!PyUnicode_Check(package)) {
|
2019-06-19 08:54:39 +08:00
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
"__spec__.parent must be a string");
|
2012-04-15 02:10:13 +08:00
|
|
|
goto error;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
}
|
2012-04-15 02:10:13 +08:00
|
|
|
else {
|
2016-08-03 03:51:21 +08:00
|
|
|
if (PyErr_WarnEx(PyExc_ImportWarning,
|
|
|
|
"can't resolve package from __spec__ or __package__, "
|
|
|
|
"falling back on __name__ and __path__", 1) < 0) {
|
2012-04-15 02:10:13 +08:00
|
|
|
goto error;
|
|
|
|
}
|
2016-08-03 03:51:21 +08:00
|
|
|
|
2023-11-14 17:29:20 +08:00
|
|
|
if (PyDict_GetItemRef(globals, &_Py_ID(__name__), &package) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
2016-08-03 03:51:21 +08:00
|
|
|
if (package == NULL) {
|
2023-11-14 17:29:20 +08:00
|
|
|
_PyErr_SetString(tstate, PyExc_KeyError,
|
|
|
|
"'__name__' not in globals");
|
2016-08-03 03:51:21 +08:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!PyUnicode_Check(package)) {
|
2019-06-19 08:54:39 +08:00
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
"__name__ must be a string");
|
2016-08-03 03:51:21 +08:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2022-02-09 04:39:07 +08:00
|
|
|
int haspath = PyDict_Contains(globals, &_Py_ID(__path__));
|
2020-10-26 18:47:57 +08:00
|
|
|
if (haspath < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (!haspath) {
|
2016-08-03 03:51:21 +08:00
|
|
|
Py_ssize_t dot;
|
|
|
|
|
|
|
|
dot = PyUnicode_FindChar(package, '.',
|
|
|
|
0, PyUnicode_GET_LENGTH(package), -1);
|
|
|
|
if (dot == -2) {
|
|
|
|
goto error;
|
|
|
|
}
|
2019-09-11 18:09:47 +08:00
|
|
|
else if (dot == -1) {
|
|
|
|
goto no_parent_error;
|
2016-08-03 03:51:21 +08:00
|
|
|
}
|
2019-09-11 18:09:47 +08:00
|
|
|
PyObject *substr = PyUnicode_Substring(package, 0, dot);
|
|
|
|
if (substr == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_SETREF(package, substr);
|
2016-08-03 03:51:21 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 03:51:21 +08:00
|
|
|
last_dot = PyUnicode_GET_LENGTH(package);
|
|
|
|
if (last_dot == 0) {
|
2019-09-11 18:09:47 +08:00
|
|
|
goto no_parent_error;
|
2016-08-03 03:51:21 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
for (level_up = 1; level_up < level; level_up += 1) {
|
|
|
|
last_dot = PyUnicode_FindChar(package, '.', 0, last_dot, -1);
|
|
|
|
if (last_dot == -2) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else if (last_dot == -1) {
|
2019-08-03 13:46:02 +08:00
|
|
|
_PyErr_SetString(tstate, PyExc_ImportError,
|
2019-06-19 08:54:39 +08:00
|
|
|
"attempted relative import beyond top-level "
|
|
|
|
"package");
|
2012-04-15 02:10:13 +08:00
|
|
|
goto error;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2016-08-03 03:51:21 +08:00
|
|
|
|
2023-11-14 17:29:20 +08:00
|
|
|
Py_XDECREF(spec);
|
2016-08-03 03:51:21 +08:00
|
|
|
base = PyUnicode_Substring(package, 0, last_dot);
|
|
|
|
Py_DECREF(package);
|
|
|
|
if (base == NULL || PyUnicode_GET_LENGTH(name) == 0) {
|
|
|
|
return base;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2016-08-03 03:51:21 +08:00
|
|
|
|
|
|
|
abs_name = PyUnicode_FromFormat("%U.%U", base, name);
|
|
|
|
Py_DECREF(base);
|
|
|
|
return abs_name;
|
|
|
|
|
2019-09-11 18:09:47 +08:00
|
|
|
no_parent_error:
|
|
|
|
_PyErr_SetString(tstate, PyExc_ImportError,
|
|
|
|
"attempted relative import "
|
|
|
|
"with no known parent package");
|
|
|
|
|
2016-08-03 03:51:21 +08:00
|
|
|
error:
|
2023-11-14 17:29:20 +08:00
|
|
|
Py_XDECREF(spec);
|
2016-08-03 03:51:21 +08:00
|
|
|
Py_XDECREF(package);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2017-12-04 01:26:03 +08:00
|
|
|
static PyObject *
|
2019-06-19 08:54:39 +08:00
|
|
|
import_find_and_load(PyThreadState *tstate, PyObject *abs_name)
|
2017-12-04 01:26:03 +08:00
|
|
|
{
|
|
|
|
PyObject *mod = NULL;
|
2019-06-19 08:54:39 +08:00
|
|
|
PyInterpreterState *interp = tstate->interp;
|
2020-04-13 09:04:28 +08:00
|
|
|
int import_time = _PyInterpreterState_GetConfig(interp)->import_time;
|
2023-03-10 00:46:21 +08:00
|
|
|
#define import_level FIND_AND_LOAD(interp).import_level
|
|
|
|
#define accumulated FIND_AND_LOAD(interp).accumulated
|
2017-12-04 01:26:03 +08:00
|
|
|
|
2024-02-20 23:02:27 +08:00
|
|
|
PyTime_t t1 = 0, accumulated_copy = accumulated;
|
2017-12-04 01:26:03 +08:00
|
|
|
|
2019-05-23 23:45:22 +08:00
|
|
|
PyObject *sys_path = PySys_GetObject("path");
|
|
|
|
PyObject *sys_meta_path = PySys_GetObject("meta_path");
|
|
|
|
PyObject *sys_path_hooks = PySys_GetObject("path_hooks");
|
2020-03-27 22:11:45 +08:00
|
|
|
if (_PySys_Audit(tstate, "import", "OOOOO",
|
|
|
|
abs_name, Py_None, sys_path ? sys_path : Py_None,
|
|
|
|
sys_meta_path ? sys_meta_path : Py_None,
|
|
|
|
sys_path_hooks ? sys_path_hooks : Py_None) < 0) {
|
2019-05-23 23:45:22 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-12-04 01:26:03 +08:00
|
|
|
/* XOptions is initialized after first some imports.
|
|
|
|
* So we can't have negative cache before completed initialization.
|
|
|
|
* Anyway, importlib._find_and_load is much slower than
|
|
|
|
* _PyDict_GetItemIdWithError().
|
|
|
|
*/
|
|
|
|
if (import_time) {
|
2023-03-10 00:46:21 +08:00
|
|
|
#define header FIND_AND_LOAD(interp).header
|
2017-12-04 01:26:03 +08:00
|
|
|
if (header) {
|
|
|
|
fputs("import time: self [us] | cumulative | imported package\n",
|
|
|
|
stderr);
|
|
|
|
header = 0;
|
|
|
|
}
|
2022-11-15 06:56:16 +08:00
|
|
|
#undef header
|
2017-12-04 01:26:03 +08:00
|
|
|
|
|
|
|
import_level++;
|
2024-05-05 18:15:19 +08:00
|
|
|
// ignore error: don't block import if reading the clock fails
|
|
|
|
(void)PyTime_PerfCounterRaw(&t1);
|
2017-12-04 01:26:03 +08:00
|
|
|
accumulated = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (PyDTrace_IMPORT_FIND_LOAD_START_ENABLED())
|
2020-03-31 04:19:14 +08:00
|
|
|
PyDTrace_IMPORT_FIND_LOAD_START(PyUnicode_AsUTF8(abs_name));
|
2017-12-04 01:26:03 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
mod = PyObject_CallMethodObjArgs(IMPORTLIB(interp), &_Py_ID(_find_and_load),
|
|
|
|
abs_name, IMPORT_FUNC(interp), NULL);
|
2017-12-04 01:26:03 +08:00
|
|
|
|
|
|
|
if (PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED())
|
2020-03-31 04:19:14 +08:00
|
|
|
PyDTrace_IMPORT_FIND_LOAD_DONE(PyUnicode_AsUTF8(abs_name),
|
2017-12-04 01:26:03 +08:00
|
|
|
mod != NULL);
|
|
|
|
|
|
|
|
if (import_time) {
|
2024-05-05 18:15:19 +08:00
|
|
|
PyTime_t t2;
|
|
|
|
(void)PyTime_PerfCounterRaw(&t2);
|
|
|
|
PyTime_t cum = t2 - t1;
|
2017-12-04 01:26:03 +08:00
|
|
|
|
|
|
|
import_level--;
|
|
|
|
fprintf(stderr, "import time: %9ld | %10ld | %*s%s\n",
|
|
|
|
(long)_PyTime_AsMicroseconds(cum - accumulated, _PyTime_ROUND_CEILING),
|
|
|
|
(long)_PyTime_AsMicroseconds(cum, _PyTime_ROUND_CEILING),
|
|
|
|
import_level*2, "", PyUnicode_AsUTF8(abs_name));
|
|
|
|
|
|
|
|
accumulated = accumulated_copy + cum;
|
|
|
|
}
|
|
|
|
|
|
|
|
return mod;
|
2022-11-15 06:56:16 +08:00
|
|
|
#undef import_level
|
|
|
|
#undef accumulated
|
2017-12-04 01:26:03 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 03:51:21 +08:00
|
|
|
PyObject *
|
|
|
|
PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
|
|
|
|
PyObject *locals, PyObject *fromlist,
|
|
|
|
int level)
|
|
|
|
{
|
2019-06-19 08:54:39 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2016-08-03 03:51:21 +08:00
|
|
|
PyObject *abs_name = NULL;
|
|
|
|
PyObject *final_mod = NULL;
|
|
|
|
PyObject *mod = NULL;
|
|
|
|
PyObject *package = NULL;
|
2019-06-19 08:54:39 +08:00
|
|
|
PyInterpreterState *interp = tstate->interp;
|
2016-08-03 03:51:21 +08:00
|
|
|
int has_from;
|
|
|
|
|
2012-04-15 02:10:13 +08:00
|
|
|
if (name == NULL) {
|
2019-06-19 08:54:39 +08:00
|
|
|
_PyErr_SetString(tstate, PyExc_ValueError, "Empty module name");
|
2012-04-15 02:10:13 +08:00
|
|
|
goto error;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
|
2012-04-15 02:10:13 +08:00
|
|
|
/* The below code is importlib.__import__() & _gcd_import(), ported to C
|
|
|
|
for added performance. */
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2012-04-15 02:10:13 +08:00
|
|
|
if (!PyUnicode_Check(name)) {
|
2019-06-19 08:54:39 +08:00
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
"module name must be a string");
|
2012-04-15 02:10:13 +08:00
|
|
|
goto error;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2012-04-15 02:10:13 +08:00
|
|
|
if (level < 0) {
|
2019-06-19 08:54:39 +08:00
|
|
|
_PyErr_SetString(tstate, PyExc_ValueError, "level must be >= 0");
|
2012-04-15 02:10:13 +08:00
|
|
|
goto error;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2016-01-23 07:25:50 +08:00
|
|
|
|
2016-08-03 03:51:21 +08:00
|
|
|
if (level > 0) {
|
2019-06-19 08:54:39 +08:00
|
|
|
abs_name = resolve_name(tstate, name, globals, level);
|
2016-08-03 03:51:21 +08:00
|
|
|
if (abs_name == NULL)
|
2012-04-15 02:10:13 +08:00
|
|
|
goto error;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2012-04-15 02:10:13 +08:00
|
|
|
else { /* level == 0 */
|
|
|
|
if (PyUnicode_GET_LENGTH(name) == 0) {
|
2019-06-19 08:54:39 +08:00
|
|
|
_PyErr_SetString(tstate, PyExc_ValueError, "Empty module name");
|
2012-04-15 02:10:13 +08:00
|
|
|
goto error;
|
|
|
|
}
|
2022-11-10 18:23:36 +08:00
|
|
|
abs_name = Py_NewRef(name);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
|
2019-06-19 08:54:39 +08:00
|
|
|
mod = import_get_module(tstate, abs_name);
|
|
|
|
if (mod == NULL && _PyErr_Occurred(tstate)) {
|
2019-03-26 04:50:58 +08:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2017-07-06 13:09:03 +08:00
|
|
|
if (mod != NULL && mod != Py_None) {
|
2021-03-21 03:07:44 +08:00
|
|
|
if (import_ensure_initialized(tstate->interp, mod, abs_name) < 0) {
|
2019-09-11 20:47:39 +08:00
|
|
|
goto error;
|
2012-05-18 00:55:59 +08:00
|
|
|
}
|
2012-04-15 02:10:13 +08:00
|
|
|
}
|
|
|
|
else {
|
2017-12-08 08:24:59 +08:00
|
|
|
Py_XDECREF(mod);
|
2019-06-19 08:54:39 +08:00
|
|
|
mod = import_find_and_load(tstate, abs_name);
|
2012-04-15 02:10:13 +08:00
|
|
|
if (mod == NULL) {
|
2012-05-18 00:55:59 +08:00
|
|
|
goto error;
|
2012-04-15 02:10:13 +08:00
|
|
|
}
|
|
|
|
}
|
2011-10-01 22:35:40 +08:00
|
|
|
|
2016-08-03 03:51:21 +08:00
|
|
|
has_from = 0;
|
|
|
|
if (fromlist != NULL && fromlist != Py_None) {
|
|
|
|
has_from = PyObject_IsTrue(fromlist);
|
|
|
|
if (has_from < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
2015-05-30 22:45:22 +08:00
|
|
|
if (!has_from) {
|
2016-05-20 17:36:13 +08:00
|
|
|
Py_ssize_t len = PyUnicode_GET_LENGTH(name);
|
|
|
|
if (level == 0 || len > 0) {
|
|
|
|
Py_ssize_t dot;
|
1997-09-07 02:52:03 +08:00
|
|
|
|
2016-05-20 17:36:13 +08:00
|
|
|
dot = PyUnicode_FindChar(name, '.', 0, len, 1);
|
|
|
|
if (dot == -2) {
|
2012-05-18 00:55:59 +08:00
|
|
|
goto error;
|
2012-04-15 02:10:13 +08:00
|
|
|
}
|
1997-09-07 04:29:52 +08:00
|
|
|
|
2016-05-20 17:36:13 +08:00
|
|
|
if (dot == -1) {
|
2012-05-08 03:41:59 +08:00
|
|
|
/* No dot in module name, simple exit */
|
2022-11-10 18:23:36 +08:00
|
|
|
final_mod = Py_NewRef(mod);
|
2012-05-18 00:55:59 +08:00
|
|
|
goto error;
|
2012-05-08 03:41:59 +08:00
|
|
|
}
|
|
|
|
|
2012-04-15 02:10:13 +08:00
|
|
|
if (level == 0) {
|
2016-05-20 17:36:13 +08:00
|
|
|
PyObject *front = PyUnicode_Substring(name, 0, dot);
|
|
|
|
if (front == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2016-08-03 03:51:21 +08:00
|
|
|
final_mod = PyImport_ImportModuleLevelObject(front, NULL, NULL, NULL, 0);
|
2012-05-06 23:15:23 +08:00
|
|
|
Py_DECREF(front);
|
2012-04-15 02:10:13 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
else {
|
2016-05-20 17:36:13 +08:00
|
|
|
Py_ssize_t cut_off = len - dot;
|
2012-04-17 04:06:21 +08:00
|
|
|
Py_ssize_t abs_name_len = PyUnicode_GET_LENGTH(abs_name);
|
2012-04-15 09:50:00 +08:00
|
|
|
PyObject *to_return = PyUnicode_Substring(abs_name, 0,
|
2012-04-15 02:10:13 +08:00
|
|
|
abs_name_len - cut_off);
|
2012-04-17 04:06:21 +08:00
|
|
|
if (to_return == NULL) {
|
2012-05-18 00:55:59 +08:00
|
|
|
goto error;
|
2012-04-17 04:06:21 +08:00
|
|
|
}
|
2012-04-15 02:10:13 +08:00
|
|
|
|
2019-06-19 08:54:39 +08:00
|
|
|
final_mod = import_get_module(tstate, to_return);
|
2016-08-03 03:51:21 +08:00
|
|
|
Py_DECREF(to_return);
|
2012-04-15 09:50:00 +08:00
|
|
|
if (final_mod == NULL) {
|
2019-06-19 08:54:39 +08:00
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_Format(tstate, PyExc_KeyError,
|
|
|
|
"%R not in sys.modules as expected",
|
|
|
|
to_return);
|
2019-03-26 04:50:58 +08:00
|
|
|
}
|
2016-08-03 03:51:21 +08:00
|
|
|
goto error;
|
2012-04-15 09:50:00 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
}
|
2012-04-15 02:10:13 +08:00
|
|
|
else {
|
2022-11-10 18:23:36 +08:00
|
|
|
final_mod = Py_NewRef(mod);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2023-09-17 19:23:31 +08:00
|
|
|
int has_path = PyObject_HasAttrWithError(mod, &_Py_ID(__path__));
|
|
|
|
if (has_path < 0) {
|
2018-03-11 16:52:37 +08:00
|
|
|
goto error;
|
|
|
|
}
|
2023-09-17 19:23:31 +08:00
|
|
|
if (has_path) {
|
2022-02-09 04:39:07 +08:00
|
|
|
final_mod = PyObject_CallMethodObjArgs(
|
2023-02-16 06:32:31 +08:00
|
|
|
IMPORTLIB(interp), &_Py_ID(_handle_fromlist),
|
|
|
|
mod, fromlist, IMPORT_FUNC(interp), NULL);
|
2018-03-11 16:52:37 +08:00
|
|
|
}
|
|
|
|
else {
|
2022-11-10 18:23:36 +08:00
|
|
|
final_mod = Py_NewRef(mod);
|
2018-03-11 16:52:37 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2012-05-08 03:41:59 +08:00
|
|
|
|
2012-04-15 02:10:13 +08:00
|
|
|
error:
|
|
|
|
Py_XDECREF(abs_name);
|
|
|
|
Py_XDECREF(mod);
|
|
|
|
Py_XDECREF(package);
|
2019-05-13 23:12:45 +08:00
|
|
|
if (final_mod == NULL) {
|
2019-06-19 08:54:39 +08:00
|
|
|
remove_importlib_frames(tstate);
|
2019-05-13 23:12:45 +08:00
|
|
|
}
|
2012-04-15 02:10:13 +08:00
|
|
|
return final_mod;
|
2003-06-17 05:03:07 +08:00
|
|
|
}
|
|
|
|
|
2012-04-15 02:10:13 +08:00
|
|
|
PyObject *
|
|
|
|
PyImport_ImportModuleLevel(const char *name, PyObject *globals, PyObject *locals,
|
|
|
|
PyObject *fromlist, int level)
|
1990-10-14 20:07:46 +08:00
|
|
|
{
|
2012-04-15 02:10:13 +08:00
|
|
|
PyObject *nameobj, *mod;
|
|
|
|
nameobj = PyUnicode_FromString(name);
|
|
|
|
if (nameobj == NULL)
|
2011-03-14 10:38:38 +08:00
|
|
|
return NULL;
|
2012-04-15 02:10:13 +08:00
|
|
|
mod = PyImport_ImportModuleLevelObject(nameobj, globals, locals,
|
|
|
|
fromlist, level);
|
|
|
|
Py_DECREF(nameobj);
|
|
|
|
return mod;
|
1990-10-14 20:07:46 +08:00
|
|
|
}
|
1990-10-26 22:58:58 +08:00
|
|
|
|
1995-01-03 03:04:15 +08:00
|
|
|
|
|
|
|
/* Re-import a module of any kind and return its module object, WITH
|
|
|
|
INCREMENTED REFERENCE COUNT */
|
|
|
|
|
1997-04-30 04:08:16 +08:00
|
|
|
PyObject *
|
2000-07-23 02:47:25 +08:00
|
|
|
PyImport_ReloadModule(PyObject *m)
|
1990-10-26 22:58:58 +08:00
|
|
|
{
|
2012-04-30 02:38:11 +08:00
|
|
|
PyObject *reloaded_module = NULL;
|
2022-02-09 04:39:07 +08:00
|
|
|
PyObject *importlib = PyImport_GetModule(&_Py_ID(importlib));
|
2020-05-02 07:28:06 +08:00
|
|
|
if (importlib == NULL) {
|
2019-03-26 04:50:58 +08:00
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-05-02 07:28:06 +08:00
|
|
|
importlib = PyImport_ImportModule("importlib");
|
|
|
|
if (importlib == NULL) {
|
2012-04-30 02:38:11 +08:00
|
|
|
return NULL;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
}
|
2011-03-14 21:21:33 +08:00
|
|
|
|
2022-02-09 04:39:07 +08:00
|
|
|
reloaded_module = PyObject_CallMethodOneArg(importlib, &_Py_ID(reload), m);
|
2020-05-02 07:28:06 +08:00
|
|
|
Py_DECREF(importlib);
|
2012-04-30 02:38:11 +08:00
|
|
|
return reloaded_module;
|
1990-12-20 23:06:42 +08:00
|
|
|
}
|
|
|
|
|
1995-01-03 03:04:15 +08:00
|
|
|
|
1997-08-15 04:11:26 +08:00
|
|
|
/* Higher-level import emulator which emulates the "import" statement
|
|
|
|
more accurately -- it invokes the __import__() function from the
|
|
|
|
builtins of the current globals. This means that the import is
|
|
|
|
done using whatever import hooks are installed in the current
|
2010-09-20 05:39:02 +08:00
|
|
|
environment.
|
1998-12-22 03:51:00 +08:00
|
|
|
A dummy list ["__doc__"] is passed as the 4th argument so that
|
2007-08-26 14:45:23 +08:00
|
|
|
e.g. PyImport_Import(PyUnicode_FromString("win32com.client.gencache"))
|
1998-12-22 03:51:00 +08:00
|
|
|
will return <module "gencache"> instead of <module "win32com">. */
|
1997-08-15 04:11:26 +08:00
|
|
|
|
|
|
|
PyObject *
|
2000-07-23 02:47:25 +08:00
|
|
|
PyImport_Import(PyObject *module_name)
|
1997-08-15 04:11:26 +08:00
|
|
|
{
|
2023-02-16 06:32:31 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
PyObject *globals = NULL;
|
|
|
|
PyObject *import = NULL;
|
|
|
|
PyObject *builtins = NULL;
|
|
|
|
PyObject *r = NULL;
|
|
|
|
|
|
|
|
PyObject *from_list = PyList_New(0);
|
|
|
|
if (from_list == NULL) {
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the builtins from current globals */
|
|
|
|
globals = PyEval_GetGlobals();
|
|
|
|
if (globals != NULL) {
|
|
|
|
Py_INCREF(globals);
|
|
|
|
builtins = PyObject_GetItem(globals, &_Py_ID(__builtins__));
|
|
|
|
if (builtins == NULL)
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* No globals -- use standard builtins, and fake globals */
|
|
|
|
builtins = PyImport_ImportModuleLevel("builtins",
|
|
|
|
NULL, NULL, NULL, 0);
|
|
|
|
if (builtins == NULL) {
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
globals = Py_BuildValue("{OO}", &_Py_ID(__builtins__), builtins);
|
|
|
|
if (globals == NULL)
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the __import__ function from the builtins */
|
|
|
|
if (PyDict_Check(builtins)) {
|
|
|
|
import = PyObject_GetItem(builtins, &_Py_ID(__import__));
|
|
|
|
if (import == NULL) {
|
|
|
|
_PyErr_SetObject(tstate, PyExc_KeyError, &_Py_ID(__import__));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
import = PyObject_GetAttr(builtins, &_Py_ID(__import__));
|
|
|
|
if (import == NULL)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Call the __import__ function with the proper argument list
|
|
|
|
Always use absolute import here.
|
|
|
|
Calling for side-effect of import. */
|
|
|
|
r = PyObject_CallFunction(import, "OOOOi", module_name, globals,
|
|
|
|
globals, from_list, 0, NULL);
|
|
|
|
if (r == NULL)
|
|
|
|
goto err;
|
|
|
|
Py_DECREF(r);
|
|
|
|
|
|
|
|
r = import_get_module(tstate, module_name);
|
|
|
|
if (r == NULL && !_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_SetObject(tstate, PyExc_KeyError, module_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
err:
|
|
|
|
Py_XDECREF(globals);
|
|
|
|
Py_XDECREF(builtins);
|
|
|
|
Py_XDECREF(import);
|
|
|
|
Py_XDECREF(from_list);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*********************/
|
|
|
|
/* runtime lifecycle */
|
|
|
|
/*********************/
|
|
|
|
|
|
|
|
PyStatus
|
|
|
|
_PyImport_Init(void)
|
|
|
|
{
|
|
|
|
if (INITTAB != NULL) {
|
|
|
|
return _PyStatus_ERR("global import state already initialized");
|
|
|
|
}
|
|
|
|
|
|
|
|
PyStatus status = _PyStatus_OK();
|
|
|
|
|
|
|
|
/* Force default raw memory allocator to get a known allocator to be able
|
|
|
|
to release the memory in _PyImport_Fini() */
|
|
|
|
PyMemAllocatorEx old_alloc;
|
|
|
|
_PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
|
|
|
|
|
|
|
|
if (init_builtin_modules_table() != 0) {
|
|
|
|
status = PyStatus_NoMemory();
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_PyImport_Fini(void)
|
|
|
|
{
|
|
|
|
/* Destroy the database used by _PyImport_{Fixup,Find}Extension */
|
2023-07-29 04:39:08 +08:00
|
|
|
// XXX Should we actually leave them (mostly) intact, since we don't
|
|
|
|
// ever dlclose() the module files?
|
2023-02-16 07:05:07 +08:00
|
|
|
_extensions_cache_clear_all();
|
2023-02-16 06:32:31 +08:00
|
|
|
|
|
|
|
/* Use the same memory allocator as _PyImport_Init(). */
|
|
|
|
PyMemAllocatorEx old_alloc;
|
|
|
|
_PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
|
|
|
|
|
|
|
|
/* Free memory allocated by _PyImport_Init() */
|
|
|
|
fini_builtin_modules_table();
|
|
|
|
|
|
|
|
PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_PyImport_Fini2(void)
|
|
|
|
{
|
|
|
|
/* Use the same memory allocator than PyImport_ExtendInittab(). */
|
|
|
|
PyMemAllocatorEx old_alloc;
|
|
|
|
_PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
|
|
|
|
|
|
|
|
// Reset PyImport_Inittab
|
|
|
|
PyImport_Inittab = _PyImport_Inittab;
|
|
|
|
|
|
|
|
/* Free memory allocated by PyImport_ExtendInittab() */
|
|
|
|
PyMem_RawFree(inittab_copy);
|
|
|
|
inittab_copy = NULL;
|
|
|
|
|
|
|
|
PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************/
|
|
|
|
/* interpreter lifecycle */
|
|
|
|
/*************************/
|
|
|
|
|
|
|
|
PyStatus
|
|
|
|
_PyImport_InitCore(PyThreadState *tstate, PyObject *sysmod, int importlib)
|
|
|
|
{
|
|
|
|
// XXX Initialize here: interp->modules and interp->import_func.
|
|
|
|
// XXX Initialize here: sys.modules and sys.meta_path.
|
|
|
|
|
|
|
|
if (importlib) {
|
|
|
|
/* This call sets up builtin and frozen import support */
|
|
|
|
if (init_importlib(tstate, sysmod) < 0) {
|
|
|
|
return _PyStatus_ERR("failed to initialize importlib");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return _PyStatus_OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* In some corner cases it is important to be sure that the import
|
|
|
|
machinery has been initialized (or not cleaned up yet). For
|
|
|
|
example, see issue #4236 and PyModule_Create2(). */
|
|
|
|
|
|
|
|
int
|
|
|
|
_PyImport_IsInitialized(PyInterpreterState *interp)
|
|
|
|
{
|
|
|
|
if (MODULES(interp) == NULL)
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clear the direct per-interpreter import state, if not cleared already. */
|
|
|
|
void
|
|
|
|
_PyImport_ClearCore(PyInterpreterState *interp)
|
|
|
|
{
|
|
|
|
/* interp->modules should have been cleaned up and cleared already
|
|
|
|
by _PyImport_FiniCore(). */
|
|
|
|
Py_CLEAR(MODULES(interp));
|
|
|
|
Py_CLEAR(MODULES_BY_INDEX(interp));
|
|
|
|
Py_CLEAR(IMPORTLIB(interp));
|
|
|
|
Py_CLEAR(IMPORT_FUNC(interp));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_PyImport_FiniCore(PyInterpreterState *interp)
|
|
|
|
{
|
|
|
|
int verbose = _PyInterpreterState_GetConfig(interp)->verbose;
|
|
|
|
|
|
|
|
if (_PySys_ClearAttrString(interp, "meta_path", verbose) < 0) {
|
2023-11-02 17:16:34 +08:00
|
|
|
PyErr_FormatUnraisable("Exception ignored on clearing sys.meta_path");
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// XXX Pull in most of finalize_modules() in pylifecycle.c.
|
|
|
|
|
|
|
|
if (_PySys_ClearAttrString(interp, "modules", verbose) < 0) {
|
2023-11-02 17:16:34 +08:00
|
|
|
PyErr_FormatUnraisable("Exception ignored on clearing sys.modules");
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
_PyImport_ClearCore(interp);
|
|
|
|
}
|
|
|
|
|
|
|
|
// XXX Add something like _PyImport_Disable() for use early in interp fini?
|
|
|
|
|
|
|
|
|
|
|
|
/* "external" imports */
|
|
|
|
|
|
|
|
static int
|
|
|
|
init_zipimport(PyThreadState *tstate, int verbose)
|
|
|
|
{
|
|
|
|
PyObject *path_hooks = PySys_GetObject("path_hooks");
|
|
|
|
if (path_hooks == NULL) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_RuntimeError,
|
|
|
|
"unable to get sys.path_hooks");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (verbose) {
|
|
|
|
PySys_WriteStderr("# installing zipimport hook\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *zipimporter = _PyImport_GetModuleAttrString("zipimport", "zipimporter");
|
|
|
|
if (zipimporter == NULL) {
|
|
|
|
_PyErr_Clear(tstate); /* No zipimporter object -- okay */
|
|
|
|
if (verbose) {
|
|
|
|
PySys_WriteStderr("# can't import zipimport.zipimporter\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* sys.path_hooks.insert(0, zipimporter) */
|
|
|
|
int err = PyList_Insert(path_hooks, 0, zipimporter);
|
|
|
|
Py_DECREF(zipimporter);
|
|
|
|
if (err < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (verbose) {
|
|
|
|
PySys_WriteStderr("# installed zipimport hook\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyStatus
|
|
|
|
_PyImport_InitExternal(PyThreadState *tstate)
|
|
|
|
{
|
|
|
|
int verbose = _PyInterpreterState_GetConfig(tstate->interp)->verbose;
|
|
|
|
|
|
|
|
// XXX Initialize here: sys.path_hooks and sys.path_importer_cache.
|
|
|
|
|
|
|
|
if (init_importlib_external(tstate->interp) != 0) {
|
|
|
|
_PyErr_Print(tstate);
|
|
|
|
return _PyStatus_ERR("external importer setup failed");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (init_zipimport(tstate, verbose) != 0) {
|
|
|
|
PyErr_Print();
|
|
|
|
return _PyStatus_ERR("initializing zipimport failed");
|
|
|
|
}
|
|
|
|
|
|
|
|
return _PyStatus_OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_PyImport_FiniExternal(PyInterpreterState *interp)
|
|
|
|
{
|
|
|
|
int verbose = _PyInterpreterState_GetConfig(interp)->verbose;
|
|
|
|
|
|
|
|
// XXX Uninstall importlib metapath importers here?
|
|
|
|
|
|
|
|
if (_PySys_ClearAttrString(interp, "path_importer_cache", verbose) < 0) {
|
2023-11-02 17:16:34 +08:00
|
|
|
PyErr_FormatUnraisable("Exception ignored on clearing sys.path_importer_cache");
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
if (_PySys_ClearAttrString(interp, "path_hooks", verbose) < 0) {
|
2023-11-02 17:16:34 +08:00
|
|
|
PyErr_FormatUnraisable("Exception ignored on clearing sys.path_hooks");
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/******************/
|
|
|
|
/* module helpers */
|
|
|
|
/******************/
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
_PyImport_GetModuleAttr(PyObject *modname, PyObject *attrname)
|
|
|
|
{
|
|
|
|
PyObject *mod = PyImport_Import(modname);
|
|
|
|
if (mod == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyObject *result = PyObject_GetAttr(mod, attrname);
|
|
|
|
Py_DECREF(mod);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
_PyImport_GetModuleAttrString(const char *modname, const char *attrname)
|
|
|
|
{
|
|
|
|
PyObject *pmodname = PyUnicode_FromString(modname);
|
|
|
|
if (pmodname == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyObject *pattrname = PyUnicode_FromString(attrname);
|
|
|
|
if (pattrname == NULL) {
|
|
|
|
Py_DECREF(pmodname);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyObject *result = _PyImport_GetModuleAttr(pmodname, pattrname);
|
|
|
|
Py_DECREF(pattrname);
|
|
|
|
Py_DECREF(pmodname);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**************/
|
|
|
|
/* the module */
|
|
|
|
/**************/
|
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
_imp.lock_held
|
|
|
|
|
|
|
|
Return True if the import lock is currently held, else False.
|
|
|
|
|
|
|
|
On platforms without threads, return False.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
_imp_lock_held_impl(PyObject *module)
|
|
|
|
/*[clinic end generated code: output=8b89384b5e1963fc input=9b088f9b217d9bdf]*/
|
|
|
|
{
|
2023-03-10 00:46:21 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2024-06-07 01:40:58 +08:00
|
|
|
return PyBool_FromLong(PyMutex_IsLocked(&IMPORT_LOCK(interp).mutex));
|
2023-02-16 06:32:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
_imp.acquire_lock
|
|
|
|
|
|
|
|
Acquires the interpreter's import lock for the current thread.
|
|
|
|
|
|
|
|
This lock should be used by import hooks to ensure thread-safety when importing
|
|
|
|
modules. On platforms without threads, this function does nothing.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
_imp_acquire_lock_impl(PyObject *module)
|
|
|
|
/*[clinic end generated code: output=1aff58cb0ee1b026 input=4a2d4381866d5fdc]*/
|
|
|
|
{
|
2023-03-10 00:46:21 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
_PyImport_AcquireLock(interp);
|
2023-02-16 06:32:31 +08:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
_imp.release_lock
|
|
|
|
|
|
|
|
Release the interpreter's import lock.
|
|
|
|
|
|
|
|
On platforms without threads, this function does nothing.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
_imp_release_lock_impl(PyObject *module)
|
|
|
|
/*[clinic end generated code: output=7faab6d0be178b0a input=934fb11516dd778b]*/
|
|
|
|
{
|
2023-03-10 00:46:21 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2024-06-07 01:40:58 +08:00
|
|
|
if (!_PyRecursiveMutex_IsLockedByCurrentThread(&IMPORT_LOCK(interp))) {
|
2023-02-16 06:32:31 +08:00
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"not holding the import lock");
|
|
|
|
return NULL;
|
|
|
|
}
|
2024-06-07 01:40:58 +08:00
|
|
|
_PyImport_ReleaseLock(interp);
|
2023-02-16 06:32:31 +08:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
_imp._fix_co_filename
|
|
|
|
|
|
|
|
code: object(type="PyCodeObject *", subclass_of="&PyCode_Type")
|
|
|
|
Code object to change.
|
|
|
|
|
|
|
|
path: unicode
|
|
|
|
File path to use.
|
|
|
|
/
|
|
|
|
|
|
|
|
Changes code.co_filename to specify the passed-in file path.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
_imp__fix_co_filename_impl(PyObject *module, PyCodeObject *code,
|
|
|
|
PyObject *path)
|
|
|
|
/*[clinic end generated code: output=1d002f100235587d input=895ba50e78b82f05]*/
|
|
|
|
|
|
|
|
{
|
|
|
|
update_compiled_module(code, path);
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp.create_builtin
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
spec: object
|
|
|
|
/
|
2010-09-20 05:39:02 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
Create an extension module.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
_imp_create_builtin(PyObject *module, PyObject *spec)
|
|
|
|
/*[clinic end generated code: output=ace7ff22271e6f39 input=37f966f890384e47]*/
|
|
|
|
{
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
|
|
|
|
PyObject *name = PyObject_GetAttrString(spec, "name");
|
|
|
|
if (name == NULL) {
|
|
|
|
return NULL;
|
2017-06-16 01:54:38 +08:00
|
|
|
}
|
1997-08-15 04:11:26 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
if (!PyUnicode_Check(name)) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"name must be string, not %.200s",
|
|
|
|
Py_TYPE(name)->tp_name);
|
|
|
|
Py_DECREF(name);
|
|
|
|
return NULL;
|
|
|
|
}
|
Implement PEP 235: Import on Case-Insensitive Platforms.
http://python.sourceforge.net/peps/pep-0235.html
Renamed check_case to case_ok. Substantial code rearrangement to get
this stuff in one place in the file. Innermost loop of find_module()
now much simpler and #ifdef-free, and I want to keep it that way (it's
bad enough that the innermost loop is itself still in an #ifdef!).
Windows semantics tested and are fine.
Jason, Cygwin *should* be fine if and only if what you did before "worked"
for case_ok.
Jack, the semantics on your flavor of Mac have definitely changed (see
the PEP), and need to be tested. The intent is that your flavor of Mac
now work the same as everything else in the "lower left" box, including
respecting PYTHONCASEOK.
Steven, sorry, you did the most work here so far but you got screwed the
worst. Happy to work with you on repairing it, but I don't understand
anything about all your Mac variants. We need to add another branch (or
two, three, ...?) inside case_ok. But we should not need to change
anything else.
2001-02-28 13:34:27 +08:00
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
PyObject *mod = create_builtin(tstate, name, spec);
|
|
|
|
Py_DECREF(name);
|
|
|
|
return mod;
|
1997-08-15 04:11:26 +08:00
|
|
|
}
|
|
|
|
|
2023-02-16 06:32:31 +08:00
|
|
|
|
2014-01-10 08:03:32 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp.extension_suffixes
|
|
|
|
|
|
|
|
Returns the list of file suffixes used to identify extension modules.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
2016-07-07 22:35:15 +08:00
|
|
|
_imp_extension_suffixes_impl(PyObject *module)
|
|
|
|
/*[clinic end generated code: output=0bf346e25a8f0cd3 input=ecdeeecfcb6f839e]*/
|
1995-01-03 03:04:15 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *list;
|
|
|
|
|
|
|
|
list = PyList_New(0);
|
|
|
|
if (list == NULL)
|
|
|
|
return NULL;
|
2012-05-05 03:20:40 +08:00
|
|
|
#ifdef HAVE_DYNAMIC_LOADING
|
2019-03-20 07:37:20 +08:00
|
|
|
const char *suffix;
|
|
|
|
unsigned int index = 0;
|
|
|
|
|
2012-05-05 03:20:40 +08:00
|
|
|
while ((suffix = _PyImport_DynLoadFiletab[index])) {
|
|
|
|
PyObject *item = PyUnicode_FromString(suffix);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (item == NULL) {
|
|
|
|
Py_DECREF(list);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (PyList_Append(list, item) < 0) {
|
|
|
|
Py_DECREF(list);
|
|
|
|
Py_DECREF(item);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
Py_DECREF(item);
|
2012-05-05 03:20:40 +08:00
|
|
|
index += 1;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2012-05-05 03:20:40 +08:00
|
|
|
#endif
|
2010-05-09 23:52:27 +08:00
|
|
|
return list;
|
1990-10-26 22:58:58 +08:00
|
|
|
}
|
1991-02-19 20:23:57 +08:00
|
|
|
|
2014-01-10 08:03:32 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp.init_frozen
|
|
|
|
|
|
|
|
name: unicode
|
|
|
|
/
|
|
|
|
|
|
|
|
Initializes a frozen module.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
2016-07-07 22:35:15 +08:00
|
|
|
_imp_init_frozen_impl(PyObject *module, PyObject *name)
|
|
|
|
/*[clinic end generated code: output=fc0511ed869fd69c input=13019adfc04f3fb3]*/
|
2014-01-10 08:03:32 +08:00
|
|
|
{
|
2019-06-19 08:54:39 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2010-05-09 23:52:27 +08:00
|
|
|
int ret;
|
2014-01-10 08:03:32 +08:00
|
|
|
|
2011-03-20 08:50:21 +08:00
|
|
|
ret = PyImport_ImportFrozenModuleObject(name);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (ret < 0)
|
|
|
|
return NULL;
|
|
|
|
if (ret == 0) {
|
2017-01-23 15:47:21 +08:00
|
|
|
Py_RETURN_NONE;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2021-01-12 22:43:32 +08:00
|
|
|
return import_add_module(tstate, name);
|
1995-01-03 03:04:15 +08:00
|
|
|
}
|
|
|
|
|
2021-10-06 00:01:27 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp.find_frozen
|
|
|
|
|
|
|
|
name: unicode
|
|
|
|
/
|
bpo-21736: Set __file__ on frozen stdlib modules. (gh-28656)
Currently frozen modules do not have __file__ set. In their spec, origin is set to "frozen" and they are marked as not having a location. (Similarly, for frozen packages __path__ is set to an empty list.) However, for frozen stdlib modules we are able to extrapolate __file__ as long as we can determine the stdlib directory at runtime. (We now do so since gh-28586.) Having __file__ set is helpful for a number of reasons. Likewise, having a non-empty __path__ means we can import submodules of a frozen package from the filesystem (e.g. we could partially freeze the encodings module).
This change sets __file__ (and adds to __path__) for frozen stdlib modules. It uses sys._stdlibdir (from gh-28586) and the frozen module alias information (from gh-28655). All that work is done in FrozenImporter (in Lib/importlib/_bootstrap.py).
Also, if a frozen module is imported before importlib is bootstrapped (during interpreter initialization) then we fix up that module and its spec during the importlib bootstrapping step (i.e. imporlib._bootstrap._setup()) to match what gets set by FrozenImporter, including setting the file info (if the stdlib dir is known). To facilitate this, modules imported using PyImport_ImportFrozenModule() have __origname__ set using the frozen module alias info. __origname__ is popped off during importlib bootstrap.
(To be clear, even with this change the new code to set __file__ during fixups in imporlib._bootstrap._setup() doesn't actually get triggered yet. This is because sys._stdlibdir hasn't been set yet in interpreter initialization at the point importlib is bootstrapped. However, we do fix up such modules at that point to otherwise match the result of importing through FrozenImporter, just not the __file__ and __path__ parts. Doing so will require changes in the order in which things happen during interpreter initialization. That can be addressed separately. Once it is, the file-related fixup code from this PR will kick in.)
Here are things this change does not do:
* set __file__ for non-stdlib modules (no way of knowing the parent dir)
* set __file__ if the stdlib dir is not known (nor assume the expense of finding it)
* relatedly, set __file__ if the stdlib is in a zip file
* verify that the filename set to __file__ actually exists (too expensive)
* update __path__ for frozen packages that alias a non-package (since there is no package dir)
Other things this change skips, but we may do later:
* set __file__ on modules imported using PyImport_ImportFrozenModule()
* set co_filename when we unmarshal the frozen code object while importing the module (e.g. in FrozenImporter.exec_module()) -- this would allow tracebacks to show source lines
* implement FrozenImporter.get_filename() and FrozenImporter.get_source()
https://bugs.python.org/issue21736
2021-10-15 05:32:18 +08:00
|
|
|
*
|
|
|
|
withdata: bool = False
|
2021-10-06 00:01:27 +08:00
|
|
|
|
|
|
|
Return info about the corresponding frozen module (if there is one) or None.
|
|
|
|
|
|
|
|
The returned info (a 2-tuple):
|
|
|
|
|
|
|
|
* data the raw marshalled bytes
|
|
|
|
* is_package whether or not it is a package
|
2021-10-06 01:26:37 +08:00
|
|
|
* origname the originally frozen module's name, or None if not
|
|
|
|
a stdlib module (this will usually be the same as
|
|
|
|
the module's current name)
|
2021-10-06 00:01:27 +08:00
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
bpo-21736: Set __file__ on frozen stdlib modules. (gh-28656)
Currently frozen modules do not have __file__ set. In their spec, origin is set to "frozen" and they are marked as not having a location. (Similarly, for frozen packages __path__ is set to an empty list.) However, for frozen stdlib modules we are able to extrapolate __file__ as long as we can determine the stdlib directory at runtime. (We now do so since gh-28586.) Having __file__ set is helpful for a number of reasons. Likewise, having a non-empty __path__ means we can import submodules of a frozen package from the filesystem (e.g. we could partially freeze the encodings module).
This change sets __file__ (and adds to __path__) for frozen stdlib modules. It uses sys._stdlibdir (from gh-28586) and the frozen module alias information (from gh-28655). All that work is done in FrozenImporter (in Lib/importlib/_bootstrap.py).
Also, if a frozen module is imported before importlib is bootstrapped (during interpreter initialization) then we fix up that module and its spec during the importlib bootstrapping step (i.e. imporlib._bootstrap._setup()) to match what gets set by FrozenImporter, including setting the file info (if the stdlib dir is known). To facilitate this, modules imported using PyImport_ImportFrozenModule() have __origname__ set using the frozen module alias info. __origname__ is popped off during importlib bootstrap.
(To be clear, even with this change the new code to set __file__ during fixups in imporlib._bootstrap._setup() doesn't actually get triggered yet. This is because sys._stdlibdir hasn't been set yet in interpreter initialization at the point importlib is bootstrapped. However, we do fix up such modules at that point to otherwise match the result of importing through FrozenImporter, just not the __file__ and __path__ parts. Doing so will require changes in the order in which things happen during interpreter initialization. That can be addressed separately. Once it is, the file-related fixup code from this PR will kick in.)
Here are things this change does not do:
* set __file__ for non-stdlib modules (no way of knowing the parent dir)
* set __file__ if the stdlib dir is not known (nor assume the expense of finding it)
* relatedly, set __file__ if the stdlib is in a zip file
* verify that the filename set to __file__ actually exists (too expensive)
* update __path__ for frozen packages that alias a non-package (since there is no package dir)
Other things this change skips, but we may do later:
* set __file__ on modules imported using PyImport_ImportFrozenModule()
* set co_filename when we unmarshal the frozen code object while importing the module (e.g. in FrozenImporter.exec_module()) -- this would allow tracebacks to show source lines
* implement FrozenImporter.get_filename() and FrozenImporter.get_source()
https://bugs.python.org/issue21736
2021-10-15 05:32:18 +08:00
|
|
|
_imp_find_frozen_impl(PyObject *module, PyObject *name, int withdata)
|
|
|
|
/*[clinic end generated code: output=8c1c3c7f925397a5 input=22a8847c201542fd]*/
|
2021-10-06 00:01:27 +08:00
|
|
|
{
|
|
|
|
struct frozen_info info;
|
|
|
|
frozen_status status = find_frozen(name, &info);
|
|
|
|
if (status == FROZEN_NOT_FOUND || status == FROZEN_DISABLED) {
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
else if (status == FROZEN_BAD_NAME) {
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
else if (status != FROZEN_OKAY) {
|
|
|
|
set_frozen_error(status, name);
|
|
|
|
return NULL;
|
|
|
|
}
|
2021-10-06 01:26:37 +08:00
|
|
|
|
bpo-21736: Set __file__ on frozen stdlib modules. (gh-28656)
Currently frozen modules do not have __file__ set. In their spec, origin is set to "frozen" and they are marked as not having a location. (Similarly, for frozen packages __path__ is set to an empty list.) However, for frozen stdlib modules we are able to extrapolate __file__ as long as we can determine the stdlib directory at runtime. (We now do so since gh-28586.) Having __file__ set is helpful for a number of reasons. Likewise, having a non-empty __path__ means we can import submodules of a frozen package from the filesystem (e.g. we could partially freeze the encodings module).
This change sets __file__ (and adds to __path__) for frozen stdlib modules. It uses sys._stdlibdir (from gh-28586) and the frozen module alias information (from gh-28655). All that work is done in FrozenImporter (in Lib/importlib/_bootstrap.py).
Also, if a frozen module is imported before importlib is bootstrapped (during interpreter initialization) then we fix up that module and its spec during the importlib bootstrapping step (i.e. imporlib._bootstrap._setup()) to match what gets set by FrozenImporter, including setting the file info (if the stdlib dir is known). To facilitate this, modules imported using PyImport_ImportFrozenModule() have __origname__ set using the frozen module alias info. __origname__ is popped off during importlib bootstrap.
(To be clear, even with this change the new code to set __file__ during fixups in imporlib._bootstrap._setup() doesn't actually get triggered yet. This is because sys._stdlibdir hasn't been set yet in interpreter initialization at the point importlib is bootstrapped. However, we do fix up such modules at that point to otherwise match the result of importing through FrozenImporter, just not the __file__ and __path__ parts. Doing so will require changes in the order in which things happen during interpreter initialization. That can be addressed separately. Once it is, the file-related fixup code from this PR will kick in.)
Here are things this change does not do:
* set __file__ for non-stdlib modules (no way of knowing the parent dir)
* set __file__ if the stdlib dir is not known (nor assume the expense of finding it)
* relatedly, set __file__ if the stdlib is in a zip file
* verify that the filename set to __file__ actually exists (too expensive)
* update __path__ for frozen packages that alias a non-package (since there is no package dir)
Other things this change skips, but we may do later:
* set __file__ on modules imported using PyImport_ImportFrozenModule()
* set co_filename when we unmarshal the frozen code object while importing the module (e.g. in FrozenImporter.exec_module()) -- this would allow tracebacks to show source lines
* implement FrozenImporter.get_filename() and FrozenImporter.get_source()
https://bugs.python.org/issue21736
2021-10-15 05:32:18 +08:00
|
|
|
PyObject *data = NULL;
|
|
|
|
if (withdata) {
|
|
|
|
data = PyMemoryView_FromMemory((char *)info.data, info.size, PyBUF_READ);
|
|
|
|
if (data == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2021-10-06 00:01:27 +08:00
|
|
|
}
|
2021-10-06 01:26:37 +08:00
|
|
|
|
|
|
|
PyObject *origname = NULL;
|
|
|
|
if (info.origname != NULL && info.origname[0] != '\0') {
|
|
|
|
origname = PyUnicode_FromString(info.origname);
|
|
|
|
if (origname == NULL) {
|
2024-11-08 18:19:15 +08:00
|
|
|
Py_XDECREF(data);
|
2021-10-06 01:26:37 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
bpo-21736: Set __file__ on frozen stdlib modules. (gh-28656)
Currently frozen modules do not have __file__ set. In their spec, origin is set to "frozen" and they are marked as not having a location. (Similarly, for frozen packages __path__ is set to an empty list.) However, for frozen stdlib modules we are able to extrapolate __file__ as long as we can determine the stdlib directory at runtime. (We now do so since gh-28586.) Having __file__ set is helpful for a number of reasons. Likewise, having a non-empty __path__ means we can import submodules of a frozen package from the filesystem (e.g. we could partially freeze the encodings module).
This change sets __file__ (and adds to __path__) for frozen stdlib modules. It uses sys._stdlibdir (from gh-28586) and the frozen module alias information (from gh-28655). All that work is done in FrozenImporter (in Lib/importlib/_bootstrap.py).
Also, if a frozen module is imported before importlib is bootstrapped (during interpreter initialization) then we fix up that module and its spec during the importlib bootstrapping step (i.e. imporlib._bootstrap._setup()) to match what gets set by FrozenImporter, including setting the file info (if the stdlib dir is known). To facilitate this, modules imported using PyImport_ImportFrozenModule() have __origname__ set using the frozen module alias info. __origname__ is popped off during importlib bootstrap.
(To be clear, even with this change the new code to set __file__ during fixups in imporlib._bootstrap._setup() doesn't actually get triggered yet. This is because sys._stdlibdir hasn't been set yet in interpreter initialization at the point importlib is bootstrapped. However, we do fix up such modules at that point to otherwise match the result of importing through FrozenImporter, just not the __file__ and __path__ parts. Doing so will require changes in the order in which things happen during interpreter initialization. That can be addressed separately. Once it is, the file-related fixup code from this PR will kick in.)
Here are things this change does not do:
* set __file__ for non-stdlib modules (no way of knowing the parent dir)
* set __file__ if the stdlib dir is not known (nor assume the expense of finding it)
* relatedly, set __file__ if the stdlib is in a zip file
* verify that the filename set to __file__ actually exists (too expensive)
* update __path__ for frozen packages that alias a non-package (since there is no package dir)
Other things this change skips, but we may do later:
* set __file__ on modules imported using PyImport_ImportFrozenModule()
* set co_filename when we unmarshal the frozen code object while importing the module (e.g. in FrozenImporter.exec_module()) -- this would allow tracebacks to show source lines
* implement FrozenImporter.get_filename() and FrozenImporter.get_source()
https://bugs.python.org/issue21736
2021-10-15 05:32:18 +08:00
|
|
|
PyObject *result = PyTuple_Pack(3, data ? data : Py_None,
|
2021-10-06 01:26:37 +08:00
|
|
|
info.is_package ? Py_True : Py_False,
|
|
|
|
origname ? origname : Py_None);
|
|
|
|
Py_XDECREF(origname);
|
bpo-21736: Set __file__ on frozen stdlib modules. (gh-28656)
Currently frozen modules do not have __file__ set. In their spec, origin is set to "frozen" and they are marked as not having a location. (Similarly, for frozen packages __path__ is set to an empty list.) However, for frozen stdlib modules we are able to extrapolate __file__ as long as we can determine the stdlib directory at runtime. (We now do so since gh-28586.) Having __file__ set is helpful for a number of reasons. Likewise, having a non-empty __path__ means we can import submodules of a frozen package from the filesystem (e.g. we could partially freeze the encodings module).
This change sets __file__ (and adds to __path__) for frozen stdlib modules. It uses sys._stdlibdir (from gh-28586) and the frozen module alias information (from gh-28655). All that work is done in FrozenImporter (in Lib/importlib/_bootstrap.py).
Also, if a frozen module is imported before importlib is bootstrapped (during interpreter initialization) then we fix up that module and its spec during the importlib bootstrapping step (i.e. imporlib._bootstrap._setup()) to match what gets set by FrozenImporter, including setting the file info (if the stdlib dir is known). To facilitate this, modules imported using PyImport_ImportFrozenModule() have __origname__ set using the frozen module alias info. __origname__ is popped off during importlib bootstrap.
(To be clear, even with this change the new code to set __file__ during fixups in imporlib._bootstrap._setup() doesn't actually get triggered yet. This is because sys._stdlibdir hasn't been set yet in interpreter initialization at the point importlib is bootstrapped. However, we do fix up such modules at that point to otherwise match the result of importing through FrozenImporter, just not the __file__ and __path__ parts. Doing so will require changes in the order in which things happen during interpreter initialization. That can be addressed separately. Once it is, the file-related fixup code from this PR will kick in.)
Here are things this change does not do:
* set __file__ for non-stdlib modules (no way of knowing the parent dir)
* set __file__ if the stdlib dir is not known (nor assume the expense of finding it)
* relatedly, set __file__ if the stdlib is in a zip file
* verify that the filename set to __file__ actually exists (too expensive)
* update __path__ for frozen packages that alias a non-package (since there is no package dir)
Other things this change skips, but we may do later:
* set __file__ on modules imported using PyImport_ImportFrozenModule()
* set co_filename when we unmarshal the frozen code object while importing the module (e.g. in FrozenImporter.exec_module()) -- this would allow tracebacks to show source lines
* implement FrozenImporter.get_filename() and FrozenImporter.get_source()
https://bugs.python.org/issue21736
2021-10-15 05:32:18 +08:00
|
|
|
Py_XDECREF(data);
|
2021-10-06 00:01:27 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2014-01-10 08:03:32 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp.get_frozen_object
|
|
|
|
|
|
|
|
name: unicode
|
2021-10-06 00:01:27 +08:00
|
|
|
data as dataobj: object = None
|
2014-01-10 08:03:32 +08:00
|
|
|
/
|
|
|
|
|
|
|
|
Create a code object for a frozen module.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
2021-10-06 00:01:27 +08:00
|
|
|
_imp_get_frozen_object_impl(PyObject *module, PyObject *name,
|
|
|
|
PyObject *dataobj)
|
|
|
|
/*[clinic end generated code: output=54368a673a35e745 input=034bdb88f6460b7b]*/
|
|
|
|
{
|
bpo-21736: Set __file__ on frozen stdlib modules. (gh-28656)
Currently frozen modules do not have __file__ set. In their spec, origin is set to "frozen" and they are marked as not having a location. (Similarly, for frozen packages __path__ is set to an empty list.) However, for frozen stdlib modules we are able to extrapolate __file__ as long as we can determine the stdlib directory at runtime. (We now do so since gh-28586.) Having __file__ set is helpful for a number of reasons. Likewise, having a non-empty __path__ means we can import submodules of a frozen package from the filesystem (e.g. we could partially freeze the encodings module).
This change sets __file__ (and adds to __path__) for frozen stdlib modules. It uses sys._stdlibdir (from gh-28586) and the frozen module alias information (from gh-28655). All that work is done in FrozenImporter (in Lib/importlib/_bootstrap.py).
Also, if a frozen module is imported before importlib is bootstrapped (during interpreter initialization) then we fix up that module and its spec during the importlib bootstrapping step (i.e. imporlib._bootstrap._setup()) to match what gets set by FrozenImporter, including setting the file info (if the stdlib dir is known). To facilitate this, modules imported using PyImport_ImportFrozenModule() have __origname__ set using the frozen module alias info. __origname__ is popped off during importlib bootstrap.
(To be clear, even with this change the new code to set __file__ during fixups in imporlib._bootstrap._setup() doesn't actually get triggered yet. This is because sys._stdlibdir hasn't been set yet in interpreter initialization at the point importlib is bootstrapped. However, we do fix up such modules at that point to otherwise match the result of importing through FrozenImporter, just not the __file__ and __path__ parts. Doing so will require changes in the order in which things happen during interpreter initialization. That can be addressed separately. Once it is, the file-related fixup code from this PR will kick in.)
Here are things this change does not do:
* set __file__ for non-stdlib modules (no way of knowing the parent dir)
* set __file__ if the stdlib dir is not known (nor assume the expense of finding it)
* relatedly, set __file__ if the stdlib is in a zip file
* verify that the filename set to __file__ actually exists (too expensive)
* update __path__ for frozen packages that alias a non-package (since there is no package dir)
Other things this change skips, but we may do later:
* set __file__ on modules imported using PyImport_ImportFrozenModule()
* set co_filename when we unmarshal the frozen code object while importing the module (e.g. in FrozenImporter.exec_module()) -- this would allow tracebacks to show source lines
* implement FrozenImporter.get_filename() and FrozenImporter.get_source()
https://bugs.python.org/issue21736
2021-10-15 05:32:18 +08:00
|
|
|
struct frozen_info info = {0};
|
|
|
|
Py_buffer buf = {0};
|
|
|
|
if (PyObject_CheckBuffer(dataobj)) {
|
2024-01-29 17:37:06 +08:00
|
|
|
if (PyObject_GetBuffer(dataobj, &buf, PyBUF_SIMPLE) != 0) {
|
2021-10-06 00:01:27 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
bpo-21736: Set __file__ on frozen stdlib modules. (gh-28656)
Currently frozen modules do not have __file__ set. In their spec, origin is set to "frozen" and they are marked as not having a location. (Similarly, for frozen packages __path__ is set to an empty list.) However, for frozen stdlib modules we are able to extrapolate __file__ as long as we can determine the stdlib directory at runtime. (We now do so since gh-28586.) Having __file__ set is helpful for a number of reasons. Likewise, having a non-empty __path__ means we can import submodules of a frozen package from the filesystem (e.g. we could partially freeze the encodings module).
This change sets __file__ (and adds to __path__) for frozen stdlib modules. It uses sys._stdlibdir (from gh-28586) and the frozen module alias information (from gh-28655). All that work is done in FrozenImporter (in Lib/importlib/_bootstrap.py).
Also, if a frozen module is imported before importlib is bootstrapped (during interpreter initialization) then we fix up that module and its spec during the importlib bootstrapping step (i.e. imporlib._bootstrap._setup()) to match what gets set by FrozenImporter, including setting the file info (if the stdlib dir is known). To facilitate this, modules imported using PyImport_ImportFrozenModule() have __origname__ set using the frozen module alias info. __origname__ is popped off during importlib bootstrap.
(To be clear, even with this change the new code to set __file__ during fixups in imporlib._bootstrap._setup() doesn't actually get triggered yet. This is because sys._stdlibdir hasn't been set yet in interpreter initialization at the point importlib is bootstrapped. However, we do fix up such modules at that point to otherwise match the result of importing through FrozenImporter, just not the __file__ and __path__ parts. Doing so will require changes in the order in which things happen during interpreter initialization. That can be addressed separately. Once it is, the file-related fixup code from this PR will kick in.)
Here are things this change does not do:
* set __file__ for non-stdlib modules (no way of knowing the parent dir)
* set __file__ if the stdlib dir is not known (nor assume the expense of finding it)
* relatedly, set __file__ if the stdlib is in a zip file
* verify that the filename set to __file__ actually exists (too expensive)
* update __path__ for frozen packages that alias a non-package (since there is no package dir)
Other things this change skips, but we may do later:
* set __file__ on modules imported using PyImport_ImportFrozenModule()
* set co_filename when we unmarshal the frozen code object while importing the module (e.g. in FrozenImporter.exec_module()) -- this would allow tracebacks to show source lines
* implement FrozenImporter.get_filename() and FrozenImporter.get_source()
https://bugs.python.org/issue21736
2021-10-15 05:32:18 +08:00
|
|
|
info.data = (const char *)buf.buf;
|
|
|
|
info.size = buf.len;
|
2021-10-06 00:01:27 +08:00
|
|
|
}
|
|
|
|
else if (dataobj != Py_None) {
|
|
|
|
_PyArg_BadArgument("get_frozen_object", "argument 2", "bytes", dataobj);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
frozen_status status = find_frozen(name, &info);
|
|
|
|
if (status != FROZEN_OKAY) {
|
|
|
|
set_frozen_error(status, name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
bpo-21736: Set __file__ on frozen stdlib modules. (gh-28656)
Currently frozen modules do not have __file__ set. In their spec, origin is set to "frozen" and they are marked as not having a location. (Similarly, for frozen packages __path__ is set to an empty list.) However, for frozen stdlib modules we are able to extrapolate __file__ as long as we can determine the stdlib directory at runtime. (We now do so since gh-28586.) Having __file__ set is helpful for a number of reasons. Likewise, having a non-empty __path__ means we can import submodules of a frozen package from the filesystem (e.g. we could partially freeze the encodings module).
This change sets __file__ (and adds to __path__) for frozen stdlib modules. It uses sys._stdlibdir (from gh-28586) and the frozen module alias information (from gh-28655). All that work is done in FrozenImporter (in Lib/importlib/_bootstrap.py).
Also, if a frozen module is imported before importlib is bootstrapped (during interpreter initialization) then we fix up that module and its spec during the importlib bootstrapping step (i.e. imporlib._bootstrap._setup()) to match what gets set by FrozenImporter, including setting the file info (if the stdlib dir is known). To facilitate this, modules imported using PyImport_ImportFrozenModule() have __origname__ set using the frozen module alias info. __origname__ is popped off during importlib bootstrap.
(To be clear, even with this change the new code to set __file__ during fixups in imporlib._bootstrap._setup() doesn't actually get triggered yet. This is because sys._stdlibdir hasn't been set yet in interpreter initialization at the point importlib is bootstrapped. However, we do fix up such modules at that point to otherwise match the result of importing through FrozenImporter, just not the __file__ and __path__ parts. Doing so will require changes in the order in which things happen during interpreter initialization. That can be addressed separately. Once it is, the file-related fixup code from this PR will kick in.)
Here are things this change does not do:
* set __file__ for non-stdlib modules (no way of knowing the parent dir)
* set __file__ if the stdlib dir is not known (nor assume the expense of finding it)
* relatedly, set __file__ if the stdlib is in a zip file
* verify that the filename set to __file__ actually exists (too expensive)
* update __path__ for frozen packages that alias a non-package (since there is no package dir)
Other things this change skips, but we may do later:
* set __file__ on modules imported using PyImport_ImportFrozenModule()
* set co_filename when we unmarshal the frozen code object while importing the module (e.g. in FrozenImporter.exec_module()) -- this would allow tracebacks to show source lines
* implement FrozenImporter.get_filename() and FrozenImporter.get_source()
https://bugs.python.org/issue21736
2021-10-15 05:32:18 +08:00
|
|
|
|
|
|
|
if (info.nameobj == NULL) {
|
|
|
|
info.nameobj = name;
|
|
|
|
}
|
2023-09-08 17:34:40 +08:00
|
|
|
if (info.size == 0) {
|
2021-10-30 04:55:14 +08:00
|
|
|
/* Does not contain executable code. */
|
bpo-21736: Set __file__ on frozen stdlib modules. (gh-28656)
Currently frozen modules do not have __file__ set. In their spec, origin is set to "frozen" and they are marked as not having a location. (Similarly, for frozen packages __path__ is set to an empty list.) However, for frozen stdlib modules we are able to extrapolate __file__ as long as we can determine the stdlib directory at runtime. (We now do so since gh-28586.) Having __file__ set is helpful for a number of reasons. Likewise, having a non-empty __path__ means we can import submodules of a frozen package from the filesystem (e.g. we could partially freeze the encodings module).
This change sets __file__ (and adds to __path__) for frozen stdlib modules. It uses sys._stdlibdir (from gh-28586) and the frozen module alias information (from gh-28655). All that work is done in FrozenImporter (in Lib/importlib/_bootstrap.py).
Also, if a frozen module is imported before importlib is bootstrapped (during interpreter initialization) then we fix up that module and its spec during the importlib bootstrapping step (i.e. imporlib._bootstrap._setup()) to match what gets set by FrozenImporter, including setting the file info (if the stdlib dir is known). To facilitate this, modules imported using PyImport_ImportFrozenModule() have __origname__ set using the frozen module alias info. __origname__ is popped off during importlib bootstrap.
(To be clear, even with this change the new code to set __file__ during fixups in imporlib._bootstrap._setup() doesn't actually get triggered yet. This is because sys._stdlibdir hasn't been set yet in interpreter initialization at the point importlib is bootstrapped. However, we do fix up such modules at that point to otherwise match the result of importing through FrozenImporter, just not the __file__ and __path__ parts. Doing so will require changes in the order in which things happen during interpreter initialization. That can be addressed separately. Once it is, the file-related fixup code from this PR will kick in.)
Here are things this change does not do:
* set __file__ for non-stdlib modules (no way of knowing the parent dir)
* set __file__ if the stdlib dir is not known (nor assume the expense of finding it)
* relatedly, set __file__ if the stdlib is in a zip file
* verify that the filename set to __file__ actually exists (too expensive)
* update __path__ for frozen packages that alias a non-package (since there is no package dir)
Other things this change skips, but we may do later:
* set __file__ on modules imported using PyImport_ImportFrozenModule()
* set co_filename when we unmarshal the frozen code object while importing the module (e.g. in FrozenImporter.exec_module()) -- this would allow tracebacks to show source lines
* implement FrozenImporter.get_filename() and FrozenImporter.get_source()
https://bugs.python.org/issue21736
2021-10-15 05:32:18 +08:00
|
|
|
set_frozen_error(FROZEN_INVALID, name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2023-04-25 05:48:05 +08:00
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
PyObject *codeobj = unmarshal_frozen_code(interp, &info);
|
bpo-21736: Set __file__ on frozen stdlib modules. (gh-28656)
Currently frozen modules do not have __file__ set. In their spec, origin is set to "frozen" and they are marked as not having a location. (Similarly, for frozen packages __path__ is set to an empty list.) However, for frozen stdlib modules we are able to extrapolate __file__ as long as we can determine the stdlib directory at runtime. (We now do so since gh-28586.) Having __file__ set is helpful for a number of reasons. Likewise, having a non-empty __path__ means we can import submodules of a frozen package from the filesystem (e.g. we could partially freeze the encodings module).
This change sets __file__ (and adds to __path__) for frozen stdlib modules. It uses sys._stdlibdir (from gh-28586) and the frozen module alias information (from gh-28655). All that work is done in FrozenImporter (in Lib/importlib/_bootstrap.py).
Also, if a frozen module is imported before importlib is bootstrapped (during interpreter initialization) then we fix up that module and its spec during the importlib bootstrapping step (i.e. imporlib._bootstrap._setup()) to match what gets set by FrozenImporter, including setting the file info (if the stdlib dir is known). To facilitate this, modules imported using PyImport_ImportFrozenModule() have __origname__ set using the frozen module alias info. __origname__ is popped off during importlib bootstrap.
(To be clear, even with this change the new code to set __file__ during fixups in imporlib._bootstrap._setup() doesn't actually get triggered yet. This is because sys._stdlibdir hasn't been set yet in interpreter initialization at the point importlib is bootstrapped. However, we do fix up such modules at that point to otherwise match the result of importing through FrozenImporter, just not the __file__ and __path__ parts. Doing so will require changes in the order in which things happen during interpreter initialization. That can be addressed separately. Once it is, the file-related fixup code from this PR will kick in.)
Here are things this change does not do:
* set __file__ for non-stdlib modules (no way of knowing the parent dir)
* set __file__ if the stdlib dir is not known (nor assume the expense of finding it)
* relatedly, set __file__ if the stdlib is in a zip file
* verify that the filename set to __file__ actually exists (too expensive)
* update __path__ for frozen packages that alias a non-package (since there is no package dir)
Other things this change skips, but we may do later:
* set __file__ on modules imported using PyImport_ImportFrozenModule()
* set co_filename when we unmarshal the frozen code object while importing the module (e.g. in FrozenImporter.exec_module()) -- this would allow tracebacks to show source lines
* implement FrozenImporter.get_filename() and FrozenImporter.get_source()
https://bugs.python.org/issue21736
2021-10-15 05:32:18 +08:00
|
|
|
if (dataobj != Py_None) {
|
|
|
|
PyBuffer_Release(&buf);
|
|
|
|
}
|
|
|
|
return codeobj;
|
1995-08-04 12:08:57 +08:00
|
|
|
}
|
|
|
|
|
2014-01-10 08:03:32 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp.is_frozen_package
|
|
|
|
|
|
|
|
name: unicode
|
|
|
|
/
|
|
|
|
|
|
|
|
Returns True if the module name is of a frozen package.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
2016-07-07 22:35:15 +08:00
|
|
|
_imp_is_frozen_package_impl(PyObject *module, PyObject *name)
|
|
|
|
/*[clinic end generated code: output=e70cbdb45784a1c9 input=81b6cdecd080fbb8]*/
|
2014-01-10 08:03:32 +08:00
|
|
|
{
|
2021-10-06 00:01:27 +08:00
|
|
|
struct frozen_info info;
|
|
|
|
frozen_status status = find_frozen(name, &info);
|
|
|
|
if (status != FROZEN_OKAY && status != FROZEN_EXCLUDED) {
|
|
|
|
set_frozen_error(status, name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return PyBool_FromLong(info.is_package);
|
2009-03-15 10:20:16 +08:00
|
|
|
}
|
|
|
|
|
2014-01-10 08:03:32 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp.is_builtin
|
|
|
|
|
|
|
|
name: unicode
|
|
|
|
/
|
|
|
|
|
|
|
|
Returns True if the module name corresponds to a built-in module.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
2016-07-07 22:35:15 +08:00
|
|
|
_imp_is_builtin_impl(PyObject *module, PyObject *name)
|
|
|
|
/*[clinic end generated code: output=3bfd1162e2d3be82 input=86befdac021dd1c7]*/
|
2014-01-10 08:03:32 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyLong_FromLong(is_builtin(name));
|
1991-02-19 20:23:57 +08:00
|
|
|
}
|
1993-04-02 04:59:32 +08:00
|
|
|
|
2014-01-10 08:03:32 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp.is_frozen
|
|
|
|
|
|
|
|
name: unicode
|
|
|
|
/
|
|
|
|
|
|
|
|
Returns True if the module name corresponds to a frozen module.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
2016-07-07 22:35:15 +08:00
|
|
|
_imp_is_frozen_impl(PyObject *module, PyObject *name)
|
|
|
|
/*[clinic end generated code: output=01f408f5ec0f2577 input=7301dbca1897d66b]*/
|
2014-01-10 08:03:32 +08:00
|
|
|
{
|
2021-10-06 00:01:27 +08:00
|
|
|
struct frozen_info info;
|
|
|
|
frozen_status status = find_frozen(name, &info);
|
|
|
|
if (status != FROZEN_OKAY) {
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
}
|
|
|
|
Py_RETURN_TRUE;
|
1995-01-03 03:04:15 +08:00
|
|
|
}
|
|
|
|
|
2021-09-14 06:18:37 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp._frozen_module_names
|
|
|
|
|
|
|
|
Returns the list of available frozen modules.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
_imp__frozen_module_names_impl(PyObject *module)
|
|
|
|
/*[clinic end generated code: output=80609ef6256310a8 input=76237fbfa94460d2]*/
|
|
|
|
{
|
2021-09-15 07:31:45 +08:00
|
|
|
return list_frozen_module_names();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
_imp._override_frozen_modules_for_tests
|
|
|
|
|
|
|
|
override: int
|
|
|
|
/
|
|
|
|
|
|
|
|
(internal-only) Override PyConfig.use_frozen_modules.
|
|
|
|
|
|
|
|
(-1: "off", 1: "on", 0: no override)
|
|
|
|
See frozen_modules() in Lib/test/support/import_helper.py.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
_imp__override_frozen_modules_for_tests_impl(PyObject *module, int override)
|
|
|
|
/*[clinic end generated code: output=36d5cb1594160811 input=8f1f95a3ef21aec3]*/
|
|
|
|
{
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
2023-02-16 06:32:31 +08:00
|
|
|
OVERRIDE_FROZEN_MODULES(interp) = override;
|
2021-09-15 07:31:45 +08:00
|
|
|
Py_RETURN_NONE;
|
2021-09-14 06:18:37 +08:00
|
|
|
}
|
|
|
|
|
2023-02-16 09:16:00 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp._override_multi_interp_extensions_check
|
|
|
|
|
|
|
|
override: int
|
|
|
|
/
|
|
|
|
|
|
|
|
(internal-only) Override PyInterpreterConfig.check_multi_interp_extensions.
|
|
|
|
|
|
|
|
(-1: "never", 1: "always", 0: no override)
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
_imp__override_multi_interp_extensions_check_impl(PyObject *module,
|
|
|
|
int override)
|
|
|
|
/*[clinic end generated code: output=3ff043af52bbf280 input=e086a2ea181f92ae]*/
|
|
|
|
{
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
if (_Py_IsMainInterpreter(interp)) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"_imp._override_multi_interp_extensions_check() "
|
|
|
|
"cannot be used in the main interpreter");
|
|
|
|
return NULL;
|
|
|
|
}
|
2024-04-12 03:00:54 +08:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"_imp._override_multi_interp_extensions_check() "
|
|
|
|
"cannot be used in the free-threaded build");
|
|
|
|
return NULL;
|
|
|
|
#else
|
2023-02-16 09:16:00 +08:00
|
|
|
int oldvalue = OVERRIDE_MULTI_INTERP_EXTENSIONS_CHECK(interp);
|
|
|
|
OVERRIDE_MULTI_INTERP_EXTENSIONS_CHECK(interp) = override;
|
|
|
|
return PyLong_FromLong(oldvalue);
|
2024-04-12 03:00:54 +08:00
|
|
|
#endif
|
2023-02-16 09:16:00 +08:00
|
|
|
}
|
|
|
|
|
1999-12-22 22:09:35 +08:00
|
|
|
#ifdef HAVE_DYNAMIC_LOADING
|
|
|
|
|
2014-01-10 08:03:32 +08:00
|
|
|
/*[clinic input]
|
2015-05-23 20:24:10 +08:00
|
|
|
_imp.create_dynamic
|
2014-01-10 08:03:32 +08:00
|
|
|
|
2015-05-23 20:24:10 +08:00
|
|
|
spec: object
|
2014-01-10 08:03:32 +08:00
|
|
|
file: object = NULL
|
|
|
|
/
|
|
|
|
|
2015-05-23 20:24:10 +08:00
|
|
|
Create an extension module.
|
2014-01-10 08:03:32 +08:00
|
|
|
[clinic start generated code]*/
|
|
|
|
|
1997-04-30 04:08:16 +08:00
|
|
|
static PyObject *
|
2016-07-07 22:35:15 +08:00
|
|
|
_imp_create_dynamic_impl(PyObject *module, PyObject *spec, PyObject *file)
|
|
|
|
/*[clinic end generated code: output=83249b827a4fde77 input=c31b954f4cf4e09d]*/
|
1995-01-03 03:04:15 +08:00
|
|
|
{
|
2024-04-25 01:42:01 +08:00
|
|
|
PyObject *mod = NULL;
|
2024-04-29 23:29:07 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2011-03-15 03:54:07 +08:00
|
|
|
|
2024-04-25 01:42:01 +08:00
|
|
|
struct _Py_ext_module_loader_info info;
|
|
|
|
if (_Py_ext_module_loader_info_init_from_spec(&info, spec) < 0) {
|
2015-05-23 20:24:10 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
struct extensions_cache_value *cached = NULL;
|
|
|
|
mod = import_find_extension(tstate, &info, &cached);
|
2024-04-29 23:29:07 +08:00
|
|
|
if (mod != NULL) {
|
|
|
|
assert(!_PyErr_Occurred(tstate));
|
2024-05-05 05:24:02 +08:00
|
|
|
assert(cached != NULL);
|
|
|
|
/* The module might not have md_def set in certain reload cases. */
|
|
|
|
assert(_PyModule_GetDef(mod) == NULL
|
|
|
|
|| cached->def == _PyModule_GetDef(mod));
|
|
|
|
assert_singlephase(cached);
|
2023-02-16 09:16:00 +08:00
|
|
|
goto finally;
|
2015-05-23 20:24:10 +08:00
|
|
|
}
|
2024-04-29 23:29:07 +08:00
|
|
|
else if (_PyErr_Occurred(tstate)) {
|
|
|
|
goto finally;
|
|
|
|
}
|
|
|
|
/* Otherwise it must be multi-phase init or the first time it's loaded. */
|
2015-05-23 20:24:10 +08:00
|
|
|
|
2024-05-05 05:24:02 +08:00
|
|
|
/* If the module was added to the global cache
|
|
|
|
* but def->m_base.m_copy was cleared (e.g. subinterp fini)
|
|
|
|
* then we have to do a little dance here. */
|
|
|
|
if (cached != NULL) {
|
|
|
|
assert(cached->def->m_base.m_copy == NULL);
|
|
|
|
/* For now we clear the cache and move on. */
|
|
|
|
_extensions_cache_delete(info.path, info.name);
|
|
|
|
}
|
|
|
|
|
2024-04-25 01:42:01 +08:00
|
|
|
if (PySys_Audit("import", "OOOOO", info.name, info.filename,
|
2024-04-23 22:25:50 +08:00
|
|
|
Py_None, Py_None, Py_None) < 0)
|
|
|
|
{
|
|
|
|
goto finally;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We would move this (and the fclose() below) into
|
|
|
|
* _PyImport_GetModInitFunc(), but it isn't clear if the intervening
|
|
|
|
* code relies on fp still being open. */
|
2024-04-29 23:29:07 +08:00
|
|
|
FILE *fp;
|
2014-01-10 08:03:32 +08:00
|
|
|
if (file != NULL) {
|
2024-04-25 01:42:01 +08:00
|
|
|
fp = _Py_fopen_obj(info.filename, "r");
|
2011-03-22 17:46:35 +08:00
|
|
|
if (fp == NULL) {
|
2023-02-16 09:16:00 +08:00
|
|
|
goto finally;
|
2011-03-22 17:46:35 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2024-04-23 22:25:50 +08:00
|
|
|
else {
|
2011-03-15 03:54:07 +08:00
|
|
|
fp = NULL;
|
2024-04-23 22:25:50 +08:00
|
|
|
}
|
2015-05-23 20:24:10 +08:00
|
|
|
|
2024-04-29 23:29:07 +08:00
|
|
|
PyModInitFunction p0 = _PyImport_GetModInitFunc(&info, fp);
|
|
|
|
if (p0 == NULL) {
|
|
|
|
goto finally;
|
|
|
|
}
|
|
|
|
|
2024-05-07 11:07:23 +08:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
// This call (and the corresponding call to _PyImport_CheckGILForModule())
|
|
|
|
// would ideally be inside import_run_extension(). They are kept in the
|
|
|
|
// callers for now because that would complicate the control flow inside
|
|
|
|
// import_run_extension(). It should be possible to restructure
|
|
|
|
// import_run_extension() to address this.
|
|
|
|
_PyEval_EnableGILTransient(tstate);
|
|
|
|
#endif
|
2024-04-30 02:53:04 +08:00
|
|
|
mod = import_run_extension(
|
|
|
|
tstate, p0, &info, spec, get_modules_dict(tstate, true));
|
2024-05-07 11:07:23 +08:00
|
|
|
#ifdef Py_GIL_DISABLED
|
|
|
|
if (_PyImport_CheckGILForModule(mod, info.name) < 0) {
|
|
|
|
Py_CLEAR(mod);
|
|
|
|
goto finally;
|
2024-04-29 23:29:07 +08:00
|
|
|
}
|
2024-05-07 11:07:23 +08:00
|
|
|
#endif
|
2015-05-23 20:24:10 +08:00
|
|
|
|
2024-04-30 02:53:04 +08:00
|
|
|
// XXX Shouldn't this happen in the error cases too (i.e. in "finally")?
|
2024-04-23 22:25:50 +08:00
|
|
|
if (fp) {
|
2010-05-09 23:52:27 +08:00
|
|
|
fclose(fp);
|
2024-04-23 22:25:50 +08:00
|
|
|
}
|
2023-02-16 09:16:00 +08:00
|
|
|
|
|
|
|
finally:
|
2024-04-25 01:42:01 +08:00
|
|
|
_Py_ext_module_loader_info_clear(&info);
|
2011-03-15 03:54:07 +08:00
|
|
|
return mod;
|
1995-01-03 03:04:15 +08:00
|
|
|
}
|
1994-08-29 20:54:38 +08:00
|
|
|
|
2015-05-23 20:24:10 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp.exec_dynamic -> int
|
|
|
|
|
|
|
|
mod: object
|
|
|
|
/
|
|
|
|
|
|
|
|
Initialize an extension module.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static int
|
2016-07-07 22:35:15 +08:00
|
|
|
_imp_exec_dynamic_impl(PyObject *module, PyObject *mod)
|
|
|
|
/*[clinic end generated code: output=f5720ac7b465877d input=9fdbfcb250280d3a]*/
|
2015-05-23 20:24:10 +08:00
|
|
|
{
|
2015-08-25 10:53:56 +08:00
|
|
|
return exec_builtin_or_dynamic(mod);
|
2015-05-23 20:24:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-12-22 22:09:35 +08:00
|
|
|
#endif /* HAVE_DYNAMIC_LOADING */
|
|
|
|
|
2015-08-25 10:53:56 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp.exec_builtin -> int
|
|
|
|
|
|
|
|
mod: object
|
|
|
|
/
|
|
|
|
|
|
|
|
Initialize a built-in module.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static int
|
2016-07-07 22:35:15 +08:00
|
|
|
_imp_exec_builtin_impl(PyObject *module, PyObject *mod)
|
|
|
|
/*[clinic end generated code: output=0262447b240c038e input=7beed5a2f12a60ca]*/
|
2015-08-25 10:53:56 +08:00
|
|
|
{
|
|
|
|
return exec_builtin_or_dynamic(mod);
|
|
|
|
}
|
|
|
|
|
2017-12-10 02:26:52 +08:00
|
|
|
/*[clinic input]
|
|
|
|
_imp.source_hash
|
|
|
|
|
|
|
|
key: long
|
|
|
|
source: Py_buffer
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
_imp_source_hash_impl(PyObject *module, long key, Py_buffer *source)
|
|
|
|
/*[clinic end generated code: output=edb292448cf399ea input=9aaad1e590089789]*/
|
|
|
|
{
|
2017-12-10 04:18:56 +08:00
|
|
|
union {
|
|
|
|
uint64_t x;
|
|
|
|
char data[sizeof(uint64_t)];
|
|
|
|
} hash;
|
|
|
|
hash.x = _Py_KeyedHash((uint64_t)key, source->buf, source->len);
|
2017-12-10 02:26:52 +08:00
|
|
|
#if !PY_LITTLE_ENDIAN
|
|
|
|
// Force to little-endian. There really ought to be a succinct standard way
|
|
|
|
// to do this.
|
2017-12-10 04:18:56 +08:00
|
|
|
for (size_t i = 0; i < sizeof(hash.data)/2; i++) {
|
|
|
|
char tmp = hash.data[i];
|
|
|
|
hash.data[i] = hash.data[sizeof(hash.data) - i - 1];
|
|
|
|
hash.data[sizeof(hash.data) - i - 1] = tmp;
|
2017-12-10 02:26:52 +08:00
|
|
|
}
|
|
|
|
#endif
|
2017-12-10 04:18:56 +08:00
|
|
|
return PyBytes_FromStringAndSize(hash.data, sizeof(hash.data));
|
2017-12-10 02:26:52 +08:00
|
|
|
}
|
|
|
|
|
2010-04-17 08:19:56 +08:00
|
|
|
|
2002-06-14 04:33:02 +08:00
|
|
|
PyDoc_STRVAR(doc_imp,
|
2023-04-29 07:17:58 +08:00
|
|
|
"(Extremely) low-level import machinery bits as used by importlib.");
|
1997-09-10 06:04:42 +08:00
|
|
|
|
1997-04-30 04:08:16 +08:00
|
|
|
static PyMethodDef imp_methods[] = {
|
2014-01-10 08:03:32 +08:00
|
|
|
_IMP_EXTENSION_SUFFIXES_METHODDEF
|
|
|
|
_IMP_LOCK_HELD_METHODDEF
|
|
|
|
_IMP_ACQUIRE_LOCK_METHODDEF
|
|
|
|
_IMP_RELEASE_LOCK_METHODDEF
|
2021-10-06 00:01:27 +08:00
|
|
|
_IMP_FIND_FROZEN_METHODDEF
|
2014-01-10 08:03:32 +08:00
|
|
|
_IMP_GET_FROZEN_OBJECT_METHODDEF
|
|
|
|
_IMP_IS_FROZEN_PACKAGE_METHODDEF
|
2015-05-23 20:24:10 +08:00
|
|
|
_IMP_CREATE_BUILTIN_METHODDEF
|
2014-01-10 08:03:32 +08:00
|
|
|
_IMP_INIT_FROZEN_METHODDEF
|
|
|
|
_IMP_IS_BUILTIN_METHODDEF
|
|
|
|
_IMP_IS_FROZEN_METHODDEF
|
2021-09-14 06:18:37 +08:00
|
|
|
_IMP__FROZEN_MODULE_NAMES_METHODDEF
|
2021-09-15 07:31:45 +08:00
|
|
|
_IMP__OVERRIDE_FROZEN_MODULES_FOR_TESTS_METHODDEF
|
2023-02-16 09:16:00 +08:00
|
|
|
_IMP__OVERRIDE_MULTI_INTERP_EXTENSIONS_CHECK_METHODDEF
|
2015-05-23 20:24:10 +08:00
|
|
|
_IMP_CREATE_DYNAMIC_METHODDEF
|
|
|
|
_IMP_EXEC_DYNAMIC_METHODDEF
|
2015-08-25 10:53:56 +08:00
|
|
|
_IMP_EXEC_BUILTIN_METHODDEF
|
2014-01-10 08:03:32 +08:00
|
|
|
_IMP__FIX_CO_FILENAME_METHODDEF
|
2017-12-10 02:26:52 +08:00
|
|
|
_IMP_SOURCE_HASH_METHODDEF
|
2014-01-10 08:03:32 +08:00
|
|
|
{NULL, NULL} /* sentinel */
|
1995-01-03 03:04:15 +08:00
|
|
|
};
|
1994-08-29 20:54:38 +08:00
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 15:33:22 +08:00
|
|
|
|
2020-11-19 06:18:29 +08:00
|
|
|
static int
|
|
|
|
imp_module_exec(PyObject *module)
|
|
|
|
{
|
|
|
|
const wchar_t *mode = _Py_GetConfig()->check_hash_pycs_mode;
|
|
|
|
PyObject *pyc_mode = PyUnicode_FromWideChar(mode, -1);
|
2023-07-19 04:59:53 +08:00
|
|
|
if (PyModule_Add(module, "check_hash_based_pycs", pyc_mode) < 0) {
|
2020-11-19 06:18:29 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2024-07-31 03:31:05 +08:00
|
|
|
if (PyModule_AddIntConstant(
|
|
|
|
module, "pyc_magic_number_token", PYC_MAGIC_NUMBER_TOKEN) < 0)
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2020-11-19 06:18:29 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static PyModuleDef_Slot imp_slots[] = {
|
|
|
|
{Py_mod_exec, imp_module_exec},
|
2023-05-06 05:11:27 +08:00
|
|
|
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
|
2024-05-03 23:30:55 +08:00
|
|
|
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
|
2020-11-19 06:18:29 +08:00
|
|
|
{0, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct PyModuleDef imp_module = {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyModuleDef_HEAD_INIT,
|
2020-11-19 06:18:29 +08:00
|
|
|
.m_name = "_imp",
|
|
|
|
.m_doc = doc_imp,
|
|
|
|
.m_size = 0,
|
|
|
|
.m_methods = imp_methods,
|
|
|
|
.m_slots = imp_slots,
|
2008-06-11 13:26:20 +08: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 22:57:12 +08:00
|
|
|
|
2003-09-04 19:59:50 +08:00
|
|
|
PyMODINIT_FUNC
|
2018-01-30 03:33:57 +08:00
|
|
|
PyInit__imp(void)
|
1995-01-03 03:04:15 +08:00
|
|
|
{
|
2020-11-19 06:18:29 +08:00
|
|
|
return PyModuleDef_Init(&imp_module);
|
|
|
|
}
|