diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
| commit | 23352add84278fc0476b2d6599489fbb70c9f5bc (patch) | |
| tree | 600bf5132e46d31b69efbd3bbc8a3d37159c0744 /Modules/_io/winconsoleio.c | |
| parent | 6d1d733828b49eb03d45da81c6b8c6b849fbc5df (diff) | |
| parent | 0fb1e3c9fc84c62a91f1e5889dc8e0855cefa4ae (diff) | |
| download | cpython-23352add84278fc0476b2d6599489fbb70c9f5bc.tar.gz | |
Issues #29349: Merge Py 2 fix 3.6
Diffstat (limited to 'Modules/_io/winconsoleio.c')
| -rw-r--r-- | Modules/_io/winconsoleio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c index 7b00a9eb6d..d8e43394bc 100644 --- a/Modules/_io/winconsoleio.c +++ b/Modules/_io/winconsoleio.c @@ -85,7 +85,7 @@ char _PyIO_get_console_type(PyObject *path_or_fd) { Py_CLEAR(decoded); return '\0'; } - decoded_upper = PyObject_CallMethod(decoded, "upper", ""); + decoded_upper = PyObject_CallMethod(decoded, "upper", NULL); Py_CLEAR(decoded); if (!decoded_upper) { PyErr_Clear(); @@ -181,8 +181,8 @@ _io__WindowsConsoleIO_close_impl(winconsoleio *self) PyObject *exc, *val, *tb; int rc; _Py_IDENTIFIER(close); - res = _PyObject_CallMethodId((PyObject*)&PyRawIOBase_Type, - &PyId_close, "O", self); + res = _PyObject_CallMethodIdObjArgs((PyObject*)&PyRawIOBase_Type, + &PyId_close, self, NULL); if (!self->closehandle) { self->handle = INVALID_HANDLE_VALUE; return res; |