cpython-lru_cache-weakref: Objects/moduleobject.c annotate

annotate Objects/moduleobject.c @ 87690:66c1c9f32567 default tip

Add use_weakref option to functools.lru_cache The use_weakref option makes lru_cache create weak references to the function arguments when creating the cache key, which prevents them from staying in the memory forever even after all other references to them are gone. This is a proof of concept for http://bugs.python.org/issue19859

author	Radomir Dopieralski <devel@sheep.art.pl>
date	Tue, 03 Dec 2013 16:02:48 +0100
parents	07229c6104b1
children

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 95 diff changeset	1
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Module object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	4 #include "Python.h"
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17811 diff changeset	5 #include "structmember.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	7 static Py_ssize_t max_module_number;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	8
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	9 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	10 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	11 PyObject *md_dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	12 struct PyModuleDef *md_def;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	13 void *md_state;
84936 79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	14 PyObject *md_weaklist;
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	15 PyObject md_name; / for logging purposes after md_dict is cleared */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	16 } PyModuleObject;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	17
20595 c4d9d8674506 Add missing "static" declarations (found by "make smelly"). Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20277 diff changeset	18 static PyMemberDef module_members[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	19 {"__dict__", T_OBJECT, offsetof(PyModuleObject, md_dict), READONLY},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	20 {0}
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17811 diff changeset	21 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17811 diff changeset	22
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	23 static PyTypeObject moduledef_type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	24 PyVarObject_HEAD_INIT(&PyType_Type, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	25 "moduledef", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	26 sizeof(struct PyModuleDef), /* tp_size */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	27 0, /* tp_itemsize */
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	28 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	29
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	30
83607 e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	31 static int
84936 79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	32 module_init_dict(PyModuleObject mod, PyObject md_dict,
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	33 PyObject name, PyObject doc)
83607 e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	34 {
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	35 if (md_dict == NULL)
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	36 return -1;
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	37 if (doc == NULL)
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	38 doc = Py_None;
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	39
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	40 if (PyDict_SetItemString(md_dict, "__name__", name) != 0)
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	41 return -1;
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	42 if (PyDict_SetItemString(md_dict, "__doc__", doc) != 0)
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	43 return -1;
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	44 if (PyDict_SetItemString(md_dict, "__package__", Py_None) != 0)
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	45 return -1;
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	46 if (PyDict_SetItemString(md_dict, "__loader__", Py_None) != 0)
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	47 return -1;
87347 07229c6104b1 Implement PEP 451 (ModuleSpec). Eric Snow <ericsnowcurrently@gmail.com> parents: 84936 diff changeset	48 if (PyDict_SetItemString(md_dict, "__spec__", Py_None) != 0)
07229c6104b1 Implement PEP 451 (ModuleSpec). Eric Snow <ericsnowcurrently@gmail.com> parents: 84936 diff changeset	49 return -1;
84936 79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	50 if (PyUnicode_CheckExact(name)) {
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	51 Py_INCREF(name);
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	52 Py_XDECREF(mod->md_name);
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	53 mod->md_name = name;
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	54 }
83607 e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	55
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	56 return 0;
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	57 }
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	58
e39a8f8ceb9f #17115,17116: Have modules initialize the __package__ and __loader__ Brett Cannon <brett@python.org> parents: 78179 diff changeset	59
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	60 PyObject *
68228 50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	61 PyModule_NewObject(PyObject *name)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	62 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	63 PyModuleObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	64 m = PyObject_GC_New(PyModuleObject, &PyModule_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	65 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	66 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	67 m->md_def = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	68 m->md_state = NULL;
84936 79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	69 m->md_weaklist = NULL;
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	70 m->md_name = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	71 m->md_dict = PyDict_New();
84936 79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	72 if (module_init_dict(m, m->md_dict, name, NULL) != 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	73 goto fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	74 PyObject_GC_Track(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	75 return (PyObject *)m;
1410 315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1293 diff changeset	76
315272ec4d5b * import.c (get_module): total rewrite, to ensure proper search order: for Guido van Rossum <guido@python.org> parents: 1293 diff changeset	77 fail:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	78 Py_DECREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	79 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	80 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	81
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	82 PyObject *
68228 50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	83 PyModule_New(const char *name)
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	84 {
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	85 PyObject nameobj, module;
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	86 nameobj = PyUnicode_FromString(name);
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	87 if (nameobj == NULL)
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	88 return NULL;
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	89 module = PyModule_NewObject(nameobj);
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	90 Py_DECREF(nameobj);
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	91 return module;
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	92 }
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	93
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	94
50b38e4b0231 Issue #3080: Add PyModule_NewObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 68111 diff changeset	95 PyObject *
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	96 PyModule_Create2(struct PyModuleDef* module, int module_api_version)
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	97 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	98 PyObject d, v, *n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	99 PyMethodDef *ml;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	100 const char* name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	101 PyModuleObject *m;
66911 7c3715b10cdd Merged revisions 87251 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 65233 diff changeset	102 PyInterpreterState *interp = PyThreadState_Get()->interp;
7c3715b10cdd Merged revisions 87251 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 65233 diff changeset	103 if (interp->modules == NULL)
7c3715b10cdd Merged revisions 87251 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 65233 diff changeset	104 Py_FatalError("Python import machinery not initialized");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	105 if (PyType_Ready(&moduledef_type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	106 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	107 if (module->m_base.m_index == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	108 max_module_number++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	109 Py_REFCNT(module) = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	110 Py_TYPE(module) = &moduledef_type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	111 module->m_base.m_index = max_module_number;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	112 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	113 name = module->m_name;
66664 62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 65231 diff changeset	114 if (module_api_version != PYTHON_API_VERSION && module_api_version != PYTHON_ABI_VERSION) {
63949 fa2d9720a66c Issue #9425: Create PyErr_WarnFormat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 61711 diff changeset	115 int err;
fa2d9720a66c Issue #9425: Create PyErr_WarnFormat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 61711 diff changeset	116 err = PyErr_WarnFormat(PyExc_RuntimeWarning, 1,
fa2d9720a66c Issue #9425: Create PyErr_WarnFormat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 61711 diff changeset	117 "Python C API version mismatch for module %.100s: "
fa2d9720a66c Issue #9425: Create PyErr_WarnFormat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 61711 diff changeset	118 "This Python has API version %d, module %.100s has version %d.",
fa2d9720a66c Issue #9425: Create PyErr_WarnFormat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 61711 diff changeset	119 name,
fa2d9720a66c Issue #9425: Create PyErr_WarnFormat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 61711 diff changeset	120 PYTHON_API_VERSION, name, module_api_version);
fa2d9720a66c Issue #9425: Create PyErr_WarnFormat() function Victor Stinner <victor.stinner@haypocalc.com> parents: 61711 diff changeset	121 if (err)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	122 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	123 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	124 /* Make sure name is fully qualified.
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	125
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	126 This is a bit of a hack: when the shared library is loaded,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	127 the module name is "package.module", but the module calls
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	128 PyModule_Create*() with just "module" for the name. The shared
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	129 library loader squirrels away the true name of the module in
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	130 _Py_PackageContext, and PyModule_Create*() will substitute this
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	131 (if the name actually matches).
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	132 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	133 if (_Py_PackageContext != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	134 char *p = strrchr(_Py_PackageContext, '.');
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	135 if (p != NULL && strcmp(module->m_name, p+1) == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	136 name = _Py_PackageContext;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	137 _Py_PackageContext = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	138 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	139 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	140 if ((m = (PyModuleObject*)PyModule_New(name)) == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	141 return NULL;
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	142
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	143 if (module->m_size > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	144 m->md_state = PyMem_MALLOC(module->m_size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	145 if (!m->md_state) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	146 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	147 Py_DECREF(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	148 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	149 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	150 memset(m->md_state, 0, module->m_size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	151 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	152
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	153 d = PyModule_GetDict((PyObject*)m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	154 if (module->m_methods != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	155 n = PyUnicode_FromString(name);
78178 7140d97d36fd Issue #15394: Fix ref leaks in PyModule_Create. Meador Inge <meadori@gmail.com> parents: 68257 diff changeset	156 if (n == NULL) {
7140d97d36fd Issue #15394: Fix ref leaks in PyModule_Create. Meador Inge <meadori@gmail.com> parents: 68257 diff changeset	157 Py_DECREF(m);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	158 return NULL;
78178 7140d97d36fd Issue #15394: Fix ref leaks in PyModule_Create. Meador Inge <meadori@gmail.com> parents: 68257 diff changeset	159 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	160 for (ml = module->m_methods; ml->ml_name != NULL; ml++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	161 if ((ml->ml_flags & METH_CLASS) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	162 (ml->ml_flags & METH_STATIC)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	163 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	164 "module functions cannot set"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	165 " METH_CLASS or METH_STATIC");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	166 Py_DECREF(n);
78178 7140d97d36fd Issue #15394: Fix ref leaks in PyModule_Create. Meador Inge <meadori@gmail.com> parents: 68257 diff changeset	167 Py_DECREF(m);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	168 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	169 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	170 v = PyCFunction_NewEx(ml, (PyObject*)m, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	171 if (v == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	172 Py_DECREF(n);
78178 7140d97d36fd Issue #15394: Fix ref leaks in PyModule_Create. Meador Inge <meadori@gmail.com> parents: 68257 diff changeset	173 Py_DECREF(m);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	174 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	175 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	176 if (PyDict_SetItemString(d, ml->ml_name, v) != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	177 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	178 Py_DECREF(n);
78178 7140d97d36fd Issue #15394: Fix ref leaks in PyModule_Create. Meador Inge <meadori@gmail.com> parents: 68257 diff changeset	179 Py_DECREF(m);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	180 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	181 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	182 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	183 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	184 Py_DECREF(n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	185 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	186 if (module->m_doc != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	187 v = PyUnicode_FromString(module->m_doc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	188 if (v == NULL \|\| PyDict_SetItemString(d, "__doc__", v) != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	189 Py_XDECREF(v);
78178 7140d97d36fd Issue #15394: Fix ref leaks in PyModule_Create. Meador Inge <meadori@gmail.com> parents: 68257 diff changeset	190 Py_DECREF(m);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	191 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	192 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	193 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	194 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	195 m->md_def = module;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	196 return (PyObject*)m;
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	197 }
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	198
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	199
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	200 PyObject *
13457 ef2ebb3b0c64 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	201 PyModule_GetDict(PyObject *m)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	202 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	203 PyObject *d;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	204 if (!PyModule_Check(m)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	205 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	206 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	207 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	208 d = ((PyModuleObject *)m) -> md_dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	209 if (d == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	210 ((PyModuleObject *)m) -> md_dict = d = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	211 return d;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	212 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	213
68111 f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	214 PyObject*
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	215 PyModule_GetNameObject(PyObject *m)
43 ea21982a1532 Added getmodulename() public interface. Guido van Rossum <guido@python.org> parents: 25 diff changeset	216 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	217 PyObject *d;
68111 f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	218 PyObject *name;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	219 if (!PyModule_Check(m)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	220 PyErr_BadArgument();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	221 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	222 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	223 d = ((PyModuleObject *)m)->md_dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	224 if (d == NULL \|\|
68111 f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	225 (name = PyDict_GetItemString(d, "__name__")) == NULL \|\|
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	226 !PyUnicode_Check(name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	227 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	228 PyErr_SetString(PyExc_SystemError, "nameless module");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	229 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	230 }
68111 f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	231 Py_INCREF(name);
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	232 return name;
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	233 }
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	234
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	235 const char *
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	236 PyModule_GetName(PyObject *m)
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	237 {
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	238 PyObject *name = PyModule_GetNameObject(m);
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	239 if (name == NULL)
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	240 return NULL;
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	241 Py_DECREF(name); /* module dict has still a reference */
f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	242 return _PyUnicode_AsString(name);
43 ea21982a1532 Added getmodulename() public interface. Guido van Rossum <guido@python.org> parents: 25 diff changeset	243 }
ea21982a1532 Added getmodulename() public interface. Guido van Rossum <guido@python.org> parents: 25 diff changeset	244
64138 ee765a67c0b1 Issue #9425: Create PyModule_GetFilenameObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63949 diff changeset	245 PyObject*
ee765a67c0b1 Issue #9425: Create PyModule_GetFilenameObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63949 diff changeset	246 PyModule_GetFilenameObject(PyObject *m)
10161 5c1ebf23f1d7 Patch by Chris Petrilli to display the origin of a module in its Guido van Rossum <guido@python.org> parents: 9329 diff changeset	247 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	248 PyObject *d;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	249 PyObject *fileobj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	250 if (!PyModule_Check(m)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	251 PyErr_BadArgument();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	252 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	253 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	254 d = ((PyModuleObject *)m)->md_dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	255 if (d == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	256 (fileobj = PyDict_GetItemString(d, "__file__")) == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	257 !PyUnicode_Check(fileobj))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	258 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	259 PyErr_SetString(PyExc_SystemError, "module filename missing");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	260 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	261 }
64138 ee765a67c0b1 Issue #9425: Create PyModule_GetFilenameObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63949 diff changeset	262 Py_INCREF(fileobj);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61348 diff changeset	263 return fileobj;
61348 5260104db99d module_repr(): use %U to format the file name Victor Stinner <victor.stinner@haypocalc.com> parents: 57210 diff changeset	264 }
5260104db99d module_repr(): use %U to format the file name Victor Stinner <victor.stinner@haypocalc.com> parents: 57210 diff changeset	265
5260104db99d module_repr(): use %U to format the file name Victor Stinner <victor.stinner@haypocalc.com> parents: 57210 diff changeset	266 const char *
5260104db99d module_repr(): use %U to format the file name Victor Stinner <victor.stinner@haypocalc.com> parents: 57210 diff changeset	267 PyModule_GetFilename(PyObject *m)
5260104db99d module_repr(): use %U to format the file name Victor Stinner <victor.stinner@haypocalc.com> parents: 57210 diff changeset	268 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61348 diff changeset	269 PyObject *fileobj;
64138 ee765a67c0b1 Issue #9425: Create PyModule_GetFilenameObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63949 diff changeset	270 char *utf8;
ee765a67c0b1 Issue #9425: Create PyModule_GetFilenameObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63949 diff changeset	271 fileobj = PyModule_GetFilenameObject(m);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61348 diff changeset	272 if (fileobj == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61348 diff changeset	273 return NULL;
64138 ee765a67c0b1 Issue #9425: Create PyModule_GetFilenameObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63949 diff changeset	274 utf8 = _PyUnicode_AsString(fileobj);
68111 f2edaf62d823 Issue #3080: Add PyModule_GetNameObject() Victor Stinner <victor.stinner@haypocalc.com> parents: 66910 diff changeset	275 Py_DECREF(fileobj); /* module dict has still a reference */
64138 ee765a67c0b1 Issue #9425: Create PyModule_GetFilenameObject() function Victor Stinner <victor.stinner@haypocalc.com> parents: 63949 diff changeset	276 return utf8;
10161 5c1ebf23f1d7 Patch by Chris Petrilli to display the origin of a module in its Guido van Rossum <guido@python.org> parents: 9329 diff changeset	277 }
5c1ebf23f1d7 Patch by Chris Petrilli to display the origin of a module in its Guido van Rossum <guido@python.org> parents: 9329 diff changeset	278
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	279 PyModuleDef*
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	280 PyModule_GetDef(PyObject* m)
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	281 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	282 if (!PyModule_Check(m)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	283 PyErr_BadArgument();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	284 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	285 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	286 return ((PyModuleObject *)m)->md_def;
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	287 }
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	288
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	289 void*
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	290 PyModule_GetState(PyObject* m)
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	291 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	292 if (!PyModule_Check(m)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	293 PyErr_BadArgument();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	294 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	295 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	296 return ((PyModuleObject *)m)->md_state;
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	297 }
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	298
7401 8c01cfee14ba Add internal routine _PyModule_Clear(), which does approximately what Guido van Rossum <guido@python.org> parents: 5456 diff changeset	299 void
13457 ef2ebb3b0c64 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	300 _PyModule_Clear(PyObject *m)
7401 8c01cfee14ba Add internal routine _PyModule_Clear(), which does approximately what Guido van Rossum <guido@python.org> parents: 5456 diff changeset	301 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	302 /* To make the execution order of destructors for global
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	303 objects a bit more predictable, we first zap all objects
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	304 whose name starts with a single underscore, before we clear
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	305 the entire dictionary. We zap them by replacing them with
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	306 None, rather than deleting them from the dictionary, to
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	307 avoid rehashing the dictionary (to some extent). */
7401 8c01cfee14ba Add internal routine _PyModule_Clear(), which does approximately what Guido van Rossum <guido@python.org> parents: 5456 diff changeset	308
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	309 Py_ssize_t pos;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	310 PyObject key, value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	311 PyObject *d;
7401 8c01cfee14ba Add internal routine _PyModule_Clear(), which does approximately what Guido van Rossum <guido@python.org> parents: 5456 diff changeset	312
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	313 d = ((PyModuleObject *)m)->md_dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	314 if (d == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	315 return;
7401 8c01cfee14ba Add internal routine _PyModule_Clear(), which does approximately what Guido van Rossum <guido@python.org> parents: 5456 diff changeset	316
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	317 /* First, clear only names starting with a single underscore */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	318 pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	319 while (PyDict_Next(d, &pos, &key, &value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	320 if (value != Py_None && PyUnicode_Check(key)) {
76640 eb68502731dd Issues #13959, 14647: Re-implement imp.reload() in Lib/imp.py. Brett Cannon <brett@python.org> parents: 72925 diff changeset	321 if (PyUnicode_READ_CHAR(key, 0) == '_' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70342 diff changeset	322 PyUnicode_READ_CHAR(key, 1) != '_') {
61711 7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	323 if (Py_VerboseFlag > 1) {
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	324 const char *s = _PyUnicode_AsString(key);
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	325 if (s != NULL)
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	326 PySys_WriteStderr("# clear[1] %s\n", s);
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	327 else
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	328 PyErr_Clear();
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	329 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	330 PyDict_SetItem(d, key, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	331 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	332 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	333 }
7401 8c01cfee14ba Add internal routine _PyModule_Clear(), which does approximately what Guido van Rossum <guido@python.org> parents: 5456 diff changeset	334
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	335 /* Next, clear all names except for __builtins__ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	336 pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	337 while (PyDict_Next(d, &pos, &key, &value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	338 if (value != Py_None && PyUnicode_Check(key)) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70342 diff changeset	339 if (PyUnicode_READ_CHAR(key, 0) != '_' \|\|
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 70342 diff changeset	340 PyUnicode_CompareWithASCIIString(key, "__builtins__") != 0)
61711 7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	341 {
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	342 if (Py_VerboseFlag > 1) {
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	343 const char *s = _PyUnicode_AsString(key);
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	344 if (s != NULL)
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	345 PySys_WriteStderr("# clear[2] %s\n", s);
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	346 else
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	347 PyErr_Clear();
7fc48ad16087 Issue #6697: Fix a crash if a module attribute name contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	348 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	349 PyDict_SetItem(d, key, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	350 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	351 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	352 }
7401 8c01cfee14ba Add internal routine _PyModule_Clear(), which does approximately what Guido van Rossum <guido@python.org> parents: 5456 diff changeset	353
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	354 /* Note: we leave __builtins__ in place, so that destructors
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	355 of non-global objects defined in this module can still use
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	356 builtins, in particularly 'None'. */
7401 8c01cfee14ba Add internal routine _PyModule_Clear(), which does approximately what Guido van Rossum <guido@python.org> parents: 5456 diff changeset	357
8c01cfee14ba Add internal routine _PyModule_Clear(), which does approximately what Guido van Rossum <guido@python.org> parents: 5456 diff changeset	358 }
8c01cfee14ba Add internal routine _PyModule_Clear(), which does approximately what Guido van Rossum <guido@python.org> parents: 5456 diff changeset	359
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	360 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	361
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17811 diff changeset	362 static int
23652 b40165a4efe9 Surprising fix for SF bug 563060: module can be used as base class. Guido van Rossum <guido@python.org> parents: 22975 diff changeset	363 module_init(PyModuleObject m, PyObject args, PyObject *kwds)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17811 diff changeset	364 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	365 static char *kwlist[] = {"name", "doc", NULL};
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	366 PyObject dict, name = Py_None, *doc = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	367 if (!PyArg_ParseTupleAndKeywords(args, kwds, "U\|O:module.__init__",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	368 kwlist, &name, &doc))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	369 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	370 dict = m->md_dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	371 if (dict == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	372 dict = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	373 if (dict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	374 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	375 m->md_dict = dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	376 }
84936 79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	377 if (module_init_dict(m, dict, name, doc) < 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	378 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	379 return 0;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17811 diff changeset	380 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17811 diff changeset	381
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	382 static void
13457 ef2ebb3b0c64 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	383 module_dealloc(PyModuleObject *m)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	384 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	385 PyObject_GC_UnTrack(m);
84936 79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	386 if (Py_VerboseFlag && m->md_name) {
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	387 PySys_FormatStderr("# destroy %S\n", m->md_name);
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	388 }
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	389 if (m->md_weaklist != NULL)
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	390 PyObject_ClearWeakRefs((PyObject *) m);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	391 if (m->md_def && m->md_def->m_free)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	392 m->md_def->m_free(m);
84936 79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	393 Py_XDECREF(m->md_dict);
79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	394 Py_XDECREF(m->md_name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	395 if (m->md_state != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	396 PyMem_FREE(m->md_state);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	397 Py_TYPE(m)->tp_free((PyObject *)m);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	398 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	399
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	400 static PyObject *
13457 ef2ebb3b0c64 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	401 module_repr(PyModuleObject *m)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	402 {
87347 07229c6104b1 Implement PEP 451 (ModuleSpec). Eric Snow <ericsnowcurrently@gmail.com> parents: 84936 diff changeset	403 PyThreadState *tstate = PyThreadState_GET();
07229c6104b1 Implement PEP 451 (ModuleSpec). Eric Snow <ericsnowcurrently@gmail.com> parents: 84936 diff changeset	404 PyInterpreterState *interp = tstate->interp;
19322 1fec03012346 module_repr(): Instead of fixing the maximum buf size to 400, Barry Warsaw <barry@python.org> parents: 18933 diff changeset	405
87347 07229c6104b1 Implement PEP 451 (ModuleSpec). Eric Snow <ericsnowcurrently@gmail.com> parents: 84936 diff changeset	406 return PyObject_CallMethod(interp->importlib, "_module_repr", "O", m);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	407 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	408
15686 986d1c3ccdde Add garbage collection for module objects. Closes patch #102939 and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	409 static int
986d1c3ccdde Add garbage collection for module objects. Closes patch #102939 and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	410 module_traverse(PyModuleObject m, visitproc visit, void arg)
986d1c3ccdde Add garbage collection for module objects. Closes patch #102939 and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	411 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	412 if (m->md_def && m->md_def->m_traverse) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	413 int res = m->md_def->m_traverse((PyObject*)m, visit, arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	414 if (res)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	415 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	416 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	417 Py_VISIT(m->md_dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	418 return 0;
15686 986d1c3ccdde Add garbage collection for module objects. Closes patch #102939 and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	419 }
986d1c3ccdde Add garbage collection for module objects. Closes patch #102939 and Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	420
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	421 static int
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	422 module_clear(PyModuleObject *m)
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	423 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	424 if (m->md_def && m->md_def->m_clear) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	425 int res = m->md_def->m_clear((PyObject*)m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	426 if (res)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	427 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	428 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	429 Py_CLEAR(m->md_dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	430 return 0;
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	431 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	432
70331 8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	433 static PyObject *
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	434 module_dir(PyObject self, PyObject args)
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	435 {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	436 _Py_IDENTIFIER(__dict__);
70331 8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	437 PyObject *result = NULL;
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	438 PyObject *dict = _PyObject_GetAttrId(self, &PyId___dict__);
70331 8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	439
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	440 if (dict != NULL) {
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	441 if (PyDict_Check(dict))
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	442 result = PyDict_Keys(dict);
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	443 else {
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	444 const char *name = PyModule_GetName(self);
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	445 if (name)
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	446 PyErr_Format(PyExc_TypeError,
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	447 "%.200s.__dict__ is not a dictionary",
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	448 name);
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	449 }
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	450 }
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	451
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	452 Py_XDECREF(dict);
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	453 return result;
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	454 }
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	455
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	456 static PyMethodDef module_methods[] = {
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	457 {"__dir__", module_dir, METH_NOARGS,
70342 6f078d80898f indicate return value on __dir__ methods Benjamin Peterson <benjamin@python.org> parents: 70331 diff changeset	458 PyDoc_STR("__dir__() -> list\nspecialized dir() implementation")},
70331 8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	459 {0}
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	460 };
8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	461
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44351 diff changeset	462
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23654 diff changeset	463 PyDoc_STRVAR(module_doc,
23654 b86eaeb0d7dd Add a docstring to the module type. Guido van Rossum <guido@python.org> parents: 23652 diff changeset	464 "module(name[, doc])\n\
b86eaeb0d7dd Add a docstring to the module type. Guido van Rossum <guido@python.org> parents: 23652 diff changeset	465 \n\
b86eaeb0d7dd Add a docstring to the module type. Guido van Rossum <guido@python.org> parents: 23652 diff changeset	466 Create a module object.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23654 diff changeset	467 The name must be a string; the optional doc argument can have any type.");
23654 b86eaeb0d7dd Add a docstring to the module type. Guido van Rossum <guido@python.org> parents: 23652 diff changeset	468
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	469 PyTypeObject PyModule_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	470 PyVarObject_HEAD_INIT(&PyType_Type, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	471 "module", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	472 sizeof(PyModuleObject), /* tp_size */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	473 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	474 (destructor)module_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	475 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	476 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	477 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	478 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	479 (reprfunc)module_repr, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	480 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	481 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	482 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	483 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	484 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	485 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	486 PyObject_GenericGetAttr, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	487 PyObject_GenericSetAttr, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	488 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	489 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	490 Py_TPFLAGS_BASETYPE, /* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	491 module_doc, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	492 (traverseproc)module_traverse, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	493 (inquiry)module_clear, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	494 0, /* tp_richcompare */
84936 79e2f5bbc30c Issue #18214: Improve finalization of Python modules to avoid setting their globals to None, in most cases. Antoine Pitrou <solipsis@pitrou.net> parents: 83607 diff changeset	495 offsetof(PyModuleObject, md_weaklist), /* tp_weaklistoffset */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	496 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	497 0, /* tp_iternext */
70331 8f403199f999 move specialized dir implementations into __dir__ methods (closes #12166) Benjamin Peterson <benjamin@python.org> parents: 68258 diff changeset	498 module_methods, /* tp_methods */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	499 module_members, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	500 0, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	501 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	502 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	503 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	504 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	505 offsetof(PyModuleObject, md_dict), /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	506 (initproc)module_init, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	507 PyType_GenericAlloc, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	508 PyType_GenericNew, /* tp_new */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	509 PyObject_GC_Del, /* tp_free */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	510 };

Mercurial > cpython-lru_cache-weakref

annotate Objects/moduleobject.c @ 87690:66c1c9f32567 default tip