diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2017-02-04 09:19:04 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2017-02-04 09:19:04 +0300 |
| commit | b53991455f7f258ede7a26b69c2be5b8138b9f8a (patch) | |
| tree | 3615cf0ef453ab113a547b1dfebacf415ed32602 /Modules/_io/winconsoleio.c | |
| parent | 678487eb345f9f9dea3d3818ecad7d39145bdc65 (diff) | |
| parent | 9bfb9694a65124a8191cdb8ce7992445d1d0f4d2 (diff) | |
| download | cpython-b53991455f7f258ede7a26b69c2be5b8138b9f8a.tar.gz | |
Issue #29198: Merge from 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; |