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

SF Patch #103185, by jlt63: Some more standard modules cleanup for Cygwin

This commit is contained in:
Guido van Rossum 2001-01-22 15:29:14 +00:00
parent 31584cb43d
commit a120ffcf12
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/_curses_panel.c
View File

@ -350,7 +350,7 @@ PyCursesPanel_GetAttr(PyCursesPanelObject *self, char *name)
/* -------------------------------------------------------*/ /* -------------------------------------------------------*/
PyTypeObject PyCursesPanel_Type = { PyTypeObject PyCursesPanel_Type = {
PyObject_HEAD_INIT(&PyType_Type) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"curses panel", /*tp_name*/ "curses panel", /*tp_name*/
sizeof(PyCursesPanelObject), /*tp_basicsize*/ sizeof(PyCursesPanelObject), /*tp_basicsize*/
@ -469,11 +469,14 @@ static PyMethodDef PyCurses_methods[] = {
/* Initialization function for the module */ /* Initialization function for the module */
void DL_EXPORT(void)
init_curses_panel(void) init_curses_panel(void)
{ {
PyObject *m, *d, *v; PyObject *m, *d, *v;
/* Initialize object type */
PyCursesPanel_Type.ob_type = &PyType_Type;
import_curses(); import_curses();
/* Create the module and add the functions */ /* Create the module and add the functions */

3
Modules/dbmmodule.c
View File

@ -285,7 +285,7 @@ dbm_getattr(dbmobject *dp, char *name)
} }
static PyTypeObject Dbmtype = { static PyTypeObject Dbmtype = {
PyObject_HEAD_INIT(&PyType_Type) PyObject_HEAD_INIT(NULL)
0, 0,
"dbm", "dbm",
sizeof(dbmobject), sizeof(dbmobject),
@ -342,6 +342,7 @@ DL_EXPORT(void)
initdbm(void) { initdbm(void) {
PyObject *m, *d, *s; PyObject *m, *d, *s;
Dbmtype.ob_type = &PyType_Type;
m = Py_InitModule("dbm", dbmmodule_methods); m = Py_InitModule("dbm", dbmmodule_methods);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
if (DbmError == NULL) if (DbmError == NULL)

5
Modules/regexmodule.c
View File

@ -338,7 +338,7 @@ regobj_getattr(regexobject *re, char *name)
} }
static PyTypeObject Regextype = { static PyTypeObject Regextype = {
PyObject_HEAD_INIT(&PyType_Type) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"regex", /*tp_name*/ "regex", /*tp_name*/
sizeof(regexobject), /*tp_size*/ sizeof(regexobject), /*tp_size*/
@ -654,6 +654,9 @@ initregex(void)
int i; int i;
char *s; char *s;
/* Initialize object type */
Regextype.ob_type = &PyType_Type;
m = Py_InitModule("regex", regex_global_methods); m = Py_InitModule("regex", regex_global_methods);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);

5
Modules/socketmodule.c
View File

@ -2114,7 +2114,7 @@ static PyObject *SSL_getattr(SSLObject *self, char *name)
} }
staticforward PyTypeObject SSL_Type = { staticforward PyTypeObject SSL_Type = {
PyObject_HEAD_INIT(&PyType_Type) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"SSL", /*tp_name*/ "SSL", /*tp_name*/
sizeof(SSLObject), /*tp_basicsize*/ sizeof(SSLObject), /*tp_basicsize*/
@ -2381,6 +2381,9 @@ init_socket(void)
return; return;
#endif /* __TOS_OS2__ */ #endif /* __TOS_OS2__ */
#endif /* MS_WINDOWS */ #endif /* MS_WINDOWS */
#ifdef USE_SSL
SSL_Type.ob_type = &PyType_Type;
#endif
m = Py_InitModule3("_socket", PySocket_methods, module_doc); m = Py_InitModule3("_socket", PySocket_methods, module_doc);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
PySocket_Error = PyErr_NewException("socket.error", NULL, NULL); PySocket_Error = PyErr_NewException("socket.error", NULL, NULL);