From 7c1cd6d18d5ac37ec86183e7fabcf35ff11e3d21 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 14 Mar 2011 15:54:07 -0400 Subject: Issue #3080: _PyImport_LoadDynamicModule() uses Unicode for name and path Document also that dynamic module names are ASCII only --- Python/importdl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Python/importdl.h') diff --git a/Python/importdl.h b/Python/importdl.h index b4d21be6f0..e51e551ff9 100644 --- a/Python/importdl.h +++ b/Python/importdl.h @@ -28,7 +28,7 @@ struct filedescr { extern struct filedescr * _PyImport_Filetab; extern const struct filedescr _PyImport_DynLoadFiletab[]; -extern PyObject *_PyImport_LoadDynamicModule(char *name, char *pathname, +extern PyObject *_PyImport_LoadDynamicModule(PyObject *name, PyObject *pathname, FILE *); /* Max length of module suffix searched for -- accommodates "module.slb" */ -- cgit v1.2.1 From f9e12fdf7205afea929ddb2b8f6e950721c831bf Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 4 May 2012 15:20:40 -0400 Subject: Issue #13959: Re-implement imp.get_suffixes() in Lib/imp.py. This introduces a new function, imp.extension_suffixes(), which is currently undocumented. That is forthcoming once issue #14657 is resolved and how to expose file suffixes is decided. --- Python/importdl.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Python/importdl.h') diff --git a/Python/importdl.h b/Python/importdl.h index e51e551ff9..32c6b5bb7f 100644 --- a/Python/importdl.h +++ b/Python/importdl.h @@ -20,13 +20,8 @@ enum filetype { IMP_HOOK }; -struct filedescr { - char *suffix; - char *mode; - enum filetype type; -}; -extern struct filedescr * _PyImport_Filetab; -extern const struct filedescr _PyImport_DynLoadFiletab[]; + +extern const char *_PyImport_DynLoadFiletab[]; extern PyObject *_PyImport_LoadDynamicModule(PyObject *name, PyObject *pathname, FILE *); -- cgit v1.2.1 From a05192072f95ad8e5fc8b3ecc3717f71902ee208 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 4 May 2012 16:13:30 -0400 Subject: Issue #13959: Move module type constants to Lib/imp.py. --- Python/importdl.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'Python/importdl.h') diff --git a/Python/importdl.h b/Python/importdl.h index 32c6b5bb7f..6b9cf750a4 100644 --- a/Python/importdl.h +++ b/Python/importdl.h @@ -6,21 +6,6 @@ extern "C" { #endif -/* Definitions for dynamic loading of extension modules */ -enum filetype { - SEARCH_ERROR, - PY_SOURCE, - PY_COMPILED, - C_EXTENSION, - PY_RESOURCE, /* Mac only */ - PKG_DIRECTORY, - C_BUILTIN, - PY_FROZEN, - PY_CODERESOURCE, /* Mac only */ - IMP_HOOK -}; - - extern const char *_PyImport_DynLoadFiletab[]; extern PyObject *_PyImport_LoadDynamicModule(PyObject *name, PyObject *pathname, -- cgit v1.2.1