traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #13959: Move module type constants to Lib/imp.py.

This commit is contained in:
Brett Cannon 2012-05-04 16:13:30 -04:00
parent 2d3ce9de4f
commit 0429e1a57d
2 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Python/import.c
View File

@ -2091,17 +2091,6 @@ static PyMethodDef imp_methods[] = {
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
static int
setint(PyObject *d, char *name, int value)
{
PyObject *v;
int err;
v = PyLong_FromLong((long)value);
err = PyDict_SetItemString(d, name, v);
Py_XDECREF(v);
return err;
}
static struct PyModuleDef impmodule = { static struct PyModuleDef impmodule = {
PyModuleDef_HEAD_INIT, PyModuleDef_HEAD_INIT,
@ -2127,17 +2116,6 @@ PyInit_imp(void)
if (d == NULL) if (d == NULL)
goto failure; goto failure;
if (setint(d, "SEARCH_ERROR", SEARCH_ERROR) < 0) goto failure;
if (setint(d, "PY_SOURCE", PY_SOURCE) < 0) goto failure;
if (setint(d, "PY_COMPILED", PY_COMPILED) < 0) goto failure;
if (setint(d, "C_EXTENSION", C_EXTENSION) < 0) goto failure;
if (setint(d, "PY_RESOURCE", PY_RESOURCE) < 0) goto failure;
if (setint(d, "PKG_DIRECTORY", PKG_DIRECTORY) < 0) goto failure;
if (setint(d, "C_BUILTIN", C_BUILTIN) < 0) goto failure;
if (setint(d, "PY_FROZEN", PY_FROZEN) < 0) goto failure;
if (setint(d, "PY_CODERESOURCE", PY_CODERESOURCE) < 0) goto failure;
if (setint(d, "IMP_HOOK", IMP_HOOK) < 0) goto failure;
return m; return m;
failure: failure:
Py_XDECREF(m); Py_XDECREF(m);

15
Python/importdl.h
View File

@ -6,21 +6,6 @@ extern "C" {
#endif #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 const char *_PyImport_DynLoadFiletab[];
extern PyObject *_PyImport_LoadDynamicModule(PyObject *name, PyObject *pathname, extern PyObject *_PyImport_LoadDynamicModule(PyObject *name, PyObject *pathname,