mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 20:28:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Use identifier API for PyObject_GetAttrString.

Browse source
This commit is contained in:
Martin v. Löwis 2011-10-10 18:11:30 +02:00
parent 794d567b17
commit 1ee1b6fe0d
28 changed files with 499 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Python/sysmodule.c
View file

@ -79,8 +79,10 @@ sys_displayhook_unencodable(PyObject *outf, PyObject *o)
PyObject *encoded, *escaped_str, *repr_str, *buffer, *result;
char *stdout_encoding_str;
int ret;
_Py_identifier(encoding);
_Py_identifier(buffer);
stdout_encoding = PyObject_GetAttrString(outf, "encoding");
stdout_encoding = _PyObject_GetAttrId(outf, &PyId_encoding);
if (stdout_encoding == NULL)
goto error;
stdout_encoding_str = _PyUnicode_AsString(stdout_encoding);
@ -97,7 +99,7 @@ sys_displayhook_unencodable(PyObject *outf, PyObject *o)
if (encoded == NULL)
goto error;
buffer = PyObject_GetAttrString(outf, "buffer");
buffer = _PyObject_GetAttrId(outf, &PyId_buffer);
if (buffer) {
_Py_identifier(write);
result = _PyObject_CallMethodId(buffer, &PyId_write, "(O)", encoded);
@ -1841,11 +1843,12 @@ sys_pyfile_write_unicode(PyObject *unicode, PyObject *file)
{
PyObject *writer = NULL, *args = NULL, *result = NULL;
int err;
_Py_identifier(write);
if (file == NULL)
return -1;
writer = PyObject_GetAttrString(file, "write");
writer = _PyObject_GetAttrId(file, &PyId_write);
if (writer == NULL)
goto error;