Mailing List Archive

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv2476

Modified Files:
selectmodule.c socketmodule.c stropmodule.c syslogmodule.c
zlibmodule.c
Log Message:
Use the PyModule_Add*() APIs instead of manipulating the module dict
directly.

Index: selectmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.61
retrieving revision 2.62
diff -C2 -d -r2.61 -r2.62
*** selectmodule.c 3 Mar 2002 02:59:16 -0000 2.61
--- selectmodule.c 1 Apr 2002 14:53:37 -0000 2.62
***************
*** 658,689 ****
initselect(void)
{
! PyObject *m, *d;
m = Py_InitModule3("select", select_methods, module_doc);
! d = PyModule_GetDict(m);
SelectError = PyErr_NewException("select.error", NULL, NULL);
! PyDict_SetItemString(d, "error", SelectError);
#ifdef HAVE_POLL
poll_Type.ob_type = &PyType_Type;
! insint(d, "POLLIN", POLLIN);
! insint(d, "POLLPRI", POLLPRI);
! insint(d, "POLLOUT", POLLOUT);
! insint(d, "POLLERR", POLLERR);
! insint(d, "POLLHUP", POLLHUP);
! insint(d, "POLLNVAL", POLLNVAL);

#ifdef POLLRDNORM
! insint(d, "POLLRDNORM", POLLRDNORM);
#endif
#ifdef POLLRDBAND
! insint(d, "POLLRDBAND", POLLRDBAND);
#endif
#ifdef POLLWRNORM
! insint(d, "POLLWRNORM", POLLWRNORM);
#endif
#ifdef POLLWRBAND
! insint(d, "POLLWRBAND", POLLWRBAND);
#endif
#ifdef POLLMSG
! insint(d, "POLLMSG", POLLMSG);
#endif
#endif /* HAVE_POLL */
--- 658,690 ----
initselect(void)
{
! PyObject *m;
m = Py_InitModule3("select", select_methods, module_doc);
!
SelectError = PyErr_NewException("select.error", NULL, NULL);
! Py_INCREF(SelectError);
! PyModule_AddObject(m, "error", SelectError);
#ifdef HAVE_POLL
poll_Type.ob_type = &PyType_Type;
! PyModule_AddIntConstant(m, "POLLIN", POLLIN);
! PyModule_AddIntConstant(m, "POLLPRI", POLLPRI);
! PyModule_AddIntConstant(m, "POLLOUT", POLLOUT);
! PyModule_AddIntConstant(m, "POLLERR", POLLERR);
! PyModule_AddIntConstant(m, "POLLHUP", POLLHUP);
! PyModule_AddIntConstant(m, "POLLNVAL", POLLNVAL);

#ifdef POLLRDNORM
! PyModule_AddIntConstant(m, "POLLRDNORM", POLLRDNORM);
#endif
#ifdef POLLRDBAND
! PyModule_AddIntConstant(m, "POLLRDBAND", POLLRDBAND);
#endif
#ifdef POLLWRNORM
! PyModule_AddIntConstant(m, "POLLWRNORM", POLLWRNORM);
#endif
#ifdef POLLWRBAND
! PyModule_AddIntConstant(m, "POLLWRBAND", POLLWRBAND);
#endif
#ifdef POLLMSG
! PyModule_AddIntConstant(m, "POLLMSG", POLLMSG);
#endif
#endif /* HAVE_POLL */

Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -C2 -d -r1.212 -r1.213
*** socketmodule.c 25 Mar 2002 22:23:53 -0000 1.212
--- socketmodule.c 1 Apr 2002 14:53:37 -0000 1.213
***************
*** 2695,2699 ****
init_socket(void)
{
! PyObject *m, *d;
#ifdef RISCOS
_kernel_swi_regs r;
--- 2695,2699 ----
init_socket(void)
{
! PyObject *m;
#ifdef RISCOS
[...1172 lines suppressed...]
#endif
#ifdef NI_MAXSERV
! PyModule_AddIntConstant(m, "NI_MAXSERV", NI_MAXSERV);
#endif
#ifdef NI_NOFQDN
! PyModule_AddIntConstant(m, "NI_NOFQDN", NI_NOFQDN);
#endif
#ifdef NI_NUMERICHOST
! PyModule_AddIntConstant(m, "NI_NUMERICHOST", NI_NUMERICHOST);
#endif
#ifdef NI_NAMEREQD
! PyModule_AddIntConstant(m, "NI_NAMEREQD", NI_NAMEREQD);
#endif
#ifdef NI_NUMERICSERV
! PyModule_AddIntConstant(m, "NI_NUMERICSERV", NI_NUMERICSERV);
#endif
#ifdef NI_DGRAM
! PyModule_AddIntConstant(m, "NI_DGRAM", NI_DGRAM);
#endif


Index: stropmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/stropmodule.c,v
retrieving revision 2.85
retrieving revision 2.86
diff -C2 -d -r2.85 -r2.86
*** stropmodule.c 20 Mar 2002 21:32:07 -0000 2.85
--- stropmodule.c 1 Apr 2002 14:53:37 -0000 2.86
***************
*** 1216,1225 ****
initstrop(void)
{
! PyObject *m, *d, *s;
char buf[256];
int c, n;
m = Py_InitModule4("strop", strop_methods, strop_module__doc__,
(PyObject*)NULL, PYTHON_API_VERSION);
- d = PyModule_GetDict(m);

/* Create 'whitespace' object */
--- 1216,1224 ----
initstrop(void)
{
! PyObject *m, *s;
char buf[256];
int c, n;
m = Py_InitModule4("strop", strop_methods, strop_module__doc__,
(PyObject*)NULL, PYTHON_API_VERSION);

/* Create 'whitespace' object */
***************
*** 1230,1237 ****
}
s = PyString_FromStringAndSize(buf, n);
! if (s) {
! PyDict_SetItemString(d, "whitespace", s);
! Py_DECREF(s);
! }
/* Create 'lowercase' object */
n = 0;
--- 1229,1235 ----
}
s = PyString_FromStringAndSize(buf, n);
! if (s)
! PyModule_AddObject(m, "whitespace", s);
!
/* Create 'lowercase' object */
n = 0;
***************
*** 1241,1248 ****
}
s = PyString_FromStringAndSize(buf, n);
! if (s) {
! PyDict_SetItemString(d, "lowercase", s);
! Py_DECREF(s);
! }

/* Create 'uppercase' object */
--- 1239,1244 ----
}
s = PyString_FromStringAndSize(buf, n);
! if (s)
! PyModule_AddObject(m, "lowercase", s);

/* Create 'uppercase' object */
***************
*** 1253,1259 ****
}
s = PyString_FromStringAndSize(buf, n);
! if (s) {
! PyDict_SetItemString(d, "uppercase", s);
! Py_DECREF(s);
! }
}
--- 1249,1253 ----
}
s = PyString_FromStringAndSize(buf, n);
! if (s)
! PyModule_AddObject(m, "uppercase", s);
}

Index: syslogmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/syslogmodule.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -d -r2.17 -r2.18
*** syslogmodule.c 1 Sep 2000 09:01:32 -0000 2.17
--- syslogmodule.c 1 Apr 2002 14:53:37 -0000 2.18
***************
*** 154,169 ****
};

- /* helper function for initialization function */
-
- static void
- ins(PyObject *d, char *s, long x)
- {
- PyObject *v = PyInt_FromLong(x);
- if (v) {
- PyDict_SetItemString(d, s, v);
- Py_DECREF(v);
- }
- }
-
/* Initialization function for the module */

--- 154,157 ----
***************
*** 171,175 ****
initsyslog(void)
{
! PyObject *m, *d;

/* Create the module and add the functions */
--- 159,163 ----
initsyslog(void)
{
! PyObject *m;

/* Create the module and add the functions */
***************
*** 177,218 ****

/* Add some symbolic constants to the module */
- d = PyModule_GetDict(m);

/* Priorities */
! ins(d, "LOG_EMERG", LOG_EMERG);
! ins(d, "LOG_ALERT", LOG_ALERT);
! ins(d, "LOG_CRIT", LOG_CRIT);
! ins(d, "LOG_ERR", LOG_ERR);
! ins(d, "LOG_WARNING", LOG_WARNING);
! ins(d, "LOG_NOTICE", LOG_NOTICE);
! ins(d, "LOG_INFO", LOG_INFO);
! ins(d, "LOG_DEBUG", LOG_DEBUG);

/* openlog() option flags */
! ins(d, "LOG_PID", LOG_PID);
! ins(d, "LOG_CONS", LOG_CONS);
! ins(d, "LOG_NDELAY", LOG_NDELAY);
#ifdef LOG_NOWAIT
! ins(d, "LOG_NOWAIT", LOG_NOWAIT);
#endif
#ifdef LOG_PERROR
! ins(d, "LOG_PERROR", LOG_PERROR);
#endif

/* Facilities */
! ins(d, "LOG_KERN", LOG_KERN);
! ins(d, "LOG_USER", LOG_USER);
! ins(d, "LOG_MAIL", LOG_MAIL);
! ins(d, "LOG_DAEMON", LOG_DAEMON);
! ins(d, "LOG_AUTH", LOG_AUTH);
! ins(d, "LOG_LPR", LOG_LPR);
! ins(d, "LOG_LOCAL0", LOG_LOCAL0);
! ins(d, "LOG_LOCAL1", LOG_LOCAL1);
! ins(d, "LOG_LOCAL2", LOG_LOCAL2);
! ins(d, "LOG_LOCAL3", LOG_LOCAL3);
! ins(d, "LOG_LOCAL4", LOG_LOCAL4);
! ins(d, "LOG_LOCAL5", LOG_LOCAL5);
! ins(d, "LOG_LOCAL6", LOG_LOCAL6);
! ins(d, "LOG_LOCAL7", LOG_LOCAL7);

#ifndef LOG_SYSLOG
--- 165,205 ----

/* Add some symbolic constants to the module */

/* Priorities */
! PyModule_AddIntConstant(m, "LOG_EMERG", LOG_EMERG);
! PyModule_AddIntConstant(m, "LOG_ALERT", LOG_ALERT);
! PyModule_AddIntConstant(m, "LOG_CRIT", LOG_CRIT);
! PyModule_AddIntConstant(m, "LOG_ERR", LOG_ERR);
! PyModule_AddIntConstant(m, "LOG_WARNING", LOG_WARNING);
! PyModule_AddIntConstant(m, "LOG_NOTICE", LOG_NOTICE);
! PyModule_AddIntConstant(m, "LOG_INFO", LOG_INFO);
! PyModule_AddIntConstant(m, "LOG_DEBUG", LOG_DEBUG);

/* openlog() option flags */
! PyModule_AddIntConstant(m, "LOG_PID", LOG_PID);
! PyModule_AddIntConstant(m, "LOG_CONS", LOG_CONS);
! PyModule_AddIntConstant(m, "LOG_NDELAY", LOG_NDELAY);
#ifdef LOG_NOWAIT
! PyModule_AddIntConstant(m, "LOG_NOWAIT", LOG_NOWAIT);
#endif
#ifdef LOG_PERROR
! PyModule_AddIntConstant(m, "LOG_PERROR", LOG_PERROR);
#endif

/* Facilities */
! PyModule_AddIntConstant(m, "LOG_KERN", LOG_KERN);
! PyModule_AddIntConstant(m, "LOG_USER", LOG_USER);
! PyModule_AddIntConstant(m, "LOG_MAIL", LOG_MAIL);
! PyModule_AddIntConstant(m, "LOG_DAEMON", LOG_DAEMON);
! PyModule_AddIntConstant(m, "LOG_AUTH", LOG_AUTH);
! PyModule_AddIntConstant(m, "LOG_LPR", LOG_LPR);
! PyModule_AddIntConstant(m, "LOG_LOCAL0", LOG_LOCAL0);
! PyModule_AddIntConstant(m, "LOG_LOCAL1", LOG_LOCAL1);
! PyModule_AddIntConstant(m, "LOG_LOCAL2", LOG_LOCAL2);
! PyModule_AddIntConstant(m, "LOG_LOCAL3", LOG_LOCAL3);
! PyModule_AddIntConstant(m, "LOG_LOCAL4", LOG_LOCAL4);
! PyModule_AddIntConstant(m, "LOG_LOCAL5", LOG_LOCAL5);
! PyModule_AddIntConstant(m, "LOG_LOCAL6", LOG_LOCAL6);
! PyModule_AddIntConstant(m, "LOG_LOCAL7", LOG_LOCAL7);

#ifndef LOG_SYSLOG
***************
*** 229,235 ****
#endif

! ins(d, "LOG_SYSLOG", LOG_SYSLOG);
! ins(d, "LOG_CRON", LOG_CRON);
! ins(d, "LOG_UUCP", LOG_UUCP);
! ins(d, "LOG_NEWS", LOG_NEWS);
}
--- 216,222 ----
#endif

! PyModule_AddIntConstant(m, "LOG_SYSLOG", LOG_SYSLOG);
! PyModule_AddIntConstant(m, "LOG_CRON", LOG_CRON);
! PyModule_AddIntConstant(m, "LOG_UUCP", LOG_UUCP);
! PyModule_AddIntConstant(m, "LOG_NEWS", LOG_NEWS);
}

Index: zlibmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/zlibmodule.c,v
retrieving revision 2.58
retrieving revision 2.59
diff -C2 -d -r2.58 -r2.59
*** zlibmodule.c 11 Mar 2002 09:20:47 -0000 2.58
--- zlibmodule.c 1 Apr 2002 14:53:37 -0000 2.59
***************
*** 848,852 ****
PyInit_zlib(void)
{
! PyObject *m, *d, *ver;
Comptype.ob_type = &PyType_Type;
Decomptype.ob_type = &PyType_Type;
--- 848,852 ----
PyInit_zlib(void)
{
! PyObject *m, *ver;
Comptype.ob_type = &PyType_Type;
Decomptype.ob_type = &PyType_Type;
***************
*** 854,862 ****
zlib_module_documentation,
(PyObject*)NULL,PYTHON_API_VERSION);
- d = PyModule_GetDict(m);
- ZlibError = PyErr_NewException("zlib.error", NULL, NULL);
- if (ZlibError != NULL)
- PyDict_SetItemString(d, "error", ZlibError);

PyModule_AddIntConstant(m, "MAX_WBITS", MAX_WBITS);
PyModule_AddIntConstant(m, "DEFLATED", DEFLATED);
--- 854,863 ----
zlib_module_documentation,
(PyObject*)NULL,PYTHON_API_VERSION);

+ ZlibError = PyErr_NewException("zlib.error", NULL, NULL);
+ if (ZlibError != NULL) {
+ Py_INCREF(ZlibError);
+ PyModule_AddObject(m, "error", ZlibError);
+ }
PyModule_AddIntConstant(m, "MAX_WBITS", MAX_WBITS);
PyModule_AddIntConstant(m, "DEFLATED", DEFLATED);
***************
*** 875,882 ****

ver = PyString_FromString(ZLIB_VERSION);
! if (ver != NULL) {
! PyDict_SetItemString(d, "ZLIB_VERSION", ver);
! Py_DECREF(ver);
! }

#ifdef WITH_THREAD
--- 876,881 ----

ver = PyString_FromString(ZLIB_VERSION);
! if (ver != NULL)
! PyModule_AddObject(m, "ZLIB_VERSION", ver);

#ifdef WITH_THREAD