diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-05-16 20:30:09 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-05-16 20:30:09 (GMT) |
| commit | aa96588399da6b77767e5a6df675a035e3f72da6 (patch) | |
| tree | ce4804d61ee082031c81042ada148471765fc3bb /Modules | |
| parent | 6fdd7b81fa2ea3c2158cc786a63188a2779e49f1 (diff) | |
| parent | 18b71916531f6b235993aaeaedfb7176b4658aa9 (diff) | |
| download | cpython-aa96588399da6b77767e5a6df675a035e3f72da6.zip cpython-aa96588399da6b77767e5a6df675a035e3f72da6.tar.gz cpython-aa96588399da6b77767e5a6df675a035e3f72da6.tar.bz2 | |
merge 3.3
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_cursesmodule.c | 2 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 8436f03..132670d 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -2261,9 +2261,9 @@ PyCurses_GetWin(PyCursesWindowObject *self, PyObject *stream) PyObject *data; size_t datalen; WINDOW *win; + _Py_IDENTIFIER(read); PyCursesInitialised; - _Py_IDENTIFIER(read); strcpy(fn, "/tmp/py.curses.getwin.XXXXXX"); fd = mkstemp(fn); diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 3262999..e4c1edd 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1604,9 +1604,10 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, struct sockaddr_can *addr; PyObject *interfaceName; struct ifreq ifr; - addr = (struct sockaddr_can *)addr_ret; Py_ssize_t len; + addr = (struct sockaddr_can *)addr_ret; + if (!PyArg_ParseTuple(args, "O&", PyUnicode_FSConverter, &interfaceName)) return 0; |