mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #19512, #19515: remove shared identifiers, move identifiers where they

Browse source 
are used.

Move also _Py_IDENTIFIER() defintions to the top in modified files to remove
identifiers duplicated in the same file.
This commit is contained in:
Victor Stinner 2013-11-07 23:07:29 +01:00
parent 07e9e380f9
commit bd303c165b
17 changed files with 93 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Objects/typeobject.c
View file

@ -53,6 +53,7 @@ _Py_IDENTIFIER(__module__);
_Py_IDENTIFIER(__name__);
_Py_IDENTIFIER(__new__);
_Py_IDENTIFIER(__setitem__);
_Py_IDENTIFIER(builtins);
static PyObject *
slot_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
@ -366,7 +367,7 @@ type_module(PyTypeObject *type, void *context)
if (s != NULL)
return PyUnicode_FromStringAndSize(
type->tp_name, (Py_ssize_t)(s - type->tp_name));
name = _PyUnicode_FromId(&_PyId_builtins);
name = _PyUnicode_FromId(&PyId_builtins);
Py_XINCREF(name);
return name;
}
@ -718,7 +719,7 @@ type_repr(PyTypeObject *type)
return NULL;
}
if (mod != NULL && _PyUnicode_CompareWithId(mod, &_PyId_builtins))
if (mod != NULL && _PyUnicode_CompareWithId(mod, &PyId_builtins))
rtn = PyUnicode_FromFormat("<class '%U.%U'>", mod, name);
else
rtn = PyUnicode_FromFormat("<class '%s'>", type->tp_name);
@ -3189,7 +3190,7 @@ object_repr(PyObject *self)
Py_XDECREF(mod);
return NULL;
}
if (mod != NULL && _PyUnicode_CompareWithId(mod, &_PyId_builtins))
if (mod != NULL && _PyUnicode_CompareWithId(mod, &PyId_builtins))
rtn = PyUnicode_FromFormat("<%U.%U object at %p>", mod, name, self);
else
rtn = PyUnicode_FromFormat("<%s object at %p>",