diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-11 10:38:27 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-11 10:38:27 (GMT) |
| commit | e390410ca4cf8d52f4692e0f01ee0d48fa901435 (patch) | |
| tree | 5642643397ff5cdcd13631d2a37cb50fbd8db3cd /Modules | |
| parent | 25a2afdb2d8ae35091eb258126dc5c963bcf70c9 (diff) | |
| parent | f9fdfa7c4e4b5cd02f5bc23a928037d644c8cdff (diff) | |
| download | cpython-e390410ca4cf8d52f4692e0f01ee0d48fa901435.zip cpython-e390410ca4cf8d52f4692e0f01ee0d48fa901435.tar.gz cpython-e390410ca4cf8d52f4692e0f01ee0d48fa901435.tar.bz2 | |
Merge 3.5
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/socketmodule.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index ee24907..d9c70f8 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -5513,9 +5513,7 @@ socket_getaddrinfo(PyObject *self, PyObject *args, PyObject* kwargs) if (hobj == Py_None) { hptr = NULL; } else if (PyUnicode_Check(hobj)) { - _Py_IDENTIFIER(encode); - - idna = _PyObject_CallMethodId(hobj, &PyId_encode, "s", "idna"); + idna = PyUnicode_AsEncodedString(hobj, "idna", NULL); if (!idna) return NULL; assert(PyBytes_Check(idna)); |