mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
Merged revisions 60151-60159,60161-60168,60170,60172-60173,60175 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r60151 | christian.heimes | 2008-01-21 14:11:15 +0100 (Mon, 21 Jan 2008) | 1 line A bunch of header files were not listed as dependencies for object files. Changes to files like Parser/parser.h weren't picked up by make. ........ r60152 | georg.brandl | 2008-01-21 15:16:46 +0100 (Mon, 21 Jan 2008) | 3 lines #1087741: make mmap.mmap the type of mmap objects, not a factory function. Allow it to be subclassed. ........ r60153 | georg.brandl | 2008-01-21 15:18:14 +0100 (Mon, 21 Jan 2008) | 2 lines mmap is an extension module. ........ r60154 | georg.brandl | 2008-01-21 17:28:13 +0100 (Mon, 21 Jan 2008) | 2 lines Fix example. ........ r60155 | georg.brandl | 2008-01-21 17:34:07 +0100 (Mon, 21 Jan 2008) | 2 lines #1555501: document plistlib and move it to the general library. ........ r60156 | georg.brandl | 2008-01-21 17:36:00 +0100 (Mon, 21 Jan 2008) | 2 lines Add a stub for bundlebuilder documentation. ........ r60157 | georg.brandl | 2008-01-21 17:46:58 +0100 (Mon, 21 Jan 2008) | 2 lines Removing bundlebuilder docs again -- it's not to be used anymore (see #779825). ........ r60158 | georg.brandl | 2008-01-21 17:51:51 +0100 (Mon, 21 Jan 2008) | 2 lines #997912: acknowledge nested scopes in tutorial. ........ r60159 | vinay.sajip | 2008-01-21 18:02:26 +0100 (Mon, 21 Jan 2008) | 1 line Fix: #1836: Off-by-one bug in TimedRotatingFileHandler rollover calculation. Patch thanks to Kathryn M. Kowalski. ........ r60161 | georg.brandl | 2008-01-21 18:13:03 +0100 (Mon, 21 Jan 2008) | 2 lines Adapt pydoc to new doc URLs. ........ r60162 | georg.brandl | 2008-01-21 18:17:00 +0100 (Mon, 21 Jan 2008) | 2 lines Fix old link. ........ r60163 | georg.brandl | 2008-01-21 18:22:06 +0100 (Mon, 21 Jan 2008) | 2 lines #1726198: replace while 1: fp.readline() with file iteration. ........ r60164 | georg.brandl | 2008-01-21 18:29:23 +0100 (Mon, 21 Jan 2008) | 2 lines Clarify $ behavior in re docstring. #1631394. ........ r60165 | vinay.sajip | 2008-01-21 18:39:22 +0100 (Mon, 21 Jan 2008) | 1 line Minor documentation change - hyperlink tidied up. ........ r60166 | georg.brandl | 2008-01-21 18:42:40 +0100 (Mon, 21 Jan 2008) | 2 lines #1530959: change distutils build dir for --with-pydebug python builds. ........ r60167 | vinay.sajip | 2008-01-21 19:16:05 +0100 (Mon, 21 Jan 2008) | 1 line Updated to include news on recent logging fixes and documentation changes. ........ r60168 | georg.brandl | 2008-01-21 19:35:49 +0100 (Mon, 21 Jan 2008) | 3 lines Issue #1882: when compiling code from a string, encoding cookies in the second line of code were not always recognized correctly. ........ r60170 | georg.brandl | 2008-01-21 19:36:51 +0100 (Mon, 21 Jan 2008) | 2 lines Add NEWS entry for #1882. ........ r60172 | georg.brandl | 2008-01-21 19:41:24 +0100 (Mon, 21 Jan 2008) | 2 lines Use original location of document, which has translations. ........ r60173 | walter.doerwald | 2008-01-21 21:18:04 +0100 (Mon, 21 Jan 2008) | 2 lines Follow PEP 8 in module docstring. ........ r60175 | georg.brandl | 2008-01-21 21:20:53 +0100 (Mon, 21 Jan 2008) | 2 lines Adapt to latest doctools refactoring. ........
This commit is contained in:
Georg Brandl
parent
e1c981161c
commit
86def6cb2b
25 changed files with 382 additions and 133 deletions
|
|
@ -895,6 +895,9 @@ static PyBufferProcs mmap_as_buffer = {
|
|||
(releasebufferproc)mmap_buffer_releasebuf,
|
||||
};
|
||||
|
||||
static PyObject *
|
||||
new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict);
|
||||
|
||||
PyDoc_STRVAR(mmap_doc,
|
||||
"Windows: mmap(fileno, length[, tagname[, access[, offset]]])\n\
|
||||
\n\
|
||||
|
|
@ -920,7 +923,7 @@ To map anonymous memory, pass -1 as the fileno (both versions).");
|
|||
|
||||
|
||||
static PyTypeObject mmap_object_type = {
|
||||
PyVarObject_HEAD_INIT(0, 0) /* patched in module init */
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
"mmap.mmap", /* tp_name */
|
||||
sizeof(mmap_object), /* tp_size */
|
||||
0, /* tp_itemsize */
|
||||
|
|
@ -940,16 +943,26 @@ static PyTypeObject mmap_object_type = {
|
|||
PyObject_GenericGetAttr, /*tp_getattro*/
|
||||
0, /*tp_setattro*/
|
||||
&mmap_as_buffer, /*tp_as_buffer*/
|
||||
Py_TPFLAGS_DEFAULT, /*tp_flags*/
|
||||
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
|
||||
mmap_doc, /*tp_doc*/
|
||||
0, /* tp_traverse */
|
||||
0, /* tp_clear */
|
||||
0, /* tp_richcompare */
|
||||
0, /* tp_weaklistoffset */
|
||||
0, /* tp_iter */
|
||||
0, /* tp_iternext */
|
||||
0, /* tp_iter */
|
||||
0, /* tp_iternext */
|
||||
mmap_object_methods, /* tp_methods */
|
||||
|
||||
0, /* tp_members */
|
||||
0, /* tp_getset */
|
||||
0, /* tp_base */
|
||||
0, /* tp_dict */
|
||||
0, /* tp_descr_get */
|
||||
0, /* tp_descr_set */
|
||||
0, /* tp_dictoffset */
|
||||
0, /* tp_init */
|
||||
PyType_GenericAlloc, /* tp_alloc */
|
||||
new_mmap_object, /* tp_new */
|
||||
PyObject_Del, /* tp_free */
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -981,7 +994,7 @@ _GetMapSize(PyObject *o, const char* param)
|
|||
|
||||
#ifdef UNIX
|
||||
static PyObject *
|
||||
new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
|
||||
new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
|
||||
{
|
||||
#ifdef HAVE_FSTAT
|
||||
struct stat st;
|
||||
|
|
@ -1049,7 +1062,7 @@ new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
|
|||
}
|
||||
}
|
||||
#endif
|
||||
m_obj = PyObject_New(mmap_object, &mmap_object_type);
|
||||
m_obj = (mmap_object *)type->tp_alloc(type, 0);
|
||||
if (m_obj == NULL) {return NULL;}
|
||||
m_obj->data = NULL;
|
||||
m_obj->size = (size_t) map_size;
|
||||
|
|
@ -1104,7 +1117,7 @@ new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
|
|||
|
||||
#ifdef MS_WINDOWS
|
||||
static PyObject *
|
||||
new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
|
||||
new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
|
||||
{
|
||||
mmap_object *m_obj;
|
||||
PyObject *map_size_obj = NULL, *offset_obj = NULL;
|
||||
|
|
@ -1173,7 +1186,7 @@ new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
|
|||
lseek(fileno, 0, SEEK_SET);
|
||||
}
|
||||
|
||||
m_obj = PyObject_New(mmap_object, &mmap_object_type);
|
||||
m_obj = (mmap_object *)type->tp_alloc(type, 0);
|
||||
if (m_obj == NULL)
|
||||
return NULL;
|
||||
/* Set every field to an invalid marker, so we can safely
|
||||
|
|
@ -1288,13 +1301,6 @@ new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
|
|||
}
|
||||
#endif /* MS_WINDOWS */
|
||||
|
||||
/* List of functions exported by this module */
|
||||
static struct PyMethodDef mmap_functions[] = {
|
||||
{"mmap", (PyCFunction) new_mmap_object,
|
||||
METH_VARARGS|METH_KEYWORDS, mmap_doc},
|
||||
{NULL, NULL} /* Sentinel */
|
||||
};
|
||||
|
||||
static void
|
||||
setint(PyObject *d, const char *name, long value)
|
||||
{
|
||||
|
|
@ -1305,14 +1311,14 @@ setint(PyObject *d, const char *name, long value)
|
|||
}
|
||||
|
||||
PyMODINIT_FUNC
|
||||
initmmap(void)
|
||||
initmmap(void)
|
||||
{
|
||||
PyObject *dict, *module;
|
||||
|
||||
/* Patch the object type */
|
||||
Py_TYPE(&mmap_object_type) = &PyType_Type;
|
||||
if (PyType_Ready(&mmap_object_type) < 0)
|
||||
return;
|
||||
|
||||
module = Py_InitModule("mmap", mmap_functions);
|
||||
module = Py_InitModule("mmap", NULL);
|
||||
if (module == NULL)
|
||||
return;
|
||||
dict = PyModule_GetDict(module);
|
||||
|
|
@ -1320,6 +1326,7 @@ PyMODINIT_FUNC
|
|||
return;
|
||||
mmap_module_error = PyExc_EnvironmentError;
|
||||
PyDict_SetItemString(dict, "error", mmap_module_error);
|
||||
PyDict_SetItemString(dict, "mmap", (PyObject*) &mmap_object_type);
|
||||
#ifdef PROT_EXEC
|
||||
setint(dict, "PROT_EXEC", PROT_EXEC);
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue