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

merge 3.3

Browse source
This commit is contained in:
Benjamin Peterson 2013-05-16 15:30:09 -05:00
commit aa96588399
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/_cursesmodule.c
View file

@ -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);

3
Modules/socketmodule.c
View file

@ -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;