mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use unicode and add a "test" for syslog

Browse source
This commit is contained in:
Neal Norwitz 2007-08-25 00:21:36 +00:00
parent a401bbe5f0
commit 8d3654db22
2 changed files with 52 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Modules/syslogmodule.c
View file

@ -58,9 +58,10 @@ syslog_openlog(PyObject * self, PyObject * args)
long logopt = 0;
long facility = LOG_USER;
PyObject *new_S_ident_o;
const char *ident;
if (!PyArg_ParseTuple(args,
"S|ll;ident string [, logoption [, facility]]",
"U|ll;ident string [, logoption [, facility]]",
&new_S_ident_o, &logopt, &facility))
return NULL;
@ -71,7 +72,10 @@ syslog_openlog(PyObject * self, PyObject * args)
S_ident_o = new_S_ident_o;
Py_INCREF(S_ident_o);
openlog(PyString_AsString(S_ident_o), logopt, facility);
ident = PyUnicode_AsString(S_ident_o);
if (ident == NULL)
return NULL;
openlog(ident, logopt, facility);
Py_INCREF(Py_None);
return Py_None;
@ -81,17 +85,21 @@ syslog_openlog(PyObject * self, PyObject * args)
static PyObject *
syslog_syslog(PyObject * self, PyObject * args)
{
char *message;
PyObject *message_object;
const char *message;
int priority = LOG_INFO;
if (!PyArg_ParseTuple(args, "is;[priority,] message string",
&priority, &message)) {
if (!PyArg_ParseTuple(args, "iU;[priority,] message string",
&priority, &message_objecct)) {
PyErr_Clear();
if (!PyArg_ParseTuple(args, "s;[priority,] message string",
&message))
if (!PyArg_ParseTuple(args, "U;[priority,] message string",
&message_objecct))
return NULL;
}
message = PyUnicode_AsString(message_object);
if (message == NULL)
return NULL;
syslog(priority, "%s", message);
Py_INCREF(Py_None);
return Py_None;